http: Start next minor version

https://codereview.appspot.com/6936062/
iterate-ch · Dec 18, 2012 · 823257a · 823257a
1 parent 5e96117
commit 823257a
Show file tree

Hide file tree

Showing 20 changed files with 64 additions and 69 deletions.
diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml
@@ -4,7 +4,7 @@
   <groupId>google-http-client</groupId>
   <artifactId>google-http-client-android-test</artifactId>
   <name>Test project for google-http-client-android.</name>
-  <version>1.13.0-beta-SNAPSHOT</version>
+  <version>1.14.0-beta-SNAPSHOT</version>
   <packaging>apk</packaging>
 
   <build>
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-android</artifactId>
-      <version>1.13.0-beta-SNAPSHOT</version>
+      <version>1.14.0-beta-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>android</artifactId>
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-test</artifactId>
-      <version>1.13.0-beta-SNAPSHOT</version>
+      <version>1.14.0-beta-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <artifactId>junit</artifactId>

diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-android</artifactId>

diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-appengine</artifactId>

diff --git a/...lient-1.13.0-beta-SNAPSHOT.jar.properties → ...lient-1.14.0-beta-SNAPSHOT.jar.properties b/...lient-1.13.0-beta-SNAPSHOT.jar.properties → ...lient-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/...droid-1.13.0-beta-SNAPSHOT.jar.properties → ...droid-1.14.0-beta-SNAPSHOT.jar.properties b/...droid-1.13.0-beta-SNAPSHOT.jar.properties → ...droid-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/...-gson-1.13.0-beta-SNAPSHOT.jar.properties → ...-gson-1.14.0-beta-SNAPSHOT.jar.properties b/...-gson-1.13.0-beta-SNAPSHOT.jar.properties → ...-gson-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/...ckson-1.13.0-beta-SNAPSHOT.jar.properties → ...ckson-1.14.0-beta-SNAPSHOT.jar.properties b/...ckson-1.13.0-beta-SNAPSHOT.jar.properties → ...ckson-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/...kson2-1.13.0-beta-SNAPSHOT.jar.properties → ...kson2-1.14.0-beta-SNAPSHOT.jar.properties b/...kson2-1.13.0-beta-SNAPSHOT.jar.properties → ...kson2-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/...tobuf-1.13.0-beta-SNAPSHOT.jar.properties → ...tobuf-1.14.0-beta-SNAPSHOT.jar.properties b/...tobuf-1.13.0-beta-SNAPSHOT.jar.properties → ...tobuf-1.14.0-beta-SNAPSHOT.jar.properties
diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.http-client</groupId>

diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-gson</artifactId>

diff --git a/google-http-client-jackson/pom.xml b/google-http-client-jackson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-jackson</artifactId>

diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-jackson2</artifactId>

diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-protobuf</artifactId>

diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-test</artifactId>

diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.13.0-beta-SNAPSHOT</version>
+    <version>1.14.0-beta-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client</artifactId>

diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java
@@ -45,7 +45,7 @@ public final class HttpRequest {
    *
    * @since 1.8
    */
-  public static final String VERSION = "1.13.0-beta-SNAPSHOT";
+  public static final String VERSION = "1.14.0-beta-SNAPSHOT";
 
   /**
    * User agent suffix for all requests.

diff --git a/jdiff.xml b/jdiff.xml
@@ -16,29 +16,27 @@
 
     <taskdef name="jdiff" classname="jdiff.JDiffAntTask"
       classpath="${JDIFF_HOME}/antjdiff.jar:${MAVEN_REPOSITORY_HOME}/org/codehaus/jackson/jackson-core-asl/1.9.9/jackson-core-asl-1.9.9.jar:${MAVEN_REPOSITORY_HOME}/com/fasterxml/jackson/core/jackson-core/2.0.5/jackson-core-2.0.5.jar:${MAVEN_REPOSITORY_HOME}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" />
-    <jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.13.0-beta/jdiff" verbose="on"
+    <jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.14.0-beta/jdiff" verbose="on"
       stats="on" docchanges="on">
-      <old name="Google HTTP Client Library for Java 1.12.0-beta">
+      <old name="Google HTTP Client Library for Java 1.13.0-beta">
         <!-- This is the location of your old source files -->
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-appengine/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-android/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-android2/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-android3/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-protobuf/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-gson/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-jackson/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-http-client-jackson2/src/main/java" />
-      </old>
-      <new name="Google HTTP Client Library for Java 1.13.0-beta">
-        <!-- This is the location of your new source files -->
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-appengine/src/main/java" />
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-android/src/main/java" />
-        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-protobuf/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-appengine/src/main/java" />
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-gson/src/main/java" />
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-jackson/src/main/java" />
         <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-jackson2/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.13.0-beta/google-http-client-protobuf/src/main/java" />
+      </old>
+      <new name="Google HTTP Client Library for Java 1.14.0-beta">
+        <!-- This is the location of your new source files -->
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-android/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-appengine/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-gson/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-jackson/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-jackson2/src/main/java" />
+        <dirset dir="${TMP_PROJECT_ROOT_DIR}/1.14.0-beta/google-http-client-protobuf/src/main/java" />
       </new>
     </jdiff>
   </target>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-parent</artifactId>
-  <version>1.13.0-beta-SNAPSHOT</version>
+  <version>1.14.0-beta-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Parent for the Google HTTP Client Library for Java</name>
 

diff --git a/release.html b/release.html
@@ -98,21 +98,22 @@ <h3>First time set up</h3>
   </li>
 </ul>
 
-<h3>Fork version 1.13.0-beta</h3>
-This is done in preparation for release of the 1.13 branch 1-2 weeks before the
-official launch. We create a named Mercurial branch for 1.13. Development in the
+<h3>Fork version 1.14.0-beta</h3>
+This is done in preparation for release of the 1.14 branch 1-2 weeks before the
+official launch. We create a named Mercurial branch for 1.14. Development in the
 default Mercurial branch may then progress for the next minor version.
 <ul>
   <li>Create the Mercurial named branch: <pre>
-hg branch 1.13
-hg commit -m "create 1.13 branch in preparation for release"
+hg pull -u
+hg branch 1.14
+hg commit -m "create 1.14 branch in preparation for release"
 hg push --new-branch
 hg update default
 </pre></li>
-<li>Update existing files by replacing <code>1.13.0-beta</code> with the
+<li>Update existing files by replacing <code>1.14.0-beta</code> with the
   next minor version. This can be done by running this set of sed commands:
 <pre>
-VER_NEXT=1.14; VER_CUR=1.13; VER_PREV=1.12; VER_SUFFIX='\.0-beta'
+VER_NEXT=1.15; VER_CUR=1.14; VER_PREV=1.13; VER_SUFFIX='\.0-beta'
 function esc() { echo $@ | sed "s/\./\\\./g"; }
 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
@@ -124,16 +125,15 @@ <h3>Fork version 1.13.0-beta</h3>
 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
+Submit the changes for review as usual, using upload.py
 hg commit -m "Start next minor version"
 hg push
 </pre></li>
 </ul>
 
-<h3>Release version 1.13.0-beta</h3>
+<h3>Release version 1.14.0-beta</h3>
 This process is followed for the official launch. We are releasing the code from
-the 1.13 Mercurial branch.
+the 1.14 Mercurial branch.
 <ul>
   <li>Checkout the source, update dependencies.html, update the version constant, 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
@@ -142,8 +142,8 @@ <h3>Release version 1.13.0-beta</h3>
 rm -rf google-http-java-client
 mkdir google-http-java-client
 cd google-http-java-client
-hg clone -b 1.13 https://google-http-java-client.googlecode.com/hg/ 1.13
-cd 1.13
+hg clone -b 1.14 https://google-http-java-client.googlecode.com/hg/ 1.14
+cd 1.14
 
 mvn project-info-reports:dependencies
 cp google-http-client/target/site/dependencies.html google-http-client-assembly/dependencies/dependencies.html
@@ -159,14 +159,13 @@ <h3>Release version 1.13.0-beta</h3>
 
 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.13.0-beta for release"
+Submit the changes for review as usual, using upload.py
+hg commit -m "prepare 1.14.0-beta for release"
 hg push
 
 mvn clean deploy
 mvn release:clean
-mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.13.0-beta --batch-mode
+mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.14.0-beta --batch-mode
 mvn release:perform -Darguments=-Dgpg.passphrase=<i>[YOUR GPG PASSPHRASE]</i>
 </pre></li>
   <li>Release on oss.sonatype.org
@@ -179,18 +178,16 @@ <h3>Release version 1.13.0-beta</h3>
   </ul>
     Central Maven repository is synced hourly. Once uploaded onto
     repo2.maven.org, it will be found at: <a
-      href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.13.0-beta/">repo2.maven.org</a>
+      href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.14.0-beta/">repo2.maven.org</a>
   </li>
-  <li>Start development of next bug fix version, by replacing <code>1.13.0-beta</code> with the next bug fix version:<pre>
-NEXT_VERSION=<i>(next bug fix version 1.13.X-beta)</i>
-for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e "s/1.13.0-beta/$NEXT_VERSION/g"`; mv $filename $newname; done
-sed s/1.13.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
-sed s/1.13.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
-sed s/1.13.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java &gt;/tmp/HttpRequest.java
+  <li>Start development of next bug fix version, by replacing <code>1.14.0-beta</code> with the next bug fix version:<pre>
+NEXT_VERSION=<i>(next bug fix version 1.14.X-beta)</i>
+for filename in google-http-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e "s/1.14.0-beta/$NEXT_VERSION/g"`; mv $filename $newname; done
+sed s/1.14.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
+sed s/1.14.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
+sed s/1.14.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/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>
@@ -206,41 +203,41 @@ <h3>Release version 1.13.0-beta</h3>
 cd /tmp/google-http-java-client
 hg clone https://code.google.com/p/google-http-java-client.javadoc/ javadoc
 hg clone https://code.google.com/p/google-http-java-client.wiki/ wiki
-hg clone -r 1.12.0-beta https://google-http-java-client.googlecode.com/hg/ 1.12.0-beta
 hg clone -r 1.13.0-beta https://google-http-java-client.googlecode.com/hg/ 1.13.0-beta
+hg clone -r 1.14.0-beta https://google-http-java-client.googlecode.com/hg/ 1.14.0-beta
 
-cd 1.13.0-beta
+cd 1.14.0-beta
 mvn javadoc:jar install site
-cp -R target/site/apidocs ../javadoc/1.13.0-beta
+cp -R target/site/apidocs ../javadoc/1.14.0-beta
 <i>change these constants from jdiff.xml for your environment: JDIFF_HOME, MAVEN_REPOSITORY_HOME</i>
 ant -f jdiff.xml
 
 cd ../javadoc
 hg add
-PREV_VERSION=<i>(previous bug fix version 1.12.X-beta)</i>
-sed s/$PREV_VERSION/1.13.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
-hg commit -m "1.13.0-beta"
+PREV_VERSION=<i>(previous bug fix version 1.13.X-beta)</i>
+sed s/$PREV_VERSION/1.14.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
+hg commit -m "1.14.0-beta"
 hg push
 
 cd ../wiki
-for s in *; do sed s/$PREV_VERSION/1.13.0-beta/g <$s >/tmp/$s && mv /tmp/$s .; done
+for s in *; do sed s/$PREV_VERSION/1.14.0-beta/g <$s >/tmp/$s && mv /tmp/$s .; done
 hg revert --no-backup ReleaseNotes.wiki
-<i>edit ReleaseNotes.wiki to add release notes for 1.13.0-beta</i>
-hg commit -m "1.13.0-beta"
+<i>edit ReleaseNotes.wiki to add release notes for 1.14.0-beta</i>
+hg commit -m "1.14.0-beta"
 hg push
 </pre></li>
   <li><b>WAIT!</b> Don't do the following instructions until after the
   library has been uploaded to repo2.maven.org at: <a
-    href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.13.0-beta/">repo2.maven.org</a></li>
+    href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.14.0-beta/">repo2.maven.org</a></li>
   <li>Update to new version on <a
     href="http://code.google.com/p/google-http-java-client">http://code.google.com/p/google-http-java-client</a>
   <ul>
     <li>Upload to <a
       href="http://code.google.com/p/google-http-java-client/downloads/entry">http://code.google.com/p/google-http-java-client/downloads/entry</a>
     <ul>
-      <li>Summary: Google HTTP Client Library for Java, version 1.13.0-beta</li>
+      <li>Summary: Google HTTP Client Library for Java, version 1.14.0-beta</li>
       <li>File:
-      <code>/tmp/google-http-java-client/1.13.0-beta/google-http-client-assembly/target/google-http-client-1.13.0-beta-java.zip</code></li>
+      <code>/tmp/google-http-java-client/1.14.0-beta/google-http-client-assembly/target/google-http-client-1.14.0-beta-java.zip</code></li>
       <li>Labels: <code>Type-Archive</code>, <code>OpSys-All</code>, and <code>Featured</code></li>
       <li>click Submit file</li>
     </ul>
@@ -254,7 +251,7 @@ <h3>Release version 1.13.0-beta</h3>
     href="http://www.blogger.com/post-create.g?blogID=4291939896242474921">New
   Post</a> on the <a href="http://google-http-java-client.blogspot.com/">announcement
   blog</a> about the new version, including links to <a
-    href="http://code.google.com/p/google-http-java-client/issues/list?can=1&q=milestone=Version1.13.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
+    href="http://code.google.com/p/google-http-java-client/issues/list?can=1&q=milestone=Version1.14.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
   features and bugs fixed</a>.</li>
 </ul>
 </body>