From 67d8c5d6347944cb41f52e92389accb150b1eb3d Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Mon, 12 Nov 2018 08:46:33 -0800 Subject: [PATCH] Release google-http-java-client v1.27.0 (#527) * Release v1.27.0 * Fix `@since` javadoc for new write timeout features * Fix VERSION constant * Fix version annotations in google-http-client-android-test artifact * Fix line length * Cleanup output and fix plugin versions * Change order of deployed assets * Add nexus-staging-maven-plugin and release profile to bom * Put the pom last again * bom needs a developers section --- .kokoro/release/stage.sh | 2 +- google-http-client-android-test/pom.xml | 6 +- google-http-client-android/pom.xml | 4 +- google-http-client-appengine/pom.xml | 4 +- google-http-client-assembly/pom.xml | 4 +- google-http-client-bom/README.md | 2 +- google-http-client-bom/pom.xml | 89 ++++++++++++++++--- 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 +- .../google/api/client/http/HttpRequest.java | 6 +- .../api/client/http/LowLevelHttpRequest.java | 2 +- pom.xml | 6 +- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- .../googleplus-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 30 +++---- 22 files changed, 131 insertions(+), 64 deletions(-) diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 02809c918..3b6794c27 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -22,7 +22,7 @@ pushd $(dirname "$0")/../../ setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy \ +mvn clean install deploy -B \ --settings settings.xml \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index d129d05e7..5d6953615 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.1-SNAPSHOT + 1.27.0 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.26.0-1.26.0 + 1.27.0 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.26.0 + 1.27.0 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 99968587f..e52bd4921 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-android - 1.26.1-SNAPSHOT + 1.27.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 27013590a..3fc0641de 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-appengine - 1.26.1-SNAPSHOT + 1.27.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 e89325431..6eb170031 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.1-SNAPSHOT + 1.27.0 ../pom.xml com.google.http-client google-http-client-assembly - 1.26.1-SNAPSHOT + 1.27.0 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/README.md b/google-http-client-bom/README.md index 568a067db..4932f09d8 100644 --- a/google-http-client-bom/README.md +++ b/google-http-client-bom/README.md @@ -12,7 +12,7 @@ To use it in Maven, add the following to your `pom.xml`: com.google.http-client google-http-client-bom - 1.26.0 + 1.27.0 pom import diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index a71e63ae9..05078d44f 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.26.1-SNAPSHOT + 1.27.0 pom Google HTTP Client Library for Java BOM @@ -16,6 +16,18 @@ Google LLC + + + chingor13 + Jeff Ching + chingor@google.com + Google LLC + + Developer + + + + scm:git:https://github.com/googleapis/google-http-java-client.git scm:git:git@github.com:googleapis/google-http-java-client.git @@ -51,63 +63,114 @@ com.google.http-client google-http-client - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-android - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-appengine - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-assembly - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-findbugs - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-gson - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-jackson - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-jackson2 - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-jdo - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-protobuf - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-test - 1.26.1-SNAPSHOT + 1.27.0 com.google.http-client google-http-client-xml - 1.26.1-SNAPSHOT + 1.27.0 + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.6 + true + + sonatype-nexus-staging + https://oss.sonatype.org/ + false + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --pinentry-mode + loopback + + + + + + + + + diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 719b36eeb..243a44d42 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-findbugs - 1.26.1-SNAPSHOT + 1.27.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 443c23aef..40768d189 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-gson - 1.26.1-SNAPSHOT + 1.27.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 712e5366e..177693c69 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-jackson - 1.26.1-SNAPSHOT + 1.27.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 c34bf6f19..ddb0ab9d1 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-jackson2 - 1.26.1-SNAPSHOT + 1.27.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 020b1de33..d1aac3f60 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-jdo - 1.26.1-SNAPSHOT + 1.27.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 8f6917aff..a08599caf 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-protobuf - 1.26.1-SNAPSHOT + 1.27.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 df038a2c1..da137f88f 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-test - 1.26.1-SNAPSHOT + 1.27.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 9f7b745cc..848135406 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client-xml - 1.26.1-SNAPSHOT + 1.27.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 f5ea5497c..9971a0280 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.1-SNAPSHOT + 1.27.0 ../pom.xml google-http-client - 1.26.1-SNAPSHOT + 1.27.0 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, 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 index dcabb9044..856666a68 100644 --- 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 @@ -50,7 +50,7 @@ public final class HttpRequest { * * @since 1.8 */ - public static final String VERSION = "1.26.0"; + public static final String VERSION = "1.27.0"; /** * User agent suffix for all requests. @@ -505,7 +505,7 @@ public HttpRequest setReadTimeout(int readTimeout) { * By default it is 0 (infinite). *

* - * @since 1.26 + * @since 1.27 */ public int getWriteTimeout() { return writeTimeout; @@ -514,7 +514,7 @@ public int getWriteTimeout() { /** * Sets the timeout in milliseconds to send POST/PUT data or {@code 0} for an infinite timeout. * - * @since 1.26 + * @since 1.27 */ public HttpRequest setWriteTimeout(int writeTimeout) { Preconditions.checkArgument(writeTimeout >= 0); diff --git a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java index d3900f91c..36e6c3c22 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java +++ b/google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java @@ -169,7 +169,7 @@ public void setTimeout(int connectTimeout, int readTimeout) throws IOException { * @param writeTimeout timeout in milliseconds to establish a connection or {@code 0} for an * infinite timeout * @throws IOException I/O exception - * @since 1.26 + * @since 1.27 */ public void setWriteTimeout(int writeTimeout) throws IOException { } diff --git a/pom.xml b/pom.xml index 6ced6b2ee..c341ca8bd 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.http-client google-http-client-parent - 1.26.1-SNAPSHOT + 1.27.0 pom Parent for the Google HTTP Client Library for Java @@ -298,6 +298,10 @@ 1.6 + + maven-deploy-plugin + 2.8.2 + org.sonatype.plugins jarjar-maven-plugin diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index ca0ffb08e..63d8dbd99 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.1-SNAPSHOT + 1.27.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 16d6b3a80..da75b3aa6 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.1-SNAPSHOT + 1.27.0 ../../pom.xml googleplus-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 6983f416e..6d23f2a92 100644 --- a/versions.txt +++ b/versions.txt @@ -1,18 +1,18 @@ # Format: # module:released-version:current-version -google-http-client:1.26.0:1.26.1-SNAPSHOT -google-http-client-bom:1.26.0:1.26.1-SNAPSHOT -google-http-client-parent:1.26.0:1.26.1-SNAPSHOT -google-http-client-android:1.26.0:1.26.1-SNAPSHOT -google-http-client-android-test:1.26.0:1.26.1-SNAPSHOT -google-http-client-appengine:1.26.0:1.26.1-SNAPSHOT -google-http-client-assembly:1.26.0:1.26.1-SNAPSHOT -google-http-client-findbugs:1.26.0:1.26.1-SNAPSHOT -google-http-client-gson:1.26.0:1.26.1-SNAPSHOT -google-http-client-jackson:1.26.0:1.26.1-SNAPSHOT -google-http-client-jackson2:1.26.0:1.26.1-SNAPSHOT -google-http-client-jdo:1.26.0:1.26.1-SNAPSHOT -google-http-client-protobuf:1.26.0:1.26.1-SNAPSHOT -google-http-client-test:1.26.0:1.26.1-SNAPSHOT -google-http-client-xml:1.26.0:1.26.1-SNAPSHOT +google-http-client:1.27.0:1.27.0 +google-http-client-bom:1.27.0:1.27.0 +google-http-client-parent:1.27.0:1.27.0 +google-http-client-android:1.27.0:1.27.0 +google-http-client-android-test:1.27.0:1.27.0 +google-http-client-appengine:1.27.0:1.27.0 +google-http-client-assembly:1.27.0:1.27.0 +google-http-client-findbugs:1.27.0:1.27.0 +google-http-client-gson:1.27.0:1.27.0 +google-http-client-jackson:1.27.0:1.27.0 +google-http-client-jackson2:1.27.0:1.27.0 +google-http-client-jdo:1.27.0:1.27.0 +google-http-client-protobuf:1.27.0:1.27.0 +google-http-client-test:1.27.0:1.27.0 +google-http-client-xml:1.27.0:1.27.0