[Issue 147] Include properties files for Eclipse Android support to specify location of source jar.

rmistry · rmistry · commit cb5f841676a9 · 2012-08-24T09:26:50.000-04:00
https://codereview.appspot.com/6459059/
diff --git a/google-api-client-assembly/android-properties/google-api-client-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-client-${project.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-api-client-android-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-android-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-client-android-${project.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-api-client-android2-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-api-client-android2-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-api-client-android2-${project.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-android-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-android-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-android-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-android2-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-android2-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-android2-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-android3-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-android3-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-android3-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-gson-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-gson-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-gson-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-jackson-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-jackson-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-jackson-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-http-client-protobuf-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-http-client-protobuf-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-http-client-protobuf-${project.http.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/google-oauth-client-1.11.0-beta-SNAPSHOT.jar.properties b/google-api-client-assembly/android-properties/google-oauth-client-1.11.0-beta-SNAPSHOT.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/google-oauth-client-${project.oauth.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/gson-2.1.jar.properties b/google-api-client-assembly/android-properties/gson-2.1.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/gson-${project.gson.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/guava-11.0.1.jar.properties b/google-api-client-assembly/android-properties/guava-11.0.1.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/guava-${project.guava.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/jackson-core-asl-1.9.9.jar.properties b/google-api-client-assembly/android-properties/jackson-core-asl-1.9.9.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar
diff --git a/google-api-client-assembly/android-properties/protobuf-java-2.4.1.jar.properties b/google-api-client-assembly/android-properties/protobuf-java-2.4.1.jar.properties
@@ -0,0 +1 @@
+src=../libs-sources/protobuf-java-${project.protobuf-java.version}-sources.jar
diff --git a/google-api-client-assembly/assembly.xml b/google-api-client-assembly/assembly.xml
@@ -33,6 +33,11 @@
       </excludes>
       <outputDirectory>libs</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>android-properties</directory>
+      <outputDirectory>libs</outputDirectory>
+      <filtered>true</filtered>
+    </fileSet>
     <fileSet>
       <directory>target/libs-sources</directory>
       <outputDirectory>libs-sources</outputDirectory>
diff --git a/google-api-client-assembly/readme.html b/google-api-client-assembly/readme.html
@@ -76,6 +76,7 @@ <h3>Android Dependencies</h3>
   <li>jsr305-${project.jsr305.version}.jar</li>
   <li>protobuf-java-${project.protobuf-java.version}.jar</li>
 </ul>
+The <a href='libs'>libs</a> folder also contains properties files that specify the location of source jars for Android projects in Eclipse.<br/>
 Please see the <a href='http://code.google.com/p/google-api-java-client/wiki/Android'>Android wiki</a> for the Android Developer's Guide.
 
 <h3>Google App Engine Dependencies</h3>
diff --git a/pom.xml b/pom.xml
@@ -57,6 +57,7 @@
         (use mvn project-info-reports:dependencies and copy from
         google-oauth-client-<name>/target/site/dependencies.html)
     * jdiff.xml
+    * google-api-client-assembly/android-properties/*.properties
     * This pom.xml file below in the dependencyManagement and maven-javadoc-plugin sections
   -->
   <modules>
@@ -447,8 +448,8 @@
     <project.oauth.version>1.11.0-beta-SNAPSHOT</project.oauth.version>
     <project.jsr305.version>1.3.9</project.jsr305.version>
     <project.gson.version>2.1</project.gson.version>
-    <project.jackson-core-asl.version>1.9.4</project.jackson-core-asl.version>
-    <project.protobuf-java.version>2.2.0</project.protobuf-java.version>
+    <project.jackson-core-asl.version>1.9.9</project.jackson-core-asl.version>
+    <project.protobuf-java.version>2.4.1</project.protobuf-java.version>
     <project.guava.version>11.0.1</project.guava.version>
     <project.appengine.version>1.6.6</project.appengine.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
diff --git a/release.html b/release.html
@@ -97,6 +97,7 @@ <h3>Fork version 1.11.0-beta</h3>
 ESC_VER_NEXT=`esc ${VER_NEXT}`; ESC_VER_CUR=`esc ${VER_CUR}`; ESC_VER_PREV=`esc ${VER_PREV}`
 sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" pom.xml
 sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" */pom.xml
+for filename in google-api-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g"`; mv $filename google-api-client-assembly/android-properties/$newname; done
 sed -i -e "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" -e "s@${ESC_VER_PREV}${VER_SUFFIX}@${ESC_VER_CUR}${VER_SUFFIX}@g" jdiff.xml
 sed -i -e "s@${ESC_VER_CUR}@${ESC_VER_NEXT}@g" -e "s@${ESC_VER_PREV}@${ESC_VER_CUR}@g" release.html
 echo -n && read -e -p "Version which comes after ${VER_NEXT}: " NV && sed -i -e "s@VER_NEXT=${ESC_VER_NEXT}@VER_NEXT=${NV}@g" release.html
@@ -113,7 +114,7 @@ <h3>Release version 1.11.0-beta</h3>
 <ul>
   <li>Consider changing value of $project.http.version and
   $project.oauth.version variables in pom.xml</li>
-  <li>Checkout the source, update dependencies.html, and push to central Maven repository (based on
+  <li>Checkout the source, update dependencies.html, update android-properties, and push to central Maven repository (based on
   instructions from <a href="https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide">Sonatype OSS Maven Repository Usage Guide</a>):<pre>
 cd /tmp
 rm -rf google-api-java-client
@@ -128,6 +129,9 @@ <h3>Release version 1.11.0-beta</h3>
 cp google-api-client-android2/target/site/dependencies.html google-api-client-assembly/dependencies/android2-dependencies.html
 cp google-api-client-appengine/target/site/dependencies.html google-api-client-assembly/dependencies/appengine-dependencies.html
 cp google-api-client-servlet/target/site/dependencies.html google-api-client-assembly/dependencies/servlet-dependencies.html
+
+for filename in google-api-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/-SNAPSHOT//g'`; mv $filename google-api-client-assembly/android-properties/$newname; done
+
 hg commit -m "prepare 1.11.0-beta for release"
 hg push
 
@@ -150,6 +154,8 @@ <h3>Release version 1.11.0-beta</h3>
   </li>
   <li>Start development of next bug fix version, by replacing <code>1.11.0-beta</code> with the next bug fix version:<pre>
 NEXT_VERSION=<i>(next bug fix version 1.11.X-beta)</i>
+sed -i 's/1.11.0-beta/$NEXT_VERSION/g' google-api-client-assembly/android-properties/*.properties
+for filename in google-api-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/1.11.0-beta/$NEXT_VERSION/g'`; mv $filename google-api-client-assembly/android-properties/$newname; done
 sed s/1.11.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
 sed s/1.11.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
 mv /tmp/jdiff.xml /tmp/release.html .

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+src=../libs-sources/google-api-client-${project.version}-sources.jar`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+src=../libs-sources/google-http-client-${project.http.version}-sources.jar`