Skip to content

Commit 86ef239

Browse files
author
Yaniv Inbar
committed
[api] start 1.12
https://codereview.appspot.com/6501044/
1 parent fca0b17 commit 86ef239

File tree

10 files changed

+55
-53
lines changed

10 files changed

+55
-53
lines changed

‎google-api-client-android/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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client-android</artifactId>

‎google-api-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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client-android2</artifactId>

‎google-api-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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client-appengine</artifactId>

‎google-api-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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>com.google.api-client</groupId>

‎google-api-client-java6/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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client-java6</artifactId>

‎google-api-client-servlet/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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client-servlet</artifactId>

‎google-api-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.api-client</groupId>
66
<artifactId>google-api-client-parent</artifactId>
7-
<version>1.11.0-beta-SNAPSHOT</version>
7+
<version>1.12.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-api-client</artifactId>

‎jdiff.xml‎

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

1717
<taskdef name="jdiff" classname="jdiff.JDiffAntTask"
1818
classpath="${JDIFF_HOME}/antjdiff.jar:${MAVEN_REPOSITORY_HOME}/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" />
19-
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.11.0-beta/jdiff" verbose="on"
19+
<jdiff destdir="${JAVADOC_PROJECT_ROOT_DIR}/1.12.0-beta/jdiff" verbose="on"
2020
stats="on" docchanges="on">
21-
<old name="Google API Client Library for Java 1.10.0-beta">
21+
<old name="Google API Client Library for Java 1.11.0-beta">
2222
<!-- This is the location of your old source files -->
23-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.10.0-beta/google-api-client/src/main/java" />
24-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.10.0-beta/google-api-client-servlet/src/main/java" />
25-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.10.0-beta/google-api-client-appengine/src/main/java" />
26-
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.10.0-beta/google-api-client-android2/src/main/java" />
27-
</old>
28-
<new name="Google API Client Library for Java 1.11.0-beta">
29-
<!-- This is the location of your new source files -->
3023
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client/src/main/java" />
3124
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client-servlet/src/main/java" />
3225
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client-appengine/src/main/java" />
3326
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client-android/src/main/java" />
3427
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client-android2/src/main/java" />
3528
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.11.0-beta/google-api-client-java6/src/main/java" />
29+
</old>
30+
<new name="Google API Client Library for Java 1.12.0-beta">
31+
<!-- This is the location of your new source files -->
32+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client/src/main/java" />
33+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client-servlet/src/main/java" />
34+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client-appengine/src/main/java" />
35+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client-android/src/main/java" />
36+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client-android2/src/main/java" />
37+
<dirset dir="${TMP_PROJECT_ROOT_DIR}/1.12.0-beta/google-api-client-java6/src/main/java" />
3638
</new>
3739
</jdiff>
3840
</target>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>com.google.api-client</groupId>
1111
<artifactId>google-api-client-parent</artifactId>
12-
<version>1.11.0-beta-SNAPSHOT</version>
12+
<version>1.12.0-beta-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414
<name>Parent for the Google API Client Library for Java</name>
1515

@@ -459,8 +459,8 @@
459459
</build>
460460
<properties>
461461
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
462-
<project.http.version>1.11.0-beta-SNAPSHOT</project.http.version>
463-
<project.oauth.version>1.11.0-beta-SNAPSHOT</project.oauth.version>
462+
<project.http.version>1.12.0-beta-SNAPSHOT</project.http.version>
463+
<project.oauth.version>1.12.0-beta-SNAPSHOT</project.oauth.version>
464464
<project.jsr305.version>1.3.9</project.jsr305.version>
465465
<project.gson.version>2.1</project.gson.version>
466466
<project.jackson-core-asl.version>1.9.9</project.jackson-core-asl.version>

‎release.html‎

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

81-
<h3>Fork version 1.11.0-beta</h3>
82-
This is done in preparation for release of the 1.11 branch a week before the
83-
official launch. We create a named Mercurial branch for 1.11. Development in the
81+
<h3>Fork version 1.12.0-beta</h3>
82+
This is done in preparation for release of the 1.12 branch a week before the
83+
official launch. We create a named Mercurial branch for 1.12. 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.11
88-
hg commit -m "create 1.11 branch in preparation for release"
87+
hg branch 1.12
88+
hg commit -m "create 1.12 branch in preparation for release"
8989
hg push --new-branch
9090
hg update default
9191
</pre></li>
92-
<li>Update existing files by replacing <code>1.11.0-beta</code> with the
92+
<li>Update existing files by replacing <code>1.12.0-beta</code> with the
9393
next minor version. This can be done by running this set of sed commands:
9494
<pre>
95-
VER_NEXT=1.12; VER_CUR=1.11; VER_PREV=1.10; VER_SUFFIX='\.0-beta'
95+
VER_NEXT=1.13; VER_CUR=1.12; VER_PREV=1.11; VER_SUFFIX='\.0-beta'
9696
function esc() { echo $@ | sed "s/\./\\\./g"; }
9797
ESC_VER_NEXT=`esc ${VER_NEXT}`; ESC_VER_CUR=`esc ${VER_CUR}`; ESC_VER_PREV=`esc ${VER_PREV}`
9898
sed -i "s@${ESC_VER_CUR}${VER_SUFFIX}@${ESC_VER_NEXT}${VER_SUFFIX}@g" pom.xml
@@ -108,9 +108,9 @@ <h3>Fork version 1.11.0-beta</h3>
108108
</pre></li>
109109
</ul>
110110

