Parameterize all the properties files

Author: chingor13

google-http-client-assembly/assembly.xml

@@ -25,6 +25,7 @@
       <filtered>true</filtered>
       <outputDirectory>google-http-java-client</outputDirectory>
     </file>
+    <!-- properties files -->
     <file>
       <source>properties/google-http-client.jar.properties</source>
       <destName>google-http-client-${project.version}.jar.properties</destName>
@@ -79,6 +80,30 @@
       <outputDirectory>google-http-java-client/libs</outputDirectory>
       <filtered>true</filtered>
     </file>
+    <file>
+      <source>properties/gson.jar.properties</source>
+      <destName>gson-${project.gson.version}.jar.properties</destName>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/jackson-core.jar.properties</source>
+      <destName>jackson-core-${project.jackson-core2.version}.jar.properties</destName>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/jackson-core-asl.jar.properties</source>
+      <destName>jackson-core-asl-${project.jackson-core-asl.version}.jar.properties</destName>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/protobuf-java.jar.properties</source>
+      <destName>protobuf-java-${project.protobuf-java.version}.jar.properties</destName>
+      <outputDirectory>google-http-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
     <!-- dependencies.html -->
     <file>
       <source>../google-http-client/target/site/dependencies.html</source>
@@ -139,11 +164,6 @@
       <directory>target/libs</directory>
       <outputDirectory>google-http-java-client/libs</outputDirectory>
     </fileSet>
-    <fileSet>
-      <directory>android-properties</directory>
-      <outputDirectory>google-http-java-client/libs</outputDirectory>
-      <filtered>true</filtered>
-    </fileSet>
     <fileSet>
       <directory>target/libs-sources</directory>
       <outputDirectory>google-http-java-client/libs-sources</outputDirectory>

google-http-client-assembly/pom.xml

@@ -20,15 +20,15 @@
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-appengine</artifactId>
+      <artifactId>google-http-client-android</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-android</artifactId>
+      <artifactId>google-http-client-apache</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-protobuf</artifactId>
+      <artifactId>google-http-client-appengine</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
@@ -46,6 +46,10 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jdo</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-protobuf</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-xml</artifactId>