diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9786771c4..3473042c0 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,4 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b + digest: sha256:df8d7b2cc0dbc65871e7edd86601901a0612b272fa3f7f0eb590c5c53aa5f92e diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f36e6e579..a4b083ea1 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -5,3 +5,6 @@ Thank you for opening a Pull Request! Before submitting your PR, there are a few - [ ] Appropriate docs were updated (if necessary) Fixes # ☕️ + +If you write sample code, please follow the [samples format]( +https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md). diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 3c0c8aa6c..62199c957 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -13,7 +13,6 @@ branchProtectionRules: - windows - dependencies (8) - dependencies (11) - - lint - clirr - cla/google - pattern: 1.39.2-sp diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index 1bb182327..f5fc7d516 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 18e23230d..7a106d007 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: contains(github.head_ref, 'release-please') steps: - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b5e56aaa..83ef7f9c2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -39,8 +39,8 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 @@ -54,8 +54,8 @@ jobs: matrix: java: [8, 11, 17] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: ${{matrix.java}} @@ -64,8 +64,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 11 @@ -76,8 +76,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: distribution: zulu java-version: 8 diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index b3448d9c4..3d3729264 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -133,7 +133,7 @@ jobs: - workflow-executions - workflows steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} diff --git a/.kokoro/build.bat b/.kokoro/build.bat index cc602c9eb..067cf4a4c 100644 --- a/.kokoro/build.bat +++ b/.kokoro/build.bat @@ -1,18 +1,18 @@ +:: Copyright 2022 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 +:: +:: http://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. +:: Github action job to test core java library features on +:: downstream client libraries before they are released. :: See documentation in type-shell-output.bat -# Copyright 2022 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 -# -# http://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. -# Github action job to test core java library features on -# downstream client libraries before they are released. "C:\Program Files\Git\bin\bash.exe" %~dp0build.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index a326fa602..03f5a60d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.41.5](https://github.com/googleapis/google-http-java-client/compare/v1.41.4...v1.41.5) (2022-03-21) + + +### Documentation + +* **deps:** libraries-bom 24.4.0 release ([#1596](https://github.com/googleapis/google-http-java-client/issues/1596)) ([327fe12](https://github.com/googleapis/google-http-java-client/commit/327fe12a122ebb4022a2da55694217233a2badaf)) + + +### Dependencies + +* update actions/checkout action to v3 ([#1593](https://github.com/googleapis/google-http-java-client/issues/1593)) ([92002c0](https://github.com/googleapis/google-http-java-client/commit/92002c07d60b738657383e2484f56abc1cde6920)) +* update dependency com.fasterxml.jackson.core:jackson-core to v2.13.2 ([#1598](https://github.com/googleapis/google-http-java-client/issues/1598)) ([41ac833](https://github.com/googleapis/google-http-java-client/commit/41ac833249e18cbbd304f825b12202e51bebec85)) +* update project.appengine.version to v2 (major) ([#1597](https://github.com/googleapis/google-http-java-client/issues/1597)) ([c06cf95](https://github.com/googleapis/google-http-java-client/commit/c06cf95f9b1be77e2229c3b2f78ece0789eaec15)) + ### [1.41.4](https://github.com/googleapis/google-http-java-client/compare/v1.41.3...v1.41.4) (2022-02-11) diff --git a/docs/setup.md b/docs/setup.md index 24beb7317..41f4710fd 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.3.0 + 25.0.0 pom import diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 04270e7ec..bce13eba5 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.41.4 + 1.41.5 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.41.4 + 1.41.5 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.41.4 + 1.41.5 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index eccac49f5..0cd3c8b6a 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.41.4 + 1.41.5 ../pom.xml google-http-client-android - 1.41.4 + 1.41.5 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 df289c2c7..d16d0c3c5 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.41.4 + 1.41.5 ../pom.xml google-http-client-apache-v2 - 1.41.4 + 1.41.5 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 c65787f89..717747411 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.41.4 + 1.41.5 ../pom.xml google-http-client-appengine - 1.41.4 + 1.41.5 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 a1ef3f9d8..88ead5637 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.41.4 + 1.41.5 ../pom.xml com.google.http-client google-http-client-assembly - 1.41.4 + 1.41.5 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 9698f4fce..1bb3e4a46 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.41.4 + 1.41.5 pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.41.4 + 1.41.5 com.google.http-client google-http-client-android - 1.41.4 + 1.41.5 com.google.http-client google-http-client-apache-v2 - 1.41.4 + 1.41.5 com.google.http-client google-http-client-appengine - 1.41.4 + 1.41.5 com.google.http-client google-http-client-findbugs - 1.41.4 + 1.41.5 com.google.http-client google-http-client-gson - 1.41.4 + 1.41.5 com.google.http-client google-http-client-jackson2 - 1.41.4 + 1.41.5 com.google.http-client google-http-client-protobuf - 1.41.4 + 1.41.5 com.google.http-client google-http-client-test - 1.41.4 + 1.41.5 com.google.http-client google-http-client-xml - 1.41.4 + 1.41.5 @@ -128,7 +128,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 true @@ -136,7 +136,7 @@ org.apache.maven.plugins maven-site-plugin - 3.10.0 + 3.11.0 true diff --git a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml index 3ecc1060e..ad36ce907 100644 --- a/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml +++ b/google-http-client-findbugs/google-http-client-findbugs-test/pom.xml @@ -11,7 +11,7 @@ maven-compiler-plugin - 3.9.0 + 3.10.1 1.7 1.7 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 405633af6..49237bae1 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.41.4 + 1.41.5 ../pom.xml google-http-client-findbugs - 1.41.4 + 1.41.5 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 49fd928f3..531e0f99b 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.41.4 + 1.41.5 ../pom.xml google-http-client-gson - 1.41.4 + 1.41.5 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 029676351..a2b150ec6 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.41.4 + 1.41.5 ../pom.xml google-http-client-jackson2 - 1.41.4 + 1.41.5 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 aae085125..ebe32c52a 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.41.4 + 1.41.5 ../pom.xml google-http-client-protobuf - 1.41.4 + 1.41.5 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 a039fa7c7..4e2d14e8f 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.41.4 + 1.41.5 ../pom.xml google-http-client-test - 1.41.4 + 1.41.5 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 12aacf968..feb84fd33 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.41.4 + 1.41.5 ../pom.xml google-http-client-xml - 1.41.4 + 1.41.5 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 0ea91d999..85d0534b3 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.41.4 + 1.41.5 ../pom.xml google-http-client - 1.41.4 + 1.41.5 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, @@ -21,7 +21,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.3.0 io.opencensus:opencensus-impl diff --git a/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java b/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java index 9bab77b13..f39499328 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java +++ b/google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java @@ -26,8 +26,8 @@ import java.util.regex.Pattern; /** - * HTTP Media-type as specified in the HTTP RFC ( {@link - * "http://tools.ietf.org/html/rfc2616#section-3.7"}). + * HTTP Media-type as specified in the HTTP RFC. * *