111-
<h3>Release version 1.11.0-beta</h3>
111+
<h3>Release version 1.12.0-beta</h3>
112112
This process is followed for the official launch. We are releasing the code from
113-
the 1.11 Mercurial branch.
113+
the 1.12 Mercurial branch.
114114
<ul>
115115
<li>Consider changing value of $project.http.version and
116116
$project.oauth.version variables in pom.xml</li>
@@ -120,8 +120,8 @@ <h3>Release version 1.11.0-beta</h3>
120120
rm -rf google-api-java-client
121121
mkdir google-api-java-client
122122
cd google-api-java-client
123-
hg clone -b 1.11 https://google-api-java-client.googlecode.com/hg/ 1.11
124-
cd 1.11
123+
hg clone -b 1.12 https://google-api-java-client.googlecode.com/hg/ 1.12
124+
cd 1.12
125125

126126
mvn project-info-reports:dependencies
127127
cp google-api-client/target/site/dependencies.html google-api-client-assembly/dependencies/dependencies.html
@@ -133,12 +133,12 @@ <h3>Release version 1.11.0-beta</h3>
133133

134134
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
135135

136-
hg commit -m "prepare 1.11.0-beta for release"
136+
hg commit -m "prepare 1.12.0-beta for release"
137137
hg push
138138

