From c5b1b0a95df21423b11ebc44fe5737f54d4f8b32 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 16 Oct 2018 14:08:37 -0700 Subject: [PATCH 1/5] Release v1.26.0 --- google-http-client-android-test/pom.xml | 2 +- google-http-client-android/pom.xml | 4 ++-- google-http-client-appengine/pom.xml | 4 ++-- google-http-client-assembly/pom.xml | 4 ++-- google-http-client-findbugs/pom.xml | 4 ++-- google-http-client-gson/pom.xml | 4 ++-- google-http-client-jackson/pom.xml | 4 ++-- google-http-client-jackson2/pom.xml | 4 ++-- google-http-client-jdo/pom.xml | 4 ++-- google-http-client-protobuf/pom.xml | 4 ++-- google-http-client-test/pom.xml | 4 ++-- google-http-client-xml/pom.xml | 4 ++-- google-http-client/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 28 ++++++++++++------------- 15 files changed, 40 insertions(+), 40 deletions(-) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index a283098e3..41a8b0401 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.26.0-SNAPSHOT + 1.26.0 apk diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 9d8dc384e..70e2863ce 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-android - 1.26.0-SNAPSHOT + 1.26.0 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index c85e4f392..3dd2d0073 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-appengine - 1.26.0-SNAPSHOT + 1.26.0 Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index 62f4335a7..32e06b4ec 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml com.google.http-client google-http-client-assembly - 1.26.0-SNAPSHOT + 1.26.0 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 153a12a4c..c8685055c 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-findbugs - 1.26.0-SNAPSHOT + 1.26.0 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 5e88faf79..de2d26df6 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-gson - 1.26.0-SNAPSHOT + 1.26.0 GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson/pom.xml b/google-http-client-jackson/pom.xml index 3e1d07194..4d72dcf92 100644 --- a/google-http-client-jackson/pom.xml +++ b/google-http-client-jackson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-jackson - 1.26.0-SNAPSHOT + 1.26.0 Jackson extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index ff3160784..901dfb7c0 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-jackson2 - 1.26.0-SNAPSHOT + 1.26.0 Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jdo/pom.xml b/google-http-client-jdo/pom.xml index 7968d94d3..ba69950dd 100644 --- a/google-http-client-jdo/pom.xml +++ b/google-http-client-jdo/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-jdo - 1.26.0-SNAPSHOT + 1.26.0 JDO extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index 0386bf83f..ad52031ff 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-protobuf - 1.26.0-SNAPSHOT + 1.26.0 Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index 0490615c3..578a5c44c 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-test - 1.26.0-SNAPSHOT + 1.26.0 Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 862a7e36b..5d981108e 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client-xml - 1.26.0-SNAPSHOT + 1.26.0 XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 0bbfe49f4..39df8176b 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../pom.xml google-http-client - 1.26.0-SNAPSHOT + 1.26.0 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index 42170d201..130cb310d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 pom Parent for the Google HTTP Client Library for Java diff --git a/versions.txt b/versions.txt index aa42e010d..c4eeab65b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.25.0:1.26.0-SNAPSHOT -google-http-client-parent:1.25.0:1.26.0-SNAPSHOT -google-http-client-android:1.25.0:1.26.0-SNAPSHOT -google-http-client-android-test:1.25.0:1.26.0-SNAPSHOT -google-http-client-appengine:1.25.0:1.26.0-SNAPSHOT -google-http-client-assembly:1.25.0:1.26.0-SNAPSHOT -google-http-client-findbugs:1.25.0:1.26.0-SNAPSHOT -google-http-client-gson:1.25.0:1.26.0-SNAPSHOT -google-http-client-jackson:1.25.0:1.26.0-SNAPSHOT -google-http-client-jackson2:1.25.0:1.26.0-SNAPSHOT -google-http-client-jdo:1.25.0:1.26.0-SNAPSHOT -google-http-client-protobuf:1.25.0:1.26.0-SNAPSHOT -google-http-client-test:1.25.0:1.26.0-SNAPSHOT -google-http-client-xml:1.25.0:1.26.0-SNAPSHOT +google-http-client:1.26.0:1.26.0 +google-http-client-parent:1.26.0:1.26.0 +google-http-client-android:1.26.0:1.26.0 +google-http-client-android-test:1.26.0:1.26.0 +google-http-client-appengine:1.26.0:1.26.0 +google-http-client-assembly:1.26.0:1.26.0 +google-http-client-findbugs:1.26.0:1.26.0 +google-http-client-gson:1.26.0:1.26.0 +google-http-client-jackson:1.26.0:1.26.0 +google-http-client-jackson2:1.26.0:1.26.0 +google-http-client-jdo:1.26.0:1.26.0 +google-http-client-protobuf:1.26.0:1.26.0 +google-http-client-test:1.26.0:1.26.0 +google-http-client-xml:1.26.0:1.26.0 From cc4182d47ca6184d02aa545dc30c0d25893bbcd1 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 16 Oct 2018 14:20:11 -0700 Subject: [PATCH 2/5] Fix samples version annotations --- samples/dailymotion-simple-cmdline-sample/pom.xml | 2 +- samples/googleplus-simple-cmdline-sample/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 14b2c2817..9b867d78f 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/googleplus-simple-cmdline-sample/pom.xml b/samples/googleplus-simple-cmdline-sample/pom.xml index 55a36740b..837b96086 100644 --- a/samples/googleplus-simple-cmdline-sample/pom.xml +++ b/samples/googleplus-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.26.0-SNAPSHOT + 1.26.0 ../../pom.xml googleplus-simple-cmdline-sample From 11cd45d84f0939f91ffa9bbaaf2a8391a4302312 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 17 Oct 2018 15:06:48 -0700 Subject: [PATCH 3/5] set maven memory limits for tests --- .kokoro/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 54392a85e..ac85fb805 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -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 From f34542924a5b694ca49e0c115a075952a58f9a14 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 17 Oct 2018 15:27:00 -0700 Subject: [PATCH 4/5] Fix ordering of modules so deploy can happen --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 130cb310d..87eef9501 100644 --- a/pom.xml +++ b/pom.xml @@ -66,11 +66,14 @@ google-http-client-jackson google-http-client-jackson2 google-http-client-jdo - google-http-client-xml + google-http-client-findbugs google-http-client-test samples/dailymotion-simple-cmdline-sample samples/googleplus-simple-cmdline-sample + + + google-http-client-xml From 3f9ee79ff52440539ab1384d5419f602b6f52ed1 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 17 Oct 2018 15:53:35 -0700 Subject: [PATCH 5/5] Fix straggler versions for assembly --- google-http-client-android-test/pom.xml | 4 ++-- ... google-http-client-1.26.0.jar.properties} | 0 ...http-client-android-1.26.0.jar.properties} | 0 ...le-http-client-gson-1.26.0.jar.properties} | 0 ...http-client-jackson-1.26.0.jar.properties} | 0 ...ttp-client-jackson2-1.26.0.jar.properties} | 0 ...gle-http-client-jdo-1.26.0.jar.properties} | 0 ...ttp-client-protobuf-1.26.0.jar.properties} | 0 ...gle-http-client-xml-1.26.0.jar.properties} | 0 ...ogle-http-client-android-dependencies.html | 12 +++++------ ...le-http-client-appengine-dependencies.html | 20 +++++++++---------- .../google-http-client-dependencies.html | 4 ++-- .../google-http-client-gson-dependencies.html | 20 +++++++++---------- ...ogle-http-client-jackson-dependencies.html | 20 +++++++++---------- ...gle-http-client-jackson2-dependencies.html | 20 +++++++++---------- .../google-http-client-jdo-dependencies.html | 20 +++++++++---------- ...gle-http-client-protobuf-dependencies.html | 12 +++++------ .../google-http-client-xml-dependencies.html | 12 +++++------ .../google/api/client/http/HttpRequest.java | 2 +- 19 files changed, 73 insertions(+), 73 deletions(-) rename google-http-client-assembly/android-properties/{google-http-client-1.26.0-SNAPSHOT.jar.properties => google-http-client-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-android-1.26.0-SNAPSHOT.jar.properties => google-http-client-android-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-gson-1.26.0-SNAPSHOT.jar.properties => google-http-client-gson-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties => google-http-client-jackson-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties => google-http-client-jackson2-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties => google-http-client-jdo-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties => google-http-client-protobuf-1.26.0.jar.properties} (100%) rename google-http-client-assembly/android-properties/{google-http-client-xml-1.26.0-SNAPSHOT.jar.properties => google-http-client-xml-1.26.0.jar.properties} (100%) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 41a8b0401..bfc7039d7 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.26.0-SNAPSHOT + 1.26.0-1.26.0 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.26.0-SNAPSHOT + 1.26.0 junit diff --git a/google-http-client-assembly/android-properties/google-http-client-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-android-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-android-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-gson-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-gson-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-jdo-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-protobuf-1.26.0.jar.properties diff --git a/google-http-client-assembly/android-properties/google-http-client-xml-1.26.0-SNAPSHOT.jar.properties b/google-http-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties similarity index 100% rename from google-http-client-assembly/android-properties/google-http-client-xml-1.26.0-SNAPSHOT.jar.properties rename to google-http-client-assembly/android-properties/google-http-client-xml-1.26.0.jar.properties diff --git a/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html b/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html index ca9e37b57..715d69d47 100644 --- a/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html +++ b/google-http-client-assembly/dependencies/google-http-client-android-dependencies.html @@ -25,7 +25,7 @@
Last Published: 2018-08-20 -  | Version: 1.26.0-SNAPSHOT +  | Version: 1.26.0
@@ -63,7 +63,7 @@

compile

com.google.http-client google-http-client -1.26.0-SNAPSHOT +1.26.0 jar The Apache Software License, Version 2.0
@@ -187,7 +187,7 @@

Project Dependency Graph