Bug fixes to release.html and adding test artifact to pom.xml

Author: rmistry

pom.xml

@@ -71,6 +71,7 @@
     <module>google-http-client-gson</module>
     <module>google-http-client-jackson</module>
     <module>google-http-client-jackson2</module>
+    <module>google-http-client-test</module>
   </modules>
 
   <!--

release.html

@@ -97,13 +97,15 @@ <h3>Fork version 1.12.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-http-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-http-client-assembly/android-properties/$newname; done
+for filename in google-http-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 $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 "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
 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
 </pre></li>
 <li>Commit and push: <pre>
+hg add
+Remove all old android-properties files
 hg commit -m "Start next minor version"
 hg push
 </pre></li>
@@ -137,8 +139,10 @@ <h3>Release version 1.12.0-beta</h3>
 sed s/-SNAPSHOT//g &lt;google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java &gt;/tmp/HttpRequest.java
 cp /tmp/HttpRequest.java google-http-client/src/main/java/com/google/api/client/http
 
-for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/-SNAPSHOT//g'`; mv $filename google-http-client-assembly/android-properties/$newname; done
+for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/-SNAPSHOT//g'`; mv $filename $newname; done
 
+hg add
+Remove all old android-properties files
 hg commit -m "prepare 1.12.0-beta for release"
 hg push
 
@@ -161,12 +165,14 @@ <h3>Release version 1.12.0-beta</h3>
   </li>
   <li>Start development of next bug fix version, by replacing <code>1.12.0-beta</code> with the next bug fix version:<pre>
 NEXT_VERSION=<i>(next bug fix version 1.12.X-beta)</i>
-for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/1.12.0-beta/$NEXT_VERSION/g'`; mv $filename google-http-client-assembly/android-properties/$newname; done
+for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e "s/1.12.0-beta/$NEXT_VERSION/g"`; mv $filename $newname; done
 sed s/1.12.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
 sed s/1.12.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
-sed s/1.12.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/util/Strings.java &gt;/tmp/Strings.java
+sed s/1.12.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java &gt;/tmp/HttpRequest.java
 mv /tmp/jdiff.xml /tmp/release.html .
-mv /tmp/Strings.java google-http-client/src/main/java/com/google/api/client/util
+mv /tmp/HttpRequest.java google-http-client/src/main/java/com/google/api/client/http/
+hg add
+Remove all old android-properties files
 hg commit -m "start $NEXT_VERSION"
 hg push
 </pre></li>