139139
mvn clean deploy
140140
mvn release:clean
141-
mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.11.0-beta --batch-mode
141+
mvn release:prepare -DautoVersionSubmodules=true -Dtag=1.12.0-beta --batch-mode
142142
mvn release:perform -Darguments=-Dgpg.passphrase=<i>[YOUR GPG PASSPHRASE]</i>
143143
</pre></li>
144144
<li>Release on oss.sonatype.org
@@ -151,14 +151,14 @@ <h3>Release version 1.11.0-beta</h3>
151151
</ul>
152152
Central Maven repository is synced hourly. Once uploaded onto
153153
repo2.maven.org, it will be found at: <a
154-
href="http://repo2.maven.org/maven2/com/google/api-client/google-api-client/1.11.0-beta/">repo2.maven.org</a>
154+
href="http://repo2.maven.org/maven2/com/google/api-client/google-api-client/1.12.0-beta/">repo2.maven.org</a>
155155
</li>
156-
<li>Start development of next bug fix version, by replacing <code>1.11.0-beta</code> with the next bug fix version:<pre>
157-
NEXT_VERSION=<i>(next bug fix version 1.11.X-beta)</i>
158-
sed -i 's/1.11.0-beta/$NEXT_VERSION/g' google-api-client-assembly/android-properties/*.properties
159-
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
160-
sed s/1.11.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
161-
sed s/1.11.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
156+
<li>Start development of next bug fix version, by replacing <code>1.12.0-beta</code> with the next bug fix version:<pre>
157+
NEXT_VERSION=<i>(next bug fix version 1.12.X-beta)</i>
158+
sed -i 's/1.12.0-beta/$NEXT_VERSION/g' google-api-client-assembly/android-properties/*.properties
159+
for filename in google-api-client-assembly/android-properties/*.properties; do newname=`echo $filename | sed -e 's/1.12.0-beta/$NEXT_VERSION/g'`; mv $filename google-api-client-assembly/android-properties/$newname; done
160+
sed s/1.12.0-beta/$NEXT_VERSION/g &lt;jdiff.xml &gt;/tmp/jdiff.xml
161+
sed s/1.12.0-beta/$NEXT_VERSION/g &lt;release.html &gt;/tmp/release.html
162162
mv /tmp/jdiff.xml /tmp/release.html .
163163
hg commit -m "start $NEXT_VERSION"
164164
hg push
@@ -175,43 +175,43 @@ <h3>Release version 1.11.0-beta</h3>
175175
cd /tmp/google-api-java-client
176176
hg clone https://code.google.com/p/google-api-java-client.javadoc/ javadoc
177177
hg clone https://code.google.com/p/google-api-java-client.wiki/ wiki
178-
hg clone -r 1.10.0-beta https://google-api-java-client.googlecode.com/hg/ 1.10.0-beta
179178
hg clone -r 1.11.0-beta https://google-api-java-client.googlecode.com/hg/ 1.11.0-beta
179+
hg clone -r 1.12.0-beta https://google-api-java-client.googlecode.com/hg/ 1.12.0-beta
180180

181-
cd 1.11.0-beta
181+
cd 1.12.0-beta
182182
mvn javadoc:jar install site
183-
cp -R target/site/apidocs ../javadoc/1.11.0-beta
183+
cp -R target/site/apidocs ../javadoc/1.12.0-beta
184184
<i>change these constants from jdiff.xml for your environment: JDIFF_HOME,
185185
MAVEN_REPOSITORY_HOME</i>
186186
ant -f jdiff.xml
187187

188188
cd ../javadoc
189189
hg add
190-
PREV_VERSION=<i>(previous bug fix version 1.10.X-beta)</i>
191-
sed s/$PREV_VERSION/1.11.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
192-
hg commit -m "1.11.0-beta"
190+
PREV_VERSION=<i>(previous bug fix version 1.11.X-beta)</i>
191+
sed s/$PREV_VERSION/1.12.0-beta/g <index.html >/tmp/index.html && mv /tmp/index.html index.html
192+
hg commit -m "1.12.0-beta"
193193
hg push
194194

195195
cd ../wiki
196-
for s in *; do sed s/$PREV_VERSION/1.11.0-beta/g <$s >/tmp/$s && mv /tmp/$s .;
196+
for s in *; do sed s/$PREV_VERSION/1.12.0-beta/g <$s >/tmp/$s && mv /tmp/$s .;
197197
done
198198
hg revert --no-backup ReleaseNotes.wiki
199-
<i>edit ReleaseNotes.wiki to add release notes for 1.11.0-beta</i>
200-
hg commit -m "1.11.0-beta"
199+
<i>edit ReleaseNotes.wiki to add release notes for 1.12.0-beta</i>
200+
hg commit -m "1.12.0-beta"
201201
hg push
202202
</pre></li>
203203
<li><b>WAIT!</b> Don't do the following instructions until after the
204204
library has been uploaded to repo2.maven.org at: <a
205-
href="http://repo2.maven.org/maven2/com/google/api-client/google-api-client/1.11.0-beta/">repo2.maven.org</a></li>
205+
href="http://repo2.maven.org/maven2/com/google/api-client/google-api-client/1.12.0-beta/">repo2.maven.org</a></li>
206206
<li>Update to new version on <a
207207
href="http://code.google.com/p/google-api-java-client">http://code.google.com/p/google-api-java-client</a>
208208
<ul>
209209
<li>Upload to <a
210210
href="http://code.google.com/p/google-api-java-client/downloads/entry">http://code.google.com/p/google-api-java-client/downloads/entry</a>
211211
<ul>
212-
<li>Summary: Google API Client Library for Java, version 1.11.0-beta</li>
212+
<li>Summary: Google API Client Library for Java, version 1.12.0-beta</li>
213213
<li>File:
214-
<code>/tmp/google-api-java-client/1.11.0-beta/google-api-client-assembly/target/google-api-client-1.11.0-beta-java.zip</code></li>
214+
<code>/tmp/google-api-java-client/1.12.0-beta/google-api-client-assembly/target/google-api-client-1.12.0-beta-java.zip</code></li>
215215
<li>Labels: <code>Type-Archive</code>, <code>OpSys-All</code>, and <code>Featured</code></li>
216216
<li>click Submit file</li>
217217
</ul>
@@ -220,7 +220,7 @@ <h3>Release version 1.11.0-beta</h3>
220220
versions by removing any <code>Featured</code> label and adding the <code>Deprecated</code>
221221
label.</li>
222222
<li>Update the following pages changing any reference from the previous
223-
version to the new version <code>1.11.0-beta</code>:
223+
version to the new version <code>1.12.0-beta</code>:
224224
<ul>
225225
<li><a href="http://code.google.com/p/google-api-java-client/admin">admin</a></li>
226226
<li><a
@@ -235,7 +235,7 @@ <h3>Release version 1.11.0-beta</h3>
235235
href="http://www.blogger.com/post-create.g?blogID=4531100327392916335">New
236236
Post</a> on the <a href="http://google-api-java-client.blogspot.com/">announcement
237237
blog</a> about the new version, including links to <a
238-
href="http://code.google.com/p/google-api-java-client/issues/list?can=1&q=milestone=Version1.11.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
238+
href="http://code.google.com/p/google-api-java-client/issues/list?can=1&q=milestone=Version1.12.0%20status=Fixed&colspec=ID%20Type%20Priority%20Summary">new
239239
features and bugs fixed</a>.</li>
240240
</ul>
241241
</body>

0 commit comments

Comments
 (0)