From 08180a7650c75231c00e6a6282dbd1bb7668c5d4 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 7 Oct 2021 21:16:24 +0000 Subject: [PATCH 01/34] chore: release 1.40.2-SNAPSHOT (#1477) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/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 | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 189057394..f9b2e3896 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.40.1 + 1.40.2-SNAPSHOT apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.40.1 + 1.40.2-SNAPSHOT android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.40.1 + 1.40.2-SNAPSHOT junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 383e11642..dfa33aa74 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-android - 1.40.1 + 1.40.2-SNAPSHOT Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index f65cef781..665c42aa2 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-apache-v2 - 1.40.1 + 1.40.2-SNAPSHOT Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 1ceaf996a..e43b5528a 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-appengine - 1.40.1 + 1.40.2-SNAPSHOT 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 0c6c62104..fe09e59f4 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml com.google.http-client google-http-client-assembly - 1.40.1 + 1.40.2-SNAPSHOT pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 01519dbc1..3c22fee5b 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.40.1 + 1.40.2-SNAPSHOT pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-android - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-apache-v2 - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-appengine - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-findbugs - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-gson - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-jackson2 - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-protobuf - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-test - 1.40.1 + 1.40.2-SNAPSHOT com.google.http-client google-http-client-xml - 1.40.1 + 1.40.2-SNAPSHOT diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index f9d9b03f4..d64698aa4 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-findbugs - 1.40.1 + 1.40.2-SNAPSHOT Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index ad768a4d0..ec2fcae68 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-gson - 1.40.1 + 1.40.2-SNAPSHOT GSON 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 1d9ef4286..adfee37c9 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-jackson2 - 1.40.1 + 1.40.2-SNAPSHOT Jackson 2 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 5f6cd1b84..5428450cf 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-protobuf - 1.40.1 + 1.40.2-SNAPSHOT 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 5bd3dc575..f93185c28 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-test - 1.40.1 + 1.40.2-SNAPSHOT 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 2e533db6f..a9ba1e312 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client-xml - 1.40.1 + 1.40.2-SNAPSHOT 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 5c5314c17..1c15a597d 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.40.1 + 1.40.2-SNAPSHOT ../pom.xml google-http-client - 1.40.1 + 1.40.2-SNAPSHOT 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 c66450055..6eaabafac 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.40.1 + 1.40.2-SNAPSHOT pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -568,7 +568,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.40.1 + 1.40.2-SNAPSHOT 1.9.91 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 259925535..79c34b57e 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.40.1 + 1.40.2-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 106d4e30f..1f2460758 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.40.1:1.40.1 -google-http-client-bom:1.40.1:1.40.1 -google-http-client-parent:1.40.1:1.40.1 -google-http-client-android:1.40.1:1.40.1 -google-http-client-android-test:1.40.1:1.40.1 -google-http-client-apache-v2:1.40.1:1.40.1 -google-http-client-appengine:1.40.1:1.40.1 -google-http-client-assembly:1.40.1:1.40.1 -google-http-client-findbugs:1.40.1:1.40.1 -google-http-client-gson:1.40.1:1.40.1 -google-http-client-jackson2:1.40.1:1.40.1 -google-http-client-protobuf:1.40.1:1.40.1 -google-http-client-test:1.40.1:1.40.1 -google-http-client-xml:1.40.1:1.40.1 +google-http-client:1.40.1:1.40.2-SNAPSHOT +google-http-client-bom:1.40.1:1.40.2-SNAPSHOT +google-http-client-parent:1.40.1:1.40.2-SNAPSHOT +google-http-client-android:1.40.1:1.40.2-SNAPSHOT +google-http-client-android-test:1.40.1:1.40.2-SNAPSHOT +google-http-client-apache-v2:1.40.1:1.40.2-SNAPSHOT +google-http-client-appengine:1.40.1:1.40.2-SNAPSHOT +google-http-client-assembly:1.40.1:1.40.2-SNAPSHOT +google-http-client-findbugs:1.40.1:1.40.2-SNAPSHOT +google-http-client-gson:1.40.1:1.40.2-SNAPSHOT +google-http-client-jackson2:1.40.1:1.40.2-SNAPSHOT +google-http-client-protobuf:1.40.1:1.40.2-SNAPSHOT +google-http-client-test:1.40.1:1.40.2-SNAPSHOT +google-http-client-xml:1.40.1:1.40.2-SNAPSHOT From f8e62ec779c36024d4c5c552db38faefea20aa33 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Thu, 7 Oct 2021 14:40:46 -0700 Subject: [PATCH 02/34] chore: migrate to owlbot (#1458) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: migrate to owlbot * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot Co-authored-by: Neenu1995 --- .github/.OwlBot.lock.yaml | 3 ++ synth.py => .github/.OwlBot.yaml | 14 ++---- .github/blunderbuss.yml | 2 +- .github/workflows/ci.yaml | 21 +++----- .kokoro/dependencies.sh | 23 +-------- .../android/json/AndroidJsonFactoryTest.java | 29 ++++++++--- .../extensions/android/json/FakeTest.java | 3 +- .../extensions/android/json/package-info.java | 2 - .../api/client/findbugs/test/BetaClass.java | 6 +-- .../findbugs/test/ClassWithBetaField.java | 6 +-- .../findbugs/test/ClassWithBetaMethod.java | 3 +- owlbot.py | 32 ++++++++++++ renovate.json | 5 +- .../java/com/example/json/YouTubeSample.java | 49 ++++++------------- .../com/example/json/YouTubeSampleTest.java | 13 ++--- 15 files changed, 102 insertions(+), 109 deletions(-) create mode 100644 .github/.OwlBot.lock.yaml rename synth.py => .github/.OwlBot.yaml (64%) create mode 100644 owlbot.py diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 000000000..ec24ba682 --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb + image: gcr.io/repo-automation-bots/owlbot-java:latest diff --git a/synth.py b/.github/.OwlBot.yaml similarity index 64% rename from synth.py rename to .github/.OwlBot.yaml index cb1a283f1..8c5f03b4d 100644 --- a/synth.py +++ b/.github/.OwlBot.yaml @@ -1,4 +1,4 @@ -# Copyright 2019 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -11,14 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" -import synthtool.languages.java as java - -java.common_templates(excludes=[ - "README.md", - "java.header", - "checkstyle.xml", - "license-checks.xml", - ".github/workflows/samples.yaml", -]) +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 2176b0543..1a23ea42b 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d7234..3becb5c02 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - main + - master pull_request: name: ci jobs: @@ -9,15 +9,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 17] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v1 with: - distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -30,9 +29,8 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v1 with: - distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -42,15 +40,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11, 17] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v1 with: - distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -61,9 +58,8 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v1 with: - distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -76,9 +72,8 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v1 with: - distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7e..9030ba8f9 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,28 +28,7 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -function determineMavenOpts() { - local javaVersion=$( - # filter down to the version line, then pull out the version between quotes, - # then trim the version number down to its minimal number (removing any - # update or suffix number). - java -version 2>&1 | grep "version" \ - | sed -E 's/^.*"(.*?)".*$/\1/g' \ - | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' - ) - - case $javaVersion in - "17") - # MaxPermSize is no longer supported as of jdk 17 - echo -n "-Xmx1024m" - ;; - *) - echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac -} - -export MAVEN_OPTS=$(determineMavenOpts) +export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java index 9357ffdd0..0665acc2a 100644 --- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java +++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java @@ -15,7 +15,6 @@ import com.google.api.client.json.JsonFactory; import com.google.api.client.test.json.AbstractJsonFactoryTest; - import java.util.ArrayList; /** @@ -24,16 +23,31 @@ * @author Yaniv Inbar */ public class AndroidJsonFactoryTest extends AbstractJsonFactoryTest { - + private static final String GSON_LINE_SEPARATOR = "\n"; private static final String JSON_ENTRY_PRETTY = "{" + GSON_LINE_SEPARATOR + " \"title\": \"foo\"" + GSON_LINE_SEPARATOR + "}"; - private static final String JSON_FEED_PRETTY = "{" + GSON_LINE_SEPARATOR + " \"entries\": [" - + GSON_LINE_SEPARATOR + " {" + GSON_LINE_SEPARATOR + " \"title\": \"foo\"" - + GSON_LINE_SEPARATOR + " }," + GSON_LINE_SEPARATOR + " {" - + GSON_LINE_SEPARATOR + " \"title\": \"bar\"" + GSON_LINE_SEPARATOR + " }" - + GSON_LINE_SEPARATOR + " ]" + GSON_LINE_SEPARATOR + "}"; + private static final String JSON_FEED_PRETTY = + "{" + + GSON_LINE_SEPARATOR + + " \"entries\": [" + + GSON_LINE_SEPARATOR + + " {" + + GSON_LINE_SEPARATOR + + " \"title\": \"foo\"" + + GSON_LINE_SEPARATOR + + " }," + + GSON_LINE_SEPARATOR + + " {" + + GSON_LINE_SEPARATOR + + " \"title\": \"bar\"" + + GSON_LINE_SEPARATOR + + " }" + + GSON_LINE_SEPARATOR + + " ]" + + GSON_LINE_SEPARATOR + + "}"; public AndroidJsonFactoryTest(String name) { super(name); @@ -61,5 +75,4 @@ public final void testToPrettyString_Feed() throws Exception { feed.entries.add(entryBar); assertEquals(JSON_FEED_PRETTY, newFactory().toPrettyString(feed)); } - } diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java index 755613857..e917e114b 100644 --- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java +++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java @@ -26,6 +26,5 @@ public FakeTest(String name) { super(name); } - public final void test() throws Exception { - } + public final void test() throws Exception {} } diff --git a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java index 8fdf668d9..7ecefd770 100644 --- a/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java +++ b/google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java @@ -17,6 +17,4 @@ * * @author Yaniv Inbar */ - package com.google.api.client.extensions.android.json; - diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java index bd2ddb50e..13ed288cc 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java +++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java @@ -20,8 +20,7 @@ @Beta public class BetaClass { - public void method() { - } + public void method() {} @Beta public void betaMethod() { @@ -36,8 +35,7 @@ public BetaClass() { int field; - @Beta - int betaField; + @Beta int betaField; @Override public String toString() { diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java index ea1c5315c..4ceb1cb17 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java +++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java @@ -19,12 +19,10 @@ /** A class which contains {@link Beta} fields. */ public class ClassWithBetaField { - @Beta - public int betaField; + @Beta public int betaField; public int field; - @Beta - public static final int betaStaticField = 10; + @Beta public static final int betaStaticField = 10; public static final int staticField = 20; public ClassWithBetaField() { diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java index 85082217b..3c80ee4be 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java +++ b/google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java @@ -19,8 +19,7 @@ /** A class which contains {@link Beta} methods. */ public class ClassWithBetaMethod { - @Beta - int betaField = 10; + @Beta int betaField = 10; @Beta public void betaMethod() { diff --git a/owlbot.py b/owlbot.py new file mode 100644 index 000000000..8a64e3837 --- /dev/null +++ b/owlbot.py @@ -0,0 +1,32 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import synthtool as s +from synthtool.languages import java + + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates( + excludes=[ + "README.md", + "java.header", + "checkstyle.xml", + "license-checks.xml", + ".github/workflows/samples.yaml", + ] +) diff --git a/renovate.json b/renovate.json index 93a8a717a..eeedeff5f 100644 --- a/renovate.json +++ b/renovate.json @@ -70,5 +70,8 @@ } ], "semanticCommits": true, - "dependencyDashboard": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/samples/snippets/src/main/java/com/example/json/YouTubeSample.java b/samples/snippets/src/main/java/com/example/json/YouTubeSample.java index aad2b8a99..56107f943 100644 --- a/samples/snippets/src/main/java/com/example/json/YouTubeSample.java +++ b/samples/snippets/src/main/java/com/example/json/YouTubeSample.java @@ -18,7 +18,6 @@ import com.google.api.client.http.HttpResponse; import com.google.api.client.util.Key; - import java.io.IOException; import java.util.List; import java.util.Map; @@ -28,8 +27,7 @@ public static class ListResponse { @Key("items") private List searchResults; - @Key - private PageInfo pageInfo; + @Key private PageInfo pageInfo; public List getSearchResults() { return searchResults; @@ -41,11 +39,9 @@ public PageInfo getPageInfo() { } public static class PageInfo { - @Key - private long totalResults; + @Key private long totalResults; - @Key - private long resultsPerPage; + @Key private long resultsPerPage; public long getTotalResults() { return totalResults; @@ -57,14 +53,12 @@ public long getResultsPerPage() { } public static class SearchResult { - @Key - private String kind; + @Key private String kind; @Key("id") private VideoId videoId; - @Key - private Snippet snippet; + @Key private Snippet snippet; public String getKind() { return kind; @@ -80,11 +74,9 @@ public Snippet getSnippet() { } public static class VideoId { - @Key - private String kind; + @Key private String kind; - @Key - private String videoId; + @Key private String videoId; public String getKind() { return kind; @@ -96,20 +88,15 @@ public String getVideoId() { } public static class Snippet { - @Key - private String publishedAt; + @Key private String publishedAt; - @Key - private String channelId; + @Key private String channelId; - @Key - private String title; + @Key private String title; - @Key - private String description; + @Key private String description; - @Key - private Map thumbnails; + @Key private Map thumbnails; public String getPublishedAt() { return publishedAt; @@ -133,14 +120,11 @@ public Map getThumbnails() { } public static class Thumbnail { - @Key - private String url; + @Key private String url; - @Key - private long width; + @Key private long width; - @Key - private long height; + @Key private long height; public String getUrl() { return url; @@ -171,5 +155,4 @@ public static ListResponse parseJson(HttpResponse httpResponse) throws IOExcepti } return listResponse; } - -} \ No newline at end of file +} diff --git a/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java b/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java index 8454437f5..92ed5ab3a 100644 --- a/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java +++ b/samples/snippets/src/test/java/com/example/json/YouTubeSampleTest.java @@ -19,10 +19,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import org.junit.Test; import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpResponse; import com.google.api.client.http.HttpTransport; @@ -36,12 +32,17 @@ import com.google.api.client.testing.http.MockLowLevelHttpRequest; import com.google.api.client.testing.http.MockLowLevelHttpResponse; import com.google.common.base.Preconditions; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import org.junit.Test; public class YouTubeSampleTest { @Test public void testParsing() throws IOException { - final InputStream contents = getClass().getClassLoader().getResourceAsStream("youtube-search.json"); + final InputStream contents = + getClass().getClassLoader().getResourceAsStream("youtube-search.json"); Preconditions.checkNotNull(contents); HttpTransport transport = new MockHttpTransport() { @@ -91,4 +92,4 @@ public LowLevelHttpResponse execute() throws IOException { } } } -} \ No newline at end of file +} From 3ad4831da00579f534ff7eb7de3a0386068902ba Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Thu, 7 Oct 2021 17:48:15 -0400 Subject: [PATCH 03/34] feat: next release from main branch is 1.41.0 (#1478) enable releases --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index cf39204dd..202596e5c 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -6,3 +6,7 @@ branches: handleGHRelease: true releaseType: java-lts branch: 1.39.2-sp + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-backport + branch: 1.40.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index a1781ed43..3c0c8aa6c 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -30,6 +30,20 @@ branchProtectionRules: - lint - clirr - cla/google + - pattern: 1.40.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - units (8) + - units (11) + - windows + - dependencies (8) + - dependencies (11) + - lint + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin From af0d34fb9e158e2b9a3ab8a946de8fefeac93385 Mon Sep 17 00:00:00 2001 From: Kevin Binswanger Date: Fri, 8 Oct 2021 15:04:43 -0500 Subject: [PATCH 04/34] chore: fix various non-functional checkstyle warnings (#865) * Fix various non-functional checkstyle warnings * Update google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java * Update google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java Co-authored-by: Chanseok Oh --- .../src/main/java/com/google/api/client/http/GZipEncoding.java | 1 + .../api/client/testing/util/TestableByteArrayInputStream.java | 2 +- .../src/main/java/com/google/api/client/util/ArrayValueMap.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java b/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java index c811b002c..fce2289da 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java +++ b/google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java @@ -45,6 +45,7 @@ public void close() throws IOException { try { flush(); } catch (IOException ignored) { + // fall through } } }; diff --git a/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java b/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java index 270925a8f..3513579b5 100644 --- a/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java +++ b/google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java @@ -41,7 +41,7 @@ public TestableByteArrayInputStream(byte[] buf) { * @param offset offset in the buffer of the first byte to read * @param length maximum number of bytes to read from the buffer */ - public TestableByteArrayInputStream(byte buf[], int offset, int length) { + public TestableByteArrayInputStream(byte[] buf, int offset, int length) { super(buf); } diff --git a/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java b/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java index 07119ab96..41d5ca717 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java +++ b/google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java @@ -11,6 +11,7 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ + package com.google.api.client.util; import java.lang.reflect.Field; From 7f0fe4d08cab9fee2ab2e4d4ec6519623fada9c1 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Thu, 14 Oct 2021 08:35:30 -0700 Subject: [PATCH 05/34] chore: update doclet version (#1482) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6eaabafac..6d403e025 100644 --- a/pom.xml +++ b/pom.xml @@ -714,7 +714,7 @@ com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.2.1.jar + ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar -outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId} From 1f2bd430905765ca930b10dc98cd02ab5c72ac4d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 16:52:10 +0000 Subject: [PATCH 06/34] build(java): Introduce Native Image testing build script changes (#1485) --- .github/.OwlBot.lock.yaml | 2 +- .github/blunderbuss.yml | 2 +- .github/workflows/ci.yaml | 21 +++++++++++------- .kokoro/build.sh | 5 +++++ .kokoro/dependencies.sh | 23 ++++++++++++++++++- .kokoro/presubmit/graalvm-native.cfg | 33 ++++++++++++++++++++++++++++ renovate.json | 5 +---- 7 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 .kokoro/presubmit/graalvm-native.cfg diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ec24ba682..a600ac229 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:db1616f2f70823d8381d859835229e04371d14f59ac78063c5af73c55c3fffbb image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 1a23ea42b..2176b0543 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,5 +1,5 @@ # Configuration for the Blunderbuss GitHub app. For more info see -# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss +# https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_prs_by: - labels: - samples diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3becb5c02..2425d7234 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,7 +1,7 @@ on: push: branches: - - master + - main pull_request: name: ci jobs: @@ -9,14 +9,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/build.sh @@ -29,8 +30,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.bat @@ -40,14 +42,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [8, 11] + java: [8, 11, 17] steps: - uses: actions/checkout@v2 - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh @@ -58,8 +61,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh @@ -72,8 +76,9 @@ jobs: - uses: stCarolas/setup-maven@v4 with: maven-version: 3.8.1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: zulu java-version: 8 - run: java -version - run: .kokoro/build.sh diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0ab303fec..df4251729 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -69,6 +69,11 @@ integration) verify RETURN_CODE=$? ;; +graalvm) + # Run Unit and Integration Tests with Native Image + mvn test -Pnative -Penable-integration-tests + RETURN_CODE=$? + ;; samples) SAMPLES_DIR=samples # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise. diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9030ba8f9..9a5105d7e 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -28,7 +28,28 @@ source ${scriptDir}/common.sh java -version echo $JOB_TYPE -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" +function determineMavenOpts() { + local javaVersion=$( + # filter down to the version line, then pull out the version between quotes, + # then trim the version number down to its minimal number (removing any + # update or suffix number). + java -version 2>&1 | grep "version" \ + | sed -E 's/^.*"(.*?)".*$/\1/g' \ + | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' + ) + + case $javaVersion in + "17") + # MaxPermSize is no longer supported as of jdk 17 + echo -n "-Xmx1024m" + ;; + *) + echo -n "-Xmx1024m -XX:MaxPermSize=128m" + ;; + esac +} + +export MAVEN_OPTS=$(determineMavenOpts) # this should run maven enforcer retry_with_backoff 3 10 \ diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg new file mode 100644 index 000000000..4c7225ec9 --- /dev/null +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -0,0 +1,33 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/graalvm" +} + +env_vars: { + key: "JOB_TYPE" + value: "graalvm" +} + +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-it-service-account" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" +} diff --git a/renovate.json b/renovate.json index eeedeff5f..93a8a717a 100644 --- a/renovate.json +++ b/renovate.json @@ -70,8 +70,5 @@ } ], "semanticCommits": true, - "dependencyDashboard": true, - "dependencyDashboardLabels": [ - "type: process" - ] + "dependencyDashboard": true } From 4a26e1881075a4f361ec746c2444111c911a8d9f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:10:58 +0000 Subject: [PATCH 07/34] fix(java): java 17 dependency arguments (#1266) (#1489) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/dependencies.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a600ac229..ee664785f 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7e..d7476cfe9 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -38,15 +38,13 @@ function determineMavenOpts() { | sed -E 's/^(1\.[0-9]\.0).*$/\1/g' ) - case $javaVersion in - "17") + if [[ $javaVersion == 17* ]] + then # MaxPermSize is no longer supported as of jdk 17 echo -n "-Xmx1024m" - ;; - *) + else echo -n "-Xmx1024m -XX:MaxPermSize=128m" - ;; - esac + fi } export MAVEN_OPTS=$(determineMavenOpts) From fbdecb487c8e5856b7c0bfa06d2eac44d895c67a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 27 Oct 2021 18:16:33 +0200 Subject: [PATCH 08/34] chore(deps): update dependency com.google.cloud:libraries-bom to v24 (#1490) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `23.1.0` -> `24.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.0.0/compatibility-slim/23.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.0.0/confidence-slim/23.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 9d0257028..085db12e0 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 23.1.0 + 24.0.0 pom import From 6615933e3162969f16d8a0d887afe9f4011e9e5c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 3 Nov 2021 02:48:24 +0100 Subject: [PATCH 09/34] deps: update dependency com.google.code.gson:gson to v2.8.9 (#1492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.code.gson:gson](https://togithub.com/google/gson) | `2.8.8` -> `2.8.9` | [![age](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.8.9/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.8.9/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.8.9/compatibility-slim/2.8.8)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.code.gson:gson/2.8.9/confidence-slim/2.8.8)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/gson ### [`v2.8.9`](https://togithub.com/google/gson/blob/master/CHANGELOG.md#Version-289) - Make OSGi bundle's dependency on `sun.misc` optional ([#​1993](https://togithub.com/google/gson/issues/1993)). - Deprecate `Gson.excluder()` exposing internal `Excluder` class ([#​1986](https://togithub.com/google/gson/issues/1986)). - Prevent Java deserialization of internal classes ([#​1991](https://togithub.com/google/gson/issues/1991)). - Improve number strategy implementation ([#​1987](https://togithub.com/google/gson/issues/1987)). - Fix LongSerializationPolicy null handling being inconsistent with Gson ([#​1990](https://togithub.com/google/gson/issues/1990)). - Support arbitrary Number implementation for Object and Number deserialization ([#​1290](https://togithub.com/google/gson/issues/1290)). - Bump proguard-maven-plugin from 2.4.0 to 2.5.1 ([#​1980](https://togithub.com/google/gson/issues/1980)). - Don't exclude static local classes ([#​1969](https://togithub.com/google/gson/issues/1969)). - Fix `RuntimeTypeAdapterFactory` depending on internal `Streams` class ([#​1959](https://togithub.com/google/gson/issues/1959)). - Improve Maven build ([#​1964](https://togithub.com/google/gson/issues/1964)). - Make dependency on `java.sql` optional ([#​1707](https://togithub.com/google/gson/issues/1707)).
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d403e025..9c21a7235 100644 --- a/pom.xml +++ b/pom.xml @@ -572,7 +572,7 @@ 1.9.91 UTF-8 3.0.2 - 2.8.8 + 2.8.9 2.13.0 3.18.1 30.1.1-android From 87b980b72f7764aae2a1c5f38d321b25ed7471c4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 3 Nov 2021 02:52:18 +0100 Subject: [PATCH 10/34] deps: update dependency com.puppycrawl.tools:checkstyle to v9.1 (#1493) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.puppycrawl.tools:checkstyle](https://checkstyle.org/) ([source](https://togithub.com/checkstyle/checkstyle)) | `9.0.1` -> `9.1` | [![age](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.1/compatibility-slim/9.0.1)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.puppycrawl.tools:checkstyle/9.1/confidence-slim/9.0.1)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- pom.xml | 2 +- samples/dailymotion-simple-cmdline-sample/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9c21a7235..6135c43d1 100644 --- a/pom.xml +++ b/pom.xml @@ -667,7 +667,7 @@ com.puppycrawl.tools checkstyle - 9.0.1 + 9.1 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 79c34b57e..9b32309f3 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -95,7 +95,7 @@ com.puppycrawl.tools checkstyle - 9.0.1 + 9.1 From 43c3b116a173d639a1214121e21ffea2fc32935c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 3 Nov 2021 02:54:22 +0100 Subject: [PATCH 11/34] deps: update project.appengine.version to v1.9.92 (#1495) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.appengine:appengine-api-stubs](https://cloud.google.com/appengine/docs/standard/java/javadoc/) ([source](http://svn.sonatype.org/spice/tags/oss-parent-4)) | `1.9.91` -> `1.9.92` | [![age](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-stubs/1.9.92/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-stubs/1.9.92/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-stubs/1.9.92/compatibility-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-stubs/1.9.92/confidence-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.appengine:appengine-testing](https://cloud.google.com/appengine/docs/standard/java/javadoc/) ([source](http://svn.sonatype.org/spice/tags/oss-parent-4)) | `1.9.91` -> `1.9.92` | [![age](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-testing/1.9.92/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-testing/1.9.92/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-testing/1.9.92/compatibility-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-testing/1.9.92/confidence-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | | [com.google.appengine:appengine-api-1.0-sdk](https://cloud.google.com/appengine/docs/standard/java/javadoc/) ([source](http://svn.sonatype.org/spice/tags/oss-parent-4)) | `1.9.91` -> `1.9.92` | [![age](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-1.0-sdk/1.9.92/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-1.0-sdk/1.9.92/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-1.0-sdk/1.9.92/compatibility-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.appengine:appengine-api-1.0-sdk/1.9.92/confidence-slim/1.9.91)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6135c43d1..022c65a94 100644 --- a/pom.xml +++ b/pom.xml @@ -569,7 +569,7 @@ - Internally, update the default features.json file --> 1.40.2-SNAPSHOT - 1.9.91 + 1.9.92 UTF-8 3.0.2 2.8.9 From bf8a1a671e3a814492129103ffc0105035b60ca7 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:58:32 +0000 Subject: [PATCH 12/34] chore(java): remove pin on Apache Maven 3.8.1 from github actions (#1268) (#1497) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index ee664785f..86fe60037 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 + digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2425d7234..d95a11a26 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,9 +12,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -27,9 +24,6 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -45,9 +39,6 @@ jobs: java: [8, 11, 17] steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -58,9 +49,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -73,9 +61,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: stCarolas/setup-maven@v4 - with: - maven-version: 3.8.1 - uses: actions/setup-java@v2 with: distribution: zulu @@ -83,4 +68,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file From a6a73c25104aa2074b0a2bcf021513f943c727d4 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 5 Nov 2021 18:52:16 +0100 Subject: [PATCH 13/34] deps: update dependency com.google.errorprone:error_prone_annotations to v2.10.0 (#1498) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.errorprone:error_prone_annotations](https://errorprone.info) ([source](https://togithub.com/google/error-prone)) | `2.9.0` -> `2.10.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.10.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.10.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.10.0/compatibility-slim/2.9.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.errorprone:error_prone_annotations/2.10.0/confidence-slim/2.9.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/error-prone ### [`v2.10.0`](https://togithub.com/google/error-prone/releases/v2.10.0) [Compare Source](https://togithub.com/google/error-prone/compare/v2.9.0...v2.10.0) New checks - [`AlwaysThrows`](http://errorprone.info/bugpattern/AlwaysThrows) - [`StackTraceElementGetClass`](http://errorprone.info/bugpattern/StackTraceElementGetClass) - [`BareDotMetacharacter`](http://errorprone.info/bugpattern/BareDotMetacharacter) - [`DistinctVarargsChecker`](http://errorprone.info/bugpattern/DistinctVarargsChecker) - [`MalformedInlineTag`](http://errorprone.info/bugpattern/MalformedInlineTag) - [`MemoizeConstantVisitorStateLookups`](http://errorprone.info/bugpattern/MemoizeConstantVisitorStateLookups) - [`UnicodeEscape`](http://errorprone.info/bugpattern/UnicodeEscape) - [`FieldMissingNullable`](http://errorprone.info/bugpattern/FieldMissingNullable) - [`Java8ApiChecker`](http://errorprone.info/bugpattern/Java8ApiChecker) - [`ParameterMissingNullable`](http://errorprone.info/bugpattern/ParameterMissingNullable) - [`TooManyParameters`](http://errorprone.info/bugpattern/TooManyParameters) - [`TryWithResourcesVariable`](http://errorprone.info/bugpattern/TryWithResourcesVariable) - [`UnnecessaryFinal`](http://errorprone.info/bugpattern/UnnecessaryFinal) - [`VoidMissingNullable`](http://errorprone.info/bugpattern/VoidMissingNullable) Fixed issues: [#​2616](https://togithub.com/google/error-prone/issues/2616), [#​2629](https://togithub.com/google/error-prone/issues/2629) **Full Changelog**: https://github.com/google/error-prone/compare/v2.9.0...v2.10.0
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 022c65a94..9a294f1d4 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ com.google.errorprone error_prone_annotations - 2.9.0 + 2.10.0 com.google.appengine From bf6540ece7d384064b3f21334e2e0429128b1611 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Sat, 6 Nov 2021 00:34:12 +0000 Subject: [PATCH 14/34] Update ci.yaml (#1275) (#1500) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 86fe60037..323e24243 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:ed012741acaae5d03e011244585a1f0625a596d31568967d77772aa5a0a51d5e + digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d95a11a26..93b337c62 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,6 +8,7 @@ jobs: units: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [8, 11, 17] steps: @@ -68,4 +69,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr From 486e8761dd696a120a714baa6d51fa24c1be5636 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 8 Nov 2021 22:00:19 +0000 Subject: [PATCH 15/34] chore: cleanup cloud RAD generation (#1269) (#1501) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/release/publish_javadoc11.sh | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 323e24243..74090051c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:fecf6bd85f19eb046d913982ea36f6d434f9a49ab0545d25e31186aa64367c0c + digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 7c5f7f6f6..62ffd0776 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -36,13 +36,9 @@ mvn clean install -B -q -DskipTests=true export NAME=google-http-client export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) -# V3 generates docfx yml from javadoc -# generate yml -mvn clean site -B -q -P docFX - -# copy README to docfx-yml dir and rename index.md -cp README.md target/docfx-yml/index.md -# copy CHANGELOG to docfx-yml dir and rename history.md +# cloud RAD generation +mvn clean javadoc:aggregate -B -q -P docFX +# include CHANGELOG cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml From 24e6c51112e42f12701b5213a4c5f96466d3f7e2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 9 Nov 2021 01:50:14 +0100 Subject: [PATCH 16/34] deps: update dependency com.google.protobuf:protobuf-java to v3.19.1 (#1488) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a294f1d4..94d13770d 100644 --- a/pom.xml +++ b/pom.xml @@ -574,7 +574,7 @@ 3.0.2 2.8.9 2.13.0 - 3.18.1 + 3.19.1 30.1.1-android 1.1.4c 4.5.13 From 73957ed10ba76449a96109131c183e2db43fca83 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 8 Nov 2021 19:51:26 -0500 Subject: [PATCH 17/34] chore(deps): libraries-bom 24.0.0 release (#1491) --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index 3e57c0741..01d840a6c 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 23.1.0 + 24.0.0 pom import From 1a5826d5a8cbd8b2afa121bff1ed99ac6f8a4e0f Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 9 Nov 2021 14:42:21 +0000 Subject: [PATCH 18/34] chore: update jre to 11 for linter (#1278) (#1504) --- .github/.OwlBot.lock.yaml | 2 +- .github/workflows/ci.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 74090051c..4435ffcbb 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:204b7af96e6d481f19b0ff377aa379d46bc56dd06e1cc7c523f361dd9cbfeeaa + digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 93b337c62..05de1f60d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: zulu - java-version: 8 + java-version: 11 - run: java -version - run: .kokoro/build.sh env: From ded05acc2d630518d6b7c41140454059ef001760 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Wed, 10 Nov 2021 09:36:19 -0800 Subject: [PATCH 19/34] chore: cleanup cloud RAD generation (#1502) Same as https://github.com/googleapis/java-shared-config/pull/344 --- pom.xml | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 94d13770d..e3496f93b 100644 --- a/pom.xml +++ b/pom.xml @@ -695,35 +695,44 @@ docFX - + + + java-docfx-doclet-1.3.0 + ${project.build.directory}/docfx-yml + ${project.artifactId} + + com\.google\.api\.client\.findbugs:com\.google\.api\.client\.test:com\.google\.api\.services + 8 + + + org.apache.maven.plugins maven-javadoc-plugin 3.3.1 - - - docFX - - javadoc - aggregate - aggregate-jar - - - com.microsoft.doclet.DocFxDoclet false - ${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.3.0.jar + + ${env.KOKORO_GFILE_DIR}/${docletName}.jar - -outputpath ${project.build.directory}/docfx-yml - -projectname ${artifactId} - -excludepackages com\.google\.api\.client\.findbugs:com\.google\.api\.client\.test:com\.google\.api\.services + -outputpath ${outputpath} + -projectname ${projectname} + -excludeclasses ${excludeclasses}: + -excludepackages ${excludePackages}: + none + protected + true + ${source} + + ${sourceFileExclude} + - + - - + + From 8b1b8f280774115d0521e0f5eada6dd0ef995ca2 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Nov 2021 23:04:36 +0100 Subject: [PATCH 20/34] deps: update dependency com.coveo:fmt-maven-plugin to v2.12 (#1487) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.googlejavaformat:google-java-format](https://togithub.com/google/google-java-format) | `1.7` -> `1.12.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.googlejavaformat:google-java-format/1.12.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.googlejavaformat:google-java-format/1.12.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.googlejavaformat:google-java-format/1.12.0/compatibility-slim/1.7)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.googlejavaformat:google-java-format/1.12.0/confidence-slim/1.7)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
google/google-java-format ### [`v1.12.0`](https://togithub.com/google/google-java-format/releases/v1.12.0) [Compare Source](https://togithub.com/google/google-java-format/compare/v1.11.0...v1.12.0) ##### What's Changed - Format type annotation as part of the type, not part of the modifiers list ([https://github.com/google/google-java-format/pull/653](https://togithub.com/google/google-java-format/pull/653)) - Fix indentation of case statements on JDK 17 ([https://github.com/google/google-java-format/pull/654](https://togithub.com/google/google-java-format/pull/654)) **Full Changelog**: https://github.com/google/google-java-format/compare/v1.11.0...v1.12.0 ### [`v1.11.0`](https://togithub.com/google/google-java-format/releases/v1.11.0) [Compare Source](https://togithub.com/google/google-java-format/compare/v1.10.0...v1.11.0) `google-java-format` now has improved support for running on JDK 17 early access builds. Changes: - Handle `final` variables in `instanceof` patterns ([#​588](https://togithub.com/google/google-java-format/issues/588)) - Fix handling of annotations in compact record constructors ([#​574](https://togithub.com/google/google-java-format/issues/574)) - Fix a crash in `instanceof` pattern handling ([#​594](https://togithub.com/google/google-java-format/issues/594)) - Wrap multiple values in switch expression case ([#​540](https://togithub.com/google/google-java-format/issues/540)) - Fix formatting of module trees after [JDK-8255464](https://bugs.openjdk.java.net/browse/JDK-8255464) - Support `sealed` classes ([#​603](https://togithub.com/google/google-java-format/issues/603)) ### [`v1.10.0`](https://togithub.com/google/google-java-format/releases/v1.10.0) `google-java-format` now supports running on JDK 16. The following flags are required when running on JDK 16, due to [JEP 396: Strongly Encapsulate JDK Internals by Default](https://openjdk.java.net/jeps/396): java \ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ -jar google-java-format-1.10.0-all-deps.jar T... Other changes: - Handle extra `;` in import lists (https://github.com/google/google-java-format/commit/b769e812a052d7cff4a2d86eff4981a5d358ee2d) - Add missing space between unary `-` and negative literals (https://github.com/google/google-java-format/commit/6da736d786ac71a134ed6cc43e9cd825c83de0fd) - Fix an off-by-one issue on the reflowing of string literals (https://github.com/google/google-java-format/commit/b9fd8d2242869ea7c9efd10cbbe7278c4b6611b1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- google-http-client-bom/pom.xml | 10 +--------- .../google/api/client/http/HttpRequestTracingTest.java | 4 +--- pom.xml | 10 +--------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 3c22fee5b..6ce779b91 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -144,18 +144,10 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 - true - - - com.google.googlejavaformat - google-java-format - 1.7 - - diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java index 6fc9cb37d..9618be795 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java @@ -44,9 +44,7 @@ public class HttpRequestTracingTest { public void setupTestTracer() { Tracing.getExportComponent().getSpanExporter().registerHandler("test", testHandler); TraceParams params = - Tracing.getTraceConfig() - .getActiveTraceParams() - .toBuilder() + Tracing.getTraceConfig().getActiveTraceParams().toBuilder() .setSampler(Samplers.alwaysSample()) .build(); Tracing.getTraceConfig().updateActiveTraceParams(params); diff --git a/pom.xml b/pom.xml index e3496f93b..83122b22f 100644 --- a/pom.xml +++ b/pom.xml @@ -542,18 +542,10 @@ com.coveo fmt-maven-plugin - 2.9 + 2.12 - true - - - com.google.googlejavaformat - google-java-format - 1.7 - - From ea0f6c0f58e8abffae1362feb344a9309d6d814e Mon Sep 17 00:00:00 2001 From: Timur Sadykov Date: Mon, 22 Nov 2021 16:25:57 -0800 Subject: [PATCH 21/34] feat: add AttemptCount to HttpResponseException (#1505) * feat: add tests for attemptCount * fix: more renaming * fix: linter fixes --- .../google/api/client/http/HttpRequest.java | 4 +- .../client/http/HttpResponseException.java | 28 +++++++++++ .../http/HttpResponseExceptionTest.java | 48 +++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) 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 312702b9a..78f15d868 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 @@ -1113,7 +1113,9 @@ public HttpResponse execute() throws IOException { // throw an exception if unsuccessful response if (throwExceptionOnExecuteError && !response.isSuccessStatusCode()) { try { - throw new HttpResponseException(response); + throw new HttpResponseException.Builder(response) + .setAttemptCount(numRetries - retriesRemaining) + .build(); } finally { response.disconnect(); } diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java index a9d80a4f5..63bf6fe4c 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java @@ -42,6 +42,9 @@ public class HttpResponseException extends IOException { /** HTTP response content or {@code null} for none. */ private final String content; + /** Number of attempts performed */ + private final int attemptCount; + /** * Constructor that constructs a detail message from the given HTTP response that includes the * status code, status message and HTTP response content. @@ -73,6 +76,7 @@ protected HttpResponseException(Builder builder) { statusMessage = builder.statusMessage; headers = builder.headers; content = builder.content; + attemptCount = builder.attemptCount; } /** @@ -121,6 +125,15 @@ public final String getContent() { return content; } + /** + * Returns the attempt count + * + * @since 1.41 + */ + public final int getAttemptCount() { + return attemptCount; + } + /** * Builder. * @@ -145,6 +158,9 @@ public static class Builder { /** Detail message to use or {@code null} for none. */ String message; + /** Number of attempts performed */ + int attemptCount; + /** * @param statusCode HTTP status code * @param statusMessage status message or {@code null} @@ -260,6 +276,18 @@ public Builder setContent(String content) { return this; } + /** Returns the request attempt count */ + public final int getAttemptCount() { + return attemptCount; + } + + /** Sets the attempt count for the related HTTP request execution. */ + public Builder setAttemptCount(int attemptCount) { + Preconditions.checkArgument(attemptCount >= 0); + this.attemptCount = attemptCount; + return this; + } + /** Returns a new instance of {@link HttpResponseException} based on this builder. */ public HttpResponseException build() { return new HttpResponseException(this); diff --git a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java index 9066e9d70..cbe6e6a0d 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java @@ -23,6 +23,7 @@ import com.google.api.client.testing.http.MockHttpTransport; import com.google.api.client.testing.http.MockLowLevelHttpRequest; import com.google.api.client.testing.http.MockLowLevelHttpResponse; +import com.google.api.client.util.ExponentialBackOff; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,6 +31,7 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import junit.framework.TestCase; +import org.junit.Assert; import org.junit.function.ThrowingRunnable; /** @@ -208,6 +210,8 @@ public void run() throws Throwable { + SIMPLE_GENERIC_URL + LINE_SEPARATOR + "Unable to find resource"); + // no retries expected + assertEquals(1, responseException.getAttemptCount()); } public void testInvalidCharset() throws Exception { @@ -245,6 +249,50 @@ public void run() throws Throwable { .isEqualTo("404 Not Found\nGET " + SIMPLE_GENERIC_URL); } + public void testAttemptCountWithBackOff() throws Exception { + HttpTransport fakeTransport = + new MockHttpTransport() { + @Override + public LowLevelHttpRequest buildRequest(String method, String url) throws IOException { + return new MockLowLevelHttpRequest() { + @Override + public LowLevelHttpResponse execute() throws IOException { + MockLowLevelHttpResponse result = new MockLowLevelHttpResponse(); + result.setStatusCode(HttpStatusCodes.STATUS_CODE_SERVER_ERROR); + result.setReasonPhrase("Error"); + result.setContent("Unknown Error"); + return result; + } + }; + } + }; + ExponentialBackOff backoff = new ExponentialBackOff.Builder().build(); + final HttpRequest request = + fakeTransport.createRequestFactory().buildGetRequest(new GenericUrl("http://not/used")); + request.setUnsuccessfulResponseHandler( + new HttpBackOffUnsuccessfulResponseHandler(backoff) + .setBackOffRequired( + new HttpBackOffUnsuccessfulResponseHandler.BackOffRequired() { + public boolean isRequired(HttpResponse response) { + return true; + } + })); + request.setNumberOfRetries(1); + HttpResponseException responseException = + assertThrows( + HttpResponseException.class, + new ThrowingRunnable() { + @Override + public void run() throws Throwable { + request.execute(); + } + }); + + Assert.assertEquals(500, responseException.getStatusCode()); + // original request and 1 retry - total 2 + assertEquals(2, responseException.getAttemptCount()); + } + public void testUnsupportedCharset() throws Exception { HttpTransport transport = new MockHttpTransport() { From 0076d48950f99385112b76454396aab8d8e299fa Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Dec 2021 00:20:30 +0100 Subject: [PATCH 22/34] chore(deps): update dependency com.google.cloud.samples:shared-configuration to v1.2.0 (#1519) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud.samples:shared-configuration](https://togithub.com/GoogleCloudPlatform/java-repo-tools) | `1.0.23` -> `1.2.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/compatibility-slim/1.0.23)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud.samples:shared-configuration/1.2.0/confidence-slim/1.0.23)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
GoogleCloudPlatform/java-repo-tools ### [`v1.2.0`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.24...v1.2.0) [Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.24...v1.2.0) ### [`v1.0.24`](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.23...v1.0.24) [Compare Source](https://togithub.com/GoogleCloudPlatform/java-repo-tools/compare/v1.0.23...v1.0.24)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- samples/install-without-bom/pom.xml | 2 +- samples/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 7980adb7a..a95f36f36 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 diff --git a/samples/pom.xml b/samples/pom.xml index 84d755df6..d6b2bfa7e 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0cc5be9cc..69a5e5c7b 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 085db12e0..1abfd0e14 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 From 39f63c3ea255fe256391567e66ada7b4122b16f6 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 7 Dec 2021 17:54:19 +0000 Subject: [PATCH 23/34] fix(java): add -ntp flag to native image testing command (#1299) (#1522) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 3 +- CONTRIBUTING.md | 61 +++++---------------------------------- 3 files changed, 9 insertions(+), 57 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 4435ffcbb..26bd2d098 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:14ecf64ec36f67c7bf04e3dc0f68eafcc01df3955121c38862b695e2ae7515d8 + digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index df4251729..74b4365ea 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests + mvn -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee06..b65dd279c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ mvn -Penable-integration-tests clean verify ## Code Samples -Code Samples must be bundled in separate Maven modules, and guarded by a -Maven profile with the name `enable-samples`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. The samples must be separate from the primary project for a few reasons: -1. Primary projects have a minimum Java version of Java 7 whereas samples have - a minimum Java version of Java 8. Due to this we need the ability to +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. Due to this we need the ability to selectively exclude samples from a build run. 2. Many code samples depend on external GCP services and need credentials to access the service. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn clean verify ``` Some samples require access to GCP services and require a service account: ```bash export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json -mvn -Penable-samples clean verify +mvn clean verify ``` -### Profile Config - -1. To add samples in a profile to your Maven project, add the following to your -`pom.xml` - - ```xml - - [...] - - - enable-samples - - sample - - - - [...] - - ``` - -2. [Activate](#profile-activation) the profile. -3. Define your samples in a normal Maven project in the `samples/` directory. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### Profile Activation - -To include code samples when building and testing the project, enable the -`enable-samples` Maven profile. - -#### Command line - -To activate the Maven profile on the command line add `-Penable-samples` to your -Maven command. - -#### Maven `settings.xml` - -To activate the Maven profile in your `~/.m2/settings.xml` add an entry of -`enable-samples` following the instructions in [Active Profiles][2]. - -This method has the benefit of applying to all projects you build (and is -respected by IntelliJ IDEA) and is recommended if you are going to be -contributing samples to several projects. - -#### IntelliJ IDEA - -To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in -[Activate Maven profiles][3] to activate `enable-samples`. - [1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account [2]: https://maven.apache.org/settings.html#Active_Profiles -[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From 6148d9732a7bd745064d68706de75707a9acbb8f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Dec 2021 19:06:55 +0100 Subject: [PATCH 24/34] deps: update dependency org.apache.httpcomponents:httpcore to v4.4.15 (#1523) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 83122b22f..8ea6d7ad6 100644 --- a/pom.xml +++ b/pom.xml @@ -570,7 +570,7 @@ 30.1.1-android 1.1.4c 4.5.13 - 4.4.14 + 4.4.15 0.28.0 .. false From 2fa47c63e5422bf88fe1320e97e0f61265792d8a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Dec 2021 19:08:20 +0100 Subject: [PATCH 25/34] deps: update project.appengine.version to v1.9.93 (#1516) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8ea6d7ad6..44d9e6ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -561,7 +561,7 @@ - Internally, update the default features.json file --> 1.40.2-SNAPSHOT - 1.9.92 + 1.9.93 UTF-8 3.0.2 2.8.9 From 0922b670e4949ca45b2b25a2d89eea2818349a35 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Dec 2021 19:08:45 +0100 Subject: [PATCH 26/34] deps: update dependency com.puppycrawl.tools:checkstyle to v9.2 (#1510) --- pom.xml | 2 +- samples/dailymotion-simple-cmdline-sample/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 44d9e6ae0..26f7f8bb9 100644 --- a/pom.xml +++ b/pom.xml @@ -659,7 +659,7 @@ com.puppycrawl.tools checkstyle - 9.1 + 9.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 9b32309f3..4f7b4cec3 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -95,7 +95,7 @@ com.puppycrawl.tools checkstyle - 9.1 + 9.2 From 52757737c3db79f660044916ac532671014f6ed3 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 7 Dec 2021 19:09:11 +0100 Subject: [PATCH 27/34] build(deps): update dependency com.coveo:fmt-maven-plugin to v2.13 (#1509) --- google-http-client-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 6ce779b91..ec438b540 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -144,7 +144,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.13 true diff --git a/pom.xml b/pom.xml index 26f7f8bb9..b549d3a9c 100644 --- a/pom.xml +++ b/pom.xml @@ -542,7 +542,7 @@ com.coveo fmt-maven-plugin - 2.12 + 2.13 true From b4ec31308bf2cbc9bd9b1681ec453ac63b1fd088 Mon Sep 17 00:00:00 2001 From: Emily Ball Date: Tue, 7 Dec 2021 11:40:02 -0800 Subject: [PATCH 28/34] chore: update doclet version (#1512) Same as https://github.com/googleapis/java-shared-config/pull/368 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b549d3a9c..8c5536015 100644 --- a/pom.xml +++ b/pom.xml @@ -689,7 +689,7 @@ - java-docfx-doclet-1.3.0 + java-docfx-doclet-1.4.0 ${project.build.directory}/docfx-yml ${project.artifactId} From a042291a3287ac76230c9f1e4cd288041184d704 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Dec 2021 00:06:17 +0100 Subject: [PATCH 29/34] chore(deps): update dependency com.google.cloud:libraries-bom to v24.1.0 (#1525) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `24.0.0` -> `24.1.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.0/compatibility-slim/24.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.0/confidence-slim/24.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1abfd0e14..41a77864d 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 24.0.0 + 24.1.0 pom import From 198e0d5c71cf08a2f629f51d5e24ed3f8e03e403 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 9 Dec 2021 00:38:09 -0500 Subject: [PATCH 30/34] chore(docs): libraries-bom 24.1.0 (#1524) --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index 01d840a6c..3de4c99f7 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 24.0.0 + 24.1.0 pom import From ea93fc68ab198b96c4694c7eb0c47bf5b04688ae Mon Sep 17 00:00:00 2001 From: Daniel Zou Date: Wed, 22 Dec 2021 12:06:48 -0500 Subject: [PATCH 31/34] chore(docs): libraries-bom 24.1.1 (#1528) --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index 3de4c99f7..0db41a40f 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 24.1.0 + 24.1.1 pom import From e833abe43c80d8474ace3f9d33f9ce5d6ef0ddf9 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 28 Dec 2021 21:58:17 +0100 Subject: [PATCH 32/34] chore(deps): update dependency com.google.cloud:libraries-bom to v24.1.1 (#1529) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `24.1.0` -> `24.1.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/compatibility-slim/24.1.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/24.1.1/confidence-slim/24.1.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-http-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 41a77864d..28eb6b006 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 24.1.0 + 24.1.1 pom import From 772370aad7269d30971a38b4471e534d1af9c45a Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Wed, 5 Jan 2022 17:14:22 -0500 Subject: [PATCH 33/34] deps: update dependency com.google.protobuf:protobuf-java to v3.19.2 (#1539) --- .github/.OwlBot.lock.yaml | 4 ++-- .github/.OwlBot.yaml | 2 +- .kokoro/build.sh | 10 +++++----- pom.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 26bd2d098..731a0eb4a 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87 + image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest + digest: sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 8c5f03b4d..5d9a9d8b5 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: - image: "gcr.io/repo-automation-bots/owlbot-java:latest" + image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 74b4365ea..f0b868377 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,15 +47,15 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp RETURN_CODE=$? ;; integration) @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn -ntp -Pnative -Penable-integration-tests test + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -104,7 +104,7 @@ samples) fi ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/pom.xml b/pom.xml index 8c5536015..da7dd667f 100644 --- a/pom.xml +++ b/pom.xml @@ -566,7 +566,7 @@ 3.0.2 2.8.9 2.13.0 - 3.19.1 + 3.19.2 30.1.1-android 1.1.4c 4.5.13 From 0717d7608b06ea317f12287c3956ff22de6e2f38 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:27:09 -0500 Subject: [PATCH 34/34] chore: release 1.41.0 (#1480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: release 1.41.0 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Owl Bot --- CHANGELOG.md | 28 +++++++++++++++++++ google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/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 +-- .../client/http/HttpRequestTracingTest.java | 4 ++- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 18 files changed, 84 insertions(+), 54 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c3c2da18..02c1f66b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [1.41.0](https://www.github.com/googleapis/google-http-java-client/compare/v1.40.1...v1.41.0) (2022-01-05) + + +### Features + +* add AttemptCount to HttpResponseException ([#1505](https://www.github.com/googleapis/google-http-java-client/issues/1505)) ([ea0f6c0](https://www.github.com/googleapis/google-http-java-client/commit/ea0f6c0f58e8abffae1362feb344a9309d6d814e)) +* next release from main branch is 1.41.0 ([#1478](https://www.github.com/googleapis/google-http-java-client/issues/1478)) ([3ad4831](https://www.github.com/googleapis/google-http-java-client/commit/3ad4831da00579f534ff7eb7de3a0386068902ba)) + + +### Bug Fixes + +* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/google-http-java-client/issues/1299)) ([#1522](https://www.github.com/googleapis/google-http-java-client/issues/1522)) ([39f63c3](https://www.github.com/googleapis/google-http-java-client/commit/39f63c3ea255fe256391567e66ada7b4122b16f6)) +* **java:** java 17 dependency arguments ([#1266](https://www.github.com/googleapis/google-http-java-client/issues/1266)) ([#1489](https://www.github.com/googleapis/google-http-java-client/issues/1489)) ([4a26e18](https://www.github.com/googleapis/google-http-java-client/commit/4a26e1881075a4f361ec746c2444111c911a8d9f)) + + +### Dependencies + +* update dependency com.coveo:fmt-maven-plugin to v2.12 ([#1487](https://www.github.com/googleapis/google-http-java-client/issues/1487)) ([8b1b8f2](https://www.github.com/googleapis/google-http-java-client/commit/8b1b8f280774115d0521e0f5eada6dd0ef995ca2)) +* update dependency com.google.code.gson:gson to v2.8.9 ([#1492](https://www.github.com/googleapis/google-http-java-client/issues/1492)) ([6615933](https://www.github.com/googleapis/google-http-java-client/commit/6615933e3162969f16d8a0d887afe9f4011e9e5c)) +* update dependency com.google.errorprone:error_prone_annotations to v2.10.0 ([#1498](https://www.github.com/googleapis/google-http-java-client/issues/1498)) ([a6a73c2](https://www.github.com/googleapis/google-http-java-client/commit/a6a73c25104aa2074b0a2bcf021513f943c727d4)) +* update dependency com.google.protobuf:protobuf-java to v3.19.1 ([#1488](https://www.github.com/googleapis/google-http-java-client/issues/1488)) ([24e6c51](https://www.github.com/googleapis/google-http-java-client/commit/24e6c51112e42f12701b5213a4c5f96466d3f7e2)) +* update dependency com.google.protobuf:protobuf-java to v3.19.2 ([#1539](https://www.github.com/googleapis/google-http-java-client/issues/1539)) ([772370a](https://www.github.com/googleapis/google-http-java-client/commit/772370aad7269d30971a38b4471e534d1af9c45a)) +* update dependency com.puppycrawl.tools:checkstyle to v9.1 ([#1493](https://www.github.com/googleapis/google-http-java-client/issues/1493)) ([87b980b](https://www.github.com/googleapis/google-http-java-client/commit/87b980b72f7764aae2a1c5f38d321b25ed7471c4)) +* update dependency com.puppycrawl.tools:checkstyle to v9.2 ([#1510](https://www.github.com/googleapis/google-http-java-client/issues/1510)) ([0922b67](https://www.github.com/googleapis/google-http-java-client/commit/0922b670e4949ca45b2b25a2d89eea2818349a35)) +* update dependency org.apache.httpcomponents:httpcore to v4.4.15 ([#1523](https://www.github.com/googleapis/google-http-java-client/issues/1523)) ([6148d97](https://www.github.com/googleapis/google-http-java-client/commit/6148d9732a7bd745064d68706de75707a9acbb8f)) +* update project.appengine.version to v1.9.92 ([#1495](https://www.github.com/googleapis/google-http-java-client/issues/1495)) ([43c3b11](https://www.github.com/googleapis/google-http-java-client/commit/43c3b116a173d639a1214121e21ffea2fc32935c)) +* update project.appengine.version to v1.9.93 ([#1516](https://www.github.com/googleapis/google-http-java-client/issues/1516)) ([2fa47c6](https://www.github.com/googleapis/google-http-java-client/commit/2fa47c63e5422bf88fe1320e97e0f61265792d8a)) + ### [1.40.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.40.0...v1.40.1) (2021-10-07) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index f9b2e3896..530aa1612 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.40.2-SNAPSHOT + 1.41.0 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.40.2-SNAPSHOT + 1.41.0 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.40.2-SNAPSHOT + 1.41.0 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index dfa33aa74..ea7daee37 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-android - 1.40.2-SNAPSHOT + 1.41.0 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 665c42aa2..3487aa514 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-apache-v2 - 1.40.2-SNAPSHOT + 1.41.0 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index e43b5528a..4c7e2db64 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-appengine - 1.40.2-SNAPSHOT + 1.41.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 fe09e59f4..664eff698 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml com.google.http-client google-http-client-assembly - 1.40.2-SNAPSHOT + 1.41.0 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index ec438b540..62e749d90 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.40.2-SNAPSHOT + 1.41.0 pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-android - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-apache-v2 - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-appengine - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-findbugs - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-gson - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-jackson2 - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-protobuf - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-test - 1.40.2-SNAPSHOT + 1.41.0 com.google.http-client google-http-client-xml - 1.40.2-SNAPSHOT + 1.41.0 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index d64698aa4..c8e0bc4a4 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-findbugs - 1.40.2-SNAPSHOT + 1.41.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 ec2fcae68..f7d6040fe 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-gson - 1.40.2-SNAPSHOT + 1.41.0 GSON 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 adfee37c9..0096fe1d8 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-jackson2 - 1.40.2-SNAPSHOT + 1.41.0 Jackson 2 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 5428450cf..05872012b 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-protobuf - 1.40.2-SNAPSHOT + 1.41.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 f93185c28..c41739b50 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-test - 1.40.2-SNAPSHOT + 1.41.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 a9ba1e312..ca706248c 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client-xml - 1.40.2-SNAPSHOT + 1.41.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 1c15a597d..2939d4696 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.40.2-SNAPSHOT + 1.41.0 ../pom.xml google-http-client - 1.40.2-SNAPSHOT + 1.41.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/test/java/com/google/api/client/http/HttpRequestTracingTest.java b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java index 9618be795..6fc9cb37d 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java @@ -44,7 +44,9 @@ public class HttpRequestTracingTest { public void setupTestTracer() { Tracing.getExportComponent().getSpanExporter().registerHandler("test", testHandler); TraceParams params = - Tracing.getTraceConfig().getActiveTraceParams().toBuilder() + Tracing.getTraceConfig() + .getActiveTraceParams() + .toBuilder() .setSampler(Samplers.alwaysSample()) .build(); Tracing.getTraceConfig().updateActiveTraceParams(params); diff --git a/pom.xml b/pom.xml index da7dd667f..ceb5b2aa9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.40.2-SNAPSHOT + 1.41.0 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -560,7 +560,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.40.2-SNAPSHOT + 1.41.0 1.9.93 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 4f7b4cec3..522b5cd33 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.40.2-SNAPSHOT + 1.41.0 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 1f2460758..2a515a551 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.40.1:1.40.2-SNAPSHOT -google-http-client-bom:1.40.1:1.40.2-SNAPSHOT -google-http-client-parent:1.40.1:1.40.2-SNAPSHOT -google-http-client-android:1.40.1:1.40.2-SNAPSHOT -google-http-client-android-test:1.40.1:1.40.2-SNAPSHOT -google-http-client-apache-v2:1.40.1:1.40.2-SNAPSHOT -google-http-client-appengine:1.40.1:1.40.2-SNAPSHOT -google-http-client-assembly:1.40.1:1.40.2-SNAPSHOT -google-http-client-findbugs:1.40.1:1.40.2-SNAPSHOT -google-http-client-gson:1.40.1:1.40.2-SNAPSHOT -google-http-client-jackson2:1.40.1:1.40.2-SNAPSHOT -google-http-client-protobuf:1.40.1:1.40.2-SNAPSHOT -google-http-client-test:1.40.1:1.40.2-SNAPSHOT -google-http-client-xml:1.40.1:1.40.2-SNAPSHOT +google-http-client:1.41.0:1.41.0 +google-http-client-bom:1.41.0:1.41.0 +google-http-client-parent:1.41.0:1.41.0 +google-http-client-android:1.41.0:1.41.0 +google-http-client-android-test:1.41.0:1.41.0 +google-http-client-apache-v2:1.41.0:1.41.0 +google-http-client-appengine:1.41.0:1.41.0 +google-http-client-assembly:1.41.0:1.41.0 +google-http-client-findbugs:1.41.0:1.41.0 +google-http-client-gson:1.41.0:1.41.0 +google-http-client-jackson2:1.41.0:1.41.0 +google-http-client-protobuf:1.41.0:1.41.0 +google-http-client-test:1.41.0:1.41.0 +google-http-client-xml:1.41.0:1.41.0