8000 Start next minor version · robccan/google-http-java-client@348960c · GitHub
[go: up one dir, main page]
Skip to content

Commit 348960c

Browse files
rmistryrmistry
committed
Start next minor version
1 parent bb0a408 commit 348960c

File tree

9 files changed

+52
-52
lines changed

9 files changed

+52
-52
lines changed

‎google-http-client-android2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.7.0-beta-SNAPSHOT</version>
7+
<version>1.8.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-android2</artifactId>

‎google-http-client-android3/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.7.0-beta-SNAPSHOT</version>
7+
<version>1.8.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-android3</artifactId>

‎google-http-client-appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.7.0-beta-SNAPSHOT</version>
7+
<version>1.8.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-appengine</artifactId>

‎google-http-client-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.7.0-beta-SNAPSHOT</version>
7+
<version>1.8.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</pare 628C nt>
1010
<groupId>com.google.http-client</groupId>

‎google-http-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.7.0-beta-SNAPSHOT</version>
7+
<version>1.8.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client</artifactId>

‎google-http-client/src/main/java/com/google/api/client/util/Strings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class Strings {
2929
*
3030
* @since 1.3
3131
*/
32-
public static final String VERSION = "1.7.0-beta-SNAPSHOT";
32+
public static final String VERSION = "1.8.0-beta-SNAPSHOT";
3333

3434
/**
3535
* Line separator to use for this OS, i.e. {@code "\n"} or {@code "\r\n"}.

‎jdiff.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616

1717
<taskdef name="jdiff" classname="jdiff.JDiffAntTask"
1818
classpath="${JDIFF_HOME}/antjdiff.jar:${MAVEN_REPOSITORY_HOME}/org/codehaus/jackson/jackson-core-asl/1.9.1/jackson-core-asl-1.9.1.jar:${MAVEN_REPOSITORY_HOME}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" />
19-
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.7.0-beta/jdiff" verbose="on"
19+
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.8.0-beta/jdiff" verbose="on"
2020
stats="on" docchanges="on">
21-
<old name="Google HTTP Client Library for Java 1.6.0-beta">
21+
<old name="Google HTTP Client Library for Java 1.7.0-beta">
2222
<!-- This is the location of your old source files -->
23-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.6.0-beta/google-http-client/src/main/java" />
24-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.6.0-beta/google-http-client-extensions/src/main/java" />
25-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.6.0-beta/google-http-client-extensions-android2/src/main/java" />
26-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.6.0-beta/google-http-client-extensions-android3/src/main/java" />
23+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client/src/main/java" />
24+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-extensions/src/main/java" />
25+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-extensions-android2/src/main/java" />
26+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-extensions-android3/src/main/java" />
2727
</old>
28-
<new name="Google HTTP Client Library for Java 1.7.0-beta">
28+
<new name="Google HTTP Client Library for Java 1.8.0-beta">
2929
<!-- This is the location of your new source files -->
30-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client/src/main/java" />
31-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-appengine/src/main/java" />
32-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-android2/src/main/java" />
33-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.7.0-beta/google-http-client-android3/src/main/java" />
30+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.8.0-beta/google-http-client/src/main/java" />
31+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.8.0-beta/google-http-client-appengine/src/main/java" />
32+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.8.0-beta/google-http-client-android2/src/main/java" />
33+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.8.0-beta/google-http-client-android3/src/main/java" />
3434
</new>
3535
</jdiff>
3636
</target>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>com.google.http-client</groupId>
1111
<artifactId>google-http-client-parent</artifactId>
12-
<version>1.7.0-beta-SNAPSHOT</version>
12+
<version>1.8.0-beta-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>Parent for the Google HTTP Client Library for Java</name>
1515

‎release.html

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,23 @@ <h3>First time set up</h3>
7878
</li>
7979
</ul>
8080

81-
<h3>Fork version 1.7.0-beta</h3>
82-
This is done in preparation for release of the 1.7 branch 1-2 weeks before the
83-
official launch. We create a named Mercurial branch for 1.7. Development in the
81+
<h3>Fork version 1.8.0-beta</h3>
82+
This is done in preparation for release of the 1.8 branch 1-2 weeks before the
83+
official launch. We create a named Mercurial branch for 1.8. Development in the
8484
default Mercurial branch may then progress for the next minor version.
8585
<ul>
8686
<li>Create the Mercurial named branch: <pre>
87-
hg branch 1.7
88-
hg commit -m "create 1.7 branch in preparation for release"
89-
hg push
87+
hg branch 1.8
88+
hg commit -m "create 1.8 branch in preparation for release"
89+
hg push --new-branch
9090
hg update default
9191
</pre></li>
92-
<li>For the following files, replace <code>1.7.0-beta</code> with the
92+
<li>For the following files, replace <code>1.8.0-beta</code> with the
9393
next minor version: <b>(TODO: update this section to use sed)</b><pre>
9494
pom.xml
9595
*/pom.xml
96-
jdiff.xml (first change "1.7" to next minor version, then change "1.6" to "1.7")
97-
release.html (first change "1.7" to next minor version, then change "1.6" to "1.7")
96+
jdiff.xml (first change "1.8" to next minor version, then change "1.7" to "1.8")
97+
release.html (first change "1.8" to next minor version, then change "1.7" to "1.8")
9898
google-http-client/src/main/java/com/google/api/client/util/Strings.java
9999
</pre></li>
100100
<li>Commit and push: <pre>
@@ -103,9 +103,9 @@ <h3>Fork version 1.7.0-beta</h3>
103103
</pre></li>
104104
</ul>
105105

106-
<h3>Release version 1.7.0-beta</h3>
106+
<h3>Release version 1.8.0-beta</h3>
107107
This process is followed for the official launch. We are releasing the code from
108-
the 1.7 Mercurial branch.
108+
the 1.8 Mercurial branch.
109109
<ul>
110110
<li>Checkout the source, update dependencies.html, update the version constant, and push to central Maven repository (based on instructions from <a
111111
href="https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide">Sonatype
@@ -114,8 +114,8 @@ <h3>Release version 1.7.0-beta</h3>
114114
rm -rf google-http-java-client
115115
mkdir google-http-java-client
116116
cd google-http-java-client
117-
hg clone -b 1.7 https://google-http-java-client.googlecode.com/hg/ 1.7
118-
cd 1.7
117+
hg clone -b 1.8 https://google-http-java-client.googlecode.com/hg/ 1.8
118+
cd 1.8
119119

120120
mvn project-info-reports:dependencies
121121
cp google-http-client/target/site/dependencies.html google-http-client-assembly/dependencies/dependencies.html
@@ -125,12 +125,12 @@ <h3>Release version 1.7.0-beta</h3>
125125

126126
sed s/-SNAPSHOT//g &lt;google-http-client/src/main/java/com/google/api/client/util/Strings.java &gt;/tmp/Strings.java
127127
cp /tmp/Strings.java google-http-client/src/main/java/com/google/api/client/util
128-
hg commit -m "prepare 1.7.0-beta for release"
128+
hg commit -m "prepare 1.8.0-beta for release"
129129
hg push
130130

131131
mvn clean deploy
132132
mvn release:clean
133-
mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.7.0-beta --batch-mode
133+
mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.8.0-beta --batch-mode
134134
mvn release:perform -Darguments=-Dgpg.passphrase=<i>[YOUR GPG PASSPHRASE]</i>
135135
</pre></li>
136136
<li>Release on oss.sonatype.org
@@ -143,13 +143,13 @@ <h3>Release version 1.7.0-beta</h3>
143143
</ul>
144144
Central Maven repository is synced hourly. Once uploaded onto
145145
repo2.maven.org, it will be found at: <a
146-
href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.7.0-beta/">repo2.maven.org</a>
146+
href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.8.0-beta/">repo2.maven.org</a>
147147
</li>
148-
<li>Start development of next bug fix version, by replacing <code>1.7.0-beta</code> with the next bug fix version:<pre>
149-
NEXT_VERSION=<i>(next bug fix version 1.7.X-beta)</i>
150-
sed s/1.7.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
151-
sed s/1.7.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
152-
sed s/1.7.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/util/Strings.java &gt;/tmp/Strings.java
148+
<li>Start development of next bug fix version, by replacing <code>1.8.0-beta</code> with the next bug fix version:<pre>
149+
NEXT_VERSION=<i>(next bug fix version 1.8.X-beta)</i>
150+
sed s/1.8.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
151+
sed s/1.8.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
152+
sed s/1.8.0-beta/$NEXT_VERSION-SNAPSHOT/g &lt;google-http-client/src/main/java/com/google/api/client/util/Strings.java &gt;/tmp/Strings.java
153153
mv /tmp/jdiff.xml /tmp/release.html .
154154
mv /tmp/Strings.java google-http-client/src/main/java/com/google/api/client/util
155155
hg commit -m "start $NEXT_VERSION"
@@ -167,40 +167,40 @@ <h3>Release version 1.7.0-beta</h3>
167167
cd /tmp/google-http-java-client
168168
hg clone https://code.google.com/p/google-http-java-client.javadoc/ javadoc
169169
hg clone https://code.google.com/p/google-http-java-client.wiki/ wiki
170-
hg clone -r 1.6.0-beta https://google-http-java-client.googlecode.com/hg/ 1.6.0-beta
171170
hg clone -r 1.7.0-beta https://google-http-java-client.googlecode.com/hg/ 1.7.0-beta
171+
hg clone -r 1.8.0-beta https://google-http-java-client.googlecode.com/hg/ 1.8.0-beta
172172

173-
cd 1.7.0-beta
173+
cd 1.8.0-beta
174174
mvn javadoc:jar install site
175-
cp -R target/site/apidocs ../javadoc/1.7.0-beta
175+
cp -R target/site/apidocs ../javadoc/1.8.0-beta
176176
<i>change these constants from jdiff.xml for your environment: JDIFF_HOME, MAVEN_REPOSITORY_HOME</i>
177177
ant -f jdiff.xml
178178

179179
cd ../javadoc
180180
hg add
181-
PREV_VERSION=<i>(previous bug fix version 1.6.X-beta)</i>
182-
sed s/$PREV_VERSION/1.7.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
183-
hg commit -m "1.7.0-beta"
181+
PREV_VERSION=<i>(previous bug fix version 1.7.X-beta)</i>
182+
sed s/$PREV_VERSION/1.8.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
183+
hg commit -m "1.8.0-beta"
184184
hg push
185185

186186
cd ../wiki
187-
for s in *; do sed s/$PREV_VERSION/1.7.0-beta/g <$s >/tmp/$s && mv /tmp/$s .; done
187+
for s in *; do sed s/$PREV_VERSION/1.8.0-beta/g <$s >/tmp/$s && mv /tmp/$s .; done
188188
hg revert --no-backup ReleaseNotes.wiki
189-
<i>edit ReleaseNotes.wiki to add release notes for 1.7.0-beta</i>
190-
hg commit -m "1.7.0-beta"
189+
<i>edit ReleaseNotes.wiki to add release notes for 1.8.0-beta</i>
190+
hg commit -m "1.8.0-beta"
191191
hg push
192192
</pre></li>
193193
<li><b>WAIT!</b> Don't do the following instructions until after the
194194
library has been uploaded to repo2.maven.org at: <a
195-
href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.7.0-beta/">repo2.maven.org</a></li>
195+
href="http://repo2.maven.org/maven2/com/google/http-client/google-http-client/1.8.0-beta/">repo2.maven.org</a></li>
196196
<li>Update to new version on <a
197197
href="http://code.google.com/p/google-http-java-client">http://code.google.com/p/google-http-java-client</a>
198198
<ul>
199199
<li>Upload to <a
200200
href="http://code.google.com/p/google-http-java-client/downloads/entry">http://code.google.com/p/google-http-java-client/downloads/entry</a>
201201
<ul>
202-
<li>Summary: Google HTTP Client Library for Java, version 1.7.0-beta</li>
203-
<li>File: <code>/tmp/google-http-java-client/1.7.0-beta/google-http-client-assembly/target/google-http-client-1.7.0-beta-java.zip</code></li>
202+
<li>Summary: Google HTTP Client Library for Java, version 1.8.0-beta</li>
203+
<li>File: <code>/tmp/google-http-java-client/1.8.0-beta/google-http-client-assembly/target/google-http-client-1.8.0-beta-java.zip</code></li>
204204
<li>Labels: <code>Type-Archive</code>, <code>OpSys-All</code>, and <code>Featured</code></li>
205205
<li>click Submit file</li>
206206
</ul>
@@ -214,7 +214,7 @@ <h3>Release version 1.7.0-beta</h3>
214214
href="http://www.blogger.com/post-create.g?blogID=4291939896242474921">New
215215
Post</a> on the <a href="http://google-http-java-client.blogspot.com/">announcement
216216
blog</a> about the new version, including links to <a
217-
href="http://code.google.com/p/google-http-java-client/issues/list?can=1&q=milestone=Version1.7.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
217+
href="http://code.google.com/p/google-http-java-client/issues/list?can=1&q=milestone=Version1.8.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
218218
features and bugs fixed</a>.</li>
219219
</ul>
220220
</body>

0 commit comments

Comments
 (0)
0