[go: nahoru, domu]
Skip to content

Commit

Permalink
Release google-http-java-client v1.26.0 (#495)
Browse files Browse the repository at this point in the history 
* Release v1.26.0

* Fix samples version annotations

* set maven memory limits for tests

* Fix ordering of modules so deploy can happen

* Fix straggler versions for assembly
  • Loading branch information
@chingor13
chingor13 committed Oct 18, 2018
1 parent 9de9cbb commit 22b8b95
Show file tree
Hide file tree
Showing 36 changed files with 121 additions and 116 deletions.
2 changes: 2 additions & 0 deletions .kokoro/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@ cd github/google-http-java-client/
java -version
echo $JOB_TYPE

export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
mvn test -B
6 changes: 3 additions & 3 deletions google-http-client-android-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.26.0-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
<version>1.26.0</version><!-- {x-version-update:google-http-client-android-test:current} -->
<packaging>apk</packaging>

<build>
Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-android</artifactId>
<version>1.26.0-SNAPSHOT</version>
<version>1.26.0-1.26.0</version>
<exclusions>
<exclusion>
<artifactId>android</artifactId>
Expand All @@ -72,7 +72,7 @@
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-test</artifactId>
<version>1.26.0-SNAPSHOT</version>
<version>1.26.0</version>
<exclusions>
<exclusion>
<artifactId>junit</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions google-http-client-android/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-parent</artifactId>
<version>1.26.0-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
<version>1.26.0</version><!-- {x-version-update:google-http-client-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>google-http-client-android</artifactId>
<version>1.26.0-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
<version>1.26.0</version><!-- {x-version-update:google-http-client-android:current} -->
<name>Android Platform Extensions to the Google HTTP Client Library for Java.</name>

<build>
Expand Down
4 changes: 2 additions & 2 deletions google-http-client-appengine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<parent>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-parent</artifactId>
<version>1.26.0-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
<version>1.26.0</version><!-- {x-version-update:google-http-client-parent:current} -->
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>google-http-client-appengine</artifactId>
<version>1.26.0-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
<version>1.26.0</version><!-- {x-version-update:google-http-client-appengine:current} -->
<name>Google App Engine extensions to the Google HTTP Client Library for Java.</name>

<build>
Expand Down
0 ...ttp-client-1.26.0-SNAPSHOT.jar.properties → .../google-http-client-1.26.0.jar.properties
View file
File renamed without changes.
0 ...nt-android-1.26.0-SNAPSHOT.jar.properties → ...http-client-android-1.26.0.jar.properties
View file
File renamed without changes.
0 ...lient-gson-1.26.0-SNAPSHOT.jar.properties → ...le-http-client-gson-1.26.0.jar.properties
View file
File renamed without changes.
0 ...nt-jackson-1.26.0-SNAPSHOT.jar.properties → ...http-client-jackson-1.26.0.jar.properties
View file
File renamed without changes.
0 ...t-jackson2-1.26.0-SNAPSHOT.jar.properties → ...ttp-client-jackson2-1.26.0.jar.properties
View file
File renamed without changes.
0 ...client-jdo-1.26.0-SNAPSHOT.jar.properties → ...gle-http-client-jdo-1.26.0.jar.properties
View file
File renamed without changes.
0 ...t-protobuf-1.26.0-SNAPSHOT.jar.properties → ...ttp-client-protobuf-1.26.0.jar.properties
View file
File renamed without changes.
0 ...client-xml-1.26.0-SNAPSHOT.jar.properties → ...gle-http-client-xml-1.26.0.jar.properties
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions google-http-client-assembly/dependencies/google-http-client-android-dependencies.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="xleft">
<span id="publishDate">Last Published: 2018-08-20</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0-SNAPSHOT</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0</span>
</div>
<div class="xright">

Expand Down Expand Up @@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
<tr class="b">
<td>com.google.http-client</td>
<td><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client">google-http-client</a></td>
<td>1.26.0-SNAPSHOT</td>
<td>1.26.0</td>
<td>jar</td>
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
<div class="section">
Expand Down Expand Up @@ -187,7 +187,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
<div class="section">
<h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<ul>
<li>com.google.http-client:google-http-client-android:jar:1.26.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<li>com.google.http-client:google-http-client-android:jar:1.26.0 <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Android Platform Extensions to the Google HTTP Client Library for Java.</th></tr>
Expand Down Expand Up @@ -289,7 +289,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
These properties make JSON an ideal data-interchange language.</p>
<p><b>URL: </b><a class="externalLink" href="http://www.json.org/java/index.html">http://www.json.org/java/index.html</a></p>
<p><b>Project License: </b><a class="externalLink" href="http://www.json.org/license.html">provided without support or warranty</a></p></td></tr></table></div></li></ul></li>
<li>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
<li>com.google.http-client:google-http-client:jar:1.26.0 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Google HTTP Client Library for Java</th></tr>
Expand Down Expand Up @@ -357,7 +357,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
<td>1.5</td>
<td>debug</td></tr>
<tr class="b">
<td>google-http-client-1.26.0-SNAPSHOT.jar</td>
<td>google-http-client-1.26.0.jar</td>
<td>261.81 kB</td>
<td>223</td>
<td>200</td>
Expand Down Expand Up @@ -509,7 +509,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
<td>-</td>
<td>-</td></tr>
<tr class="b">
<td>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT</td>
<td>com.google.http-client:google-http-client:jar:1.26.0</td>
<td>-</td>
<td>-</td>
<td>-</td></tr>
Expand Down
20 changes: 10 additions & 10 deletions google-http-client-assembly/dependencies/google-http-client-appengine-dependencies.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="xleft">
<span id="publishDate">Last Published: 2018-08-20</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0-SNAPSHOT</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0</span>
</div>
<div class="xright">

Expand Down Expand Up @@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
<tr class="b">
<td>com.google.http-client</td>
<td><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client">google-http-client</a></td>
<td>1.26.0-SNAPSHOT</td>
<td>1.26.0</td>
<td>jar</td>
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
<div class="section">
Expand Down Expand Up @@ -97,7 +97,7 @@ <h3>test<a name="test"></a></h3>
<tr class="a">
<td>com.google.http-client</td>
<td><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
<td>1.26.0-SNAPSHOT</td>
<td>1.26.0</td>
<td>jar</td>
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
<tr class="b">
Expand Down Expand Up @@ -193,7 +193,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
<div class="section">
<h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<ul>
<li>com.google.http-client:google-http-client-appengine:jar:1.26.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<li>com.google.http-client:google-http-client-appengine:jar:1.26.0 <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Google App Engine extensions to the Google HTTP Client Library for Java.</th></tr>
Expand All @@ -203,7 +203,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<p><b>URL: </b><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client-appengine">https://github.com/googleapis/google-http-java-client/google-http-client-appengine</a></p>
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
<ul>
<li>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
<li>com.google.http-client:google-http-client:jar:1.26.0 (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Google HTTP Client Library for Java</th></tr>
Expand Down Expand Up @@ -274,7 +274,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
translator to modify the result of translation.</p>
<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
<li>com.google.http-client:google-http-client-test:jar:1.26.0-SNAPSHOT (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
<li>com.google.http-client:google-http-client-test:jar:1.26.0 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
Expand Down Expand Up @@ -391,15 +391,15 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
<td>1.6</td>
<td>debug</td></tr>
<tr class="a">
<td>google-http-client-1.26.0-SNAPSHOT.jar</td>
<td>google-http-client-1.26.0.jar</td>
<td>261.81 kB</td>
<td>223</td>
<td>200</td>
<td>16</td>
<td>1.6</td>
<td>debug</td></tr>
<tr class="b">
<td>google-http-client-test-1.26.0-SNAPSHOT.jar</td>
<td>google-http-client-test-1.26.0.jar</td>
<td>51.73 kB</td>
<td>59</td>
<td>49</td>
Expand Down Expand Up @@ -550,12 +550,12 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
<td>-</td>
<td>-</td></tr>
<tr class="a">
<td>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT</td>
<td>com.google.http-client:google-http-client:jar:1.26.0</td>
<td>-</td>
<td>-</td>
<td>-</td></tr>
<tr class="b">
<td>com.google.http-client:google-http-client-test:jar:1.26.0-SNAPSHOT</td>
<td>com.google.http-client:google-http-client-test:jar:1.26.0</td>
<td>-</td>
<td>-</td>
<td>-</td></tr>
Expand Down
4 changes: 2 additions & 2 deletions google-http-client-assembly/dependencies/google-http-client-dependencies.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="xleft">
<span id="publishDate">Last Published: 2018-08-20</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0-SNAPSHOT</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0</span>
</div>
<div class="xright">

Expand Down Expand Up @@ -237,7 +237,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
<div class="section">
<h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<ul>
<li>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<li>com.google.http-client:google-http-client:jar:1.26.0 <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Google HTTP Client Library for Java</th></tr>
Expand Down
20 changes: 10 additions & 10 deletions google-http-client-assembly/dependencies/google-http-client-gson-dependencies.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="xleft">
<span id="publishDate">Last Published: 2018-08-20</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0-SNAPSHOT</span>
&nbsp;| <span id="projectVersion">Version: 1.26.0</span>
</div>
<div class="xright">

Expand Down Expand Up @@ -69,7 +69,7 @@ <h3>compile<a name="compile"></a></h3>
<tr class="a">
<td>com.google.http-client</td>
<td><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client">google-http-client</a></td>
<td>1.26.0-SNAPSHOT</td>
<td>1.26.0</td>
<td>jar</td>
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
<div class="section">
Expand All @@ -91,7 +91,7 @@ <h3>test<a name="test"></a></h3>
<tr class="a">
<td>com.google.http-client</td>
<td><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
<td>1.26.0-SNAPSHOT</td>
<td>1.26.0</td>
<td>jar</td>
<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
<tr class="b">
Expand Down Expand Up @@ -171,7 +171,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
<div class="section">
<h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<ul>
<li>com.google.http-client:google-http-client-gson:jar:1.26.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<li>com.google.http-client:google-http-client-gson:jar:1.26.0 <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>GSON extensions to the Google HTTP Client Library for Java.</th></tr>
Expand All @@ -181,7 +181,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
<p><b>URL: </b><a class="externalLink" href="https://github.com/googleapis/google-http-java-client/google-http-client-gson">https://github.com/googleapis/google-http-java-client/google-http-client-gson</a></p>
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
<ul>
<li>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
<li>com.google.http-client:google-http-client:jar:1.26.0 (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Google HTTP Client Library for Java</th></tr>
Expand Down Expand Up @@ -252,7 +252,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
translator to modify the result of translation.</p>
<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
<li>com.google.http-client:google-http-client-test:jar:1.26.0-SNAPSHOT (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
<li>com.google.http-client:google-http-client-test:jar:1.26.0 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
<table border="0" class="bodyTable">
<tr class="a">
<th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
Expand Down Expand Up @@ -334,15 +334,15 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
<td>1.6</td>
<td>debug</td></tr>
<tr class="a">
<td>google-http-client-1.26.0-SNAPSHOT.jar</td>
<td>google-http-client-1.26.0.jar</td>
<td>261.81 kB</td>
<td>223</td>
<td>200</td>
<td>16</td>
<td>1.6</td>
<td>debug</td></tr>
<tr class="b">
<td>google-http-client-test-1.26.0-SNAPSHOT.jar</td>
<td>google-http-client-test-1.26.0.jar</td>
<td>51.73 kB</td>
<td>59</td>
<td>49</td>
Expand Down Expand Up @@ -475,12 +475,12 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
<td>-</td>
<td>-</td></tr>
<tr class="a">
<td>com.google.http-client:google-http-client:jar:1.26.0-SNAPSHOT</td>
<td>com.google.http-client:google-http-client:jar:1.26.0</td>
<td>-</td>
<td>-</td>
<td>-</td></tr>
<tr class="b">
<td>com.google.http-client:google-http-client-test:jar:1.26.0-SNAPSHOT</td>
<td>com.google.http-client:google-http-client-test:jar:1.26.0</td>
<td>-</td>
<td>-</td>
<td>-</td></tr>
Expand Down
Loading

0 comments on commit 22b8b95

Please sign in to comment.