Implementation is not thread-safe. * diff --git a/pom.xml b/pom.xml index b7b194214..e7aa2183f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.41.4 + 1.41.5 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -276,7 +276,7 @@ maven-compiler-plugin - 3.9.0 + 3.10.1 1.7 1.7 @@ -302,7 +302,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 attach-javadocs @@ -355,17 +355,17 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.2.1 + 3.2.2 org.apache.maven.plugins maven-site-plugin - 3.10.0 + 3.11.0 org.apache.maven.plugins maven-dependency-plugin - 3.1.2 + 3.3.0 org.apache.maven.plugins @@ -525,7 +525,7 @@ maven-project-info-reports-plugin - 3.2.1 + 3.2.2 @@ -560,12 +560,12 @@ - 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.41.4 - 1.9.94 + 1.41.5 + 2.0.4 UTF-8 3.0.2 2.9.0 - 2.13.1 + 2.13.2 3.19.4 30.1.1-android 1.1.4c @@ -702,7 +702,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.3.2 com.microsoft.doclet.DocFxDoclet false diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 3d7bb6b62..d4ca3ffab 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.41.4 + 1.41.5 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 21dba3811..70e7f4105 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 24.2.0 + 25.0.0 pom import diff --git a/versions.txt b/versions.txt index cd791f79a..d6d237ef1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.41.4:1.41.4 -google-http-client-bom:1.41.4:1.41.4 -google-http-client-parent:1.41.4:1.41.4 -google-http-client-android:1.41.4:1.41.4 -google-http-client-android-test:1.41.4:1.41.4 -google-http-client-apache-v2:1.41.4:1.41.4 -google-http-client-appengine:1.41.4:1.41.4 -google-http-client-assembly:1.41.4:1.41.4 -google-http-client-findbugs:1.41.4:1.41.4 -google-http-client-gson:1.41.4:1.41.4 -google-http-client-jackson2:1.41.4:1.41.4 -google-http-client-protobuf:1.41.4:1.41.4 -google-http-client-test:1.41.4:1.41.4 -google-http-client-xml:1.41.4:1.41.4 +google-http-client:1.41.5:1.41.5 +google-http-client-bom:1.41.5:1.41.5 +google-http-client-parent:1.41.5:1.41.5 +google-http-client-android:1.41.5:1.41.5 +google-http-client-android-test:1.41.5:1.41.5 +google-http-client-apache-v2:1.41.5:1.41.5 +google-http-client-appengine:1.41.5:1.41.5 +google-http-client-assembly:1.41.5:1.41.5 +google-http-client-findbugs:1.41.5:1.41.5 +google-http-client-gson:1.41.5:1.41.5 +google-http-client-jackson2:1.41.5:1.41.5 +google-http-client-protobuf:1.41.5:1.41.5 +google-http-client-test:1.41.5:1.41.5 +google-http-client-xml:1.41.5:1.41.5