From 34538647512367d70f6d594f0c73157ffffbd471 Mon Sep 17 00:00:00 2001 From: Mridula <66699525+mpeddada1@users.noreply.github.com> Date: Mon, 18 Nov 2024 13:01:45 -0500 Subject: [PATCH 01/21] chore: migrate graalvm jobs to kokoro instance pool (#2023) * chore: migrate graalvm jobs to kokoro instance pool --- .kokoro/presubmit/common.cfg | 9 --------- .kokoro/presubmit/graalvm-native-a.cfg | 10 +++++----- .kokoro/presubmit/graalvm-native-b.cfg | 10 +++++----- renovate.json | 4 +--- 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index ad5913e48..5ba7070f2 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -23,12 +23,3 @@ env_vars: { key: "JOB_TYPE" value: "test" } - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "dpebot_codecov_token" - } - } -} diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index f6a0f1d04..a031a0528 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -1,10 +1,6 @@ # Format: //devtools/kokoro/config/proto/build.proto -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_a:1.11.3" -} +build_file: "google-http-java-client/.kokoro/build.sh" env_vars: { key: "JOB_TYPE" @@ -31,3 +27,7 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + +container_properties { + docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.12.0" +} diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index 0a7901742..271b61f7b 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -1,10 +1,6 @@ # Format: //devtools/kokoro/config/proto/build.proto -# Configure the docker image for kokoro-trampoline. -env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_b:1.11.3" -} +build_file: "google-http-java-client/.kokoro/build.sh" env_vars: { key: "JOB_TYPE" @@ -31,3 +27,7 @@ env_vars: { key: "SECRET_MANAGER_KEYS" value: "java-it-service-account" } + +container_properties { + docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.12.0" +} diff --git a/renovate.json b/renovate.json index 09aa66d34..f734b7d7f 100644 --- a/renovate.json +++ b/renovate.json @@ -19,9 +19,7 @@ "fileMatch": [ "^.kokoro/presubmit/graalvm-native.*.cfg$" ], - "matchStrings": [ - "value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\"" - ], + "matchStrings": ["docker_image: \"us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm.*:(?.*?)\""], "depNameTemplate": "com.google.cloud:native-image-shared-config", "datasourceTemplate": "maven" } From 12c742b1f7536fd1fd408a74071007b15480b149 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Wed, 4 Dec 2024 21:53:02 +0000 Subject: [PATCH 02/21] fix: NPE if response entity is null (#2043) * fix npe * fix npe * fix npe * fix npe --- .../http/apache/v5/Apache5HttpResponse.java | 3 +- .../apache/v5/Apache5ResponseContent.java | 8 +++- .../apache/v5/Apache5HttpResponseTest.java | 36 +++++++++++++++ .../apache/v5/Apache5ResponseContentTest.java | 44 +++++++++++++++++++ 4 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5HttpResponseTest.java create mode 100644 google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5ResponseContentTest.java diff --git a/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5HttpResponse.java b/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5HttpResponse.java index 1574c8c89..ae3c2ffb6 100644 --- a/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5HttpResponse.java +++ b/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5HttpResponse.java @@ -46,7 +46,8 @@ public int getStatusCode() { @Override public InputStream getContent() throws IOException { - return new Apache5ResponseContent(entity.getContent(), response); + InputStream content = entity == null ? null : entity.getContent(); + return new Apache5ResponseContent(content, response); } @Override diff --git a/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5ResponseContent.java b/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5ResponseContent.java index c2d3091df..dfb6da8a4 100644 --- a/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5ResponseContent.java +++ b/google-http-client-apache-v5/src/main/java/com/google/api/client/http/apache/v5/Apache5ResponseContent.java @@ -59,8 +59,12 @@ public synchronized void reset() throws IOException { @Override public void close() throws IOException { - wrappedStream.close(); - response.close(); + if (wrappedStream != null) { + wrappedStream.close(); + } + if (response != null) { + response.close(); + } } @Override diff --git a/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5HttpResponseTest.java b/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5HttpResponseTest.java new file mode 100644 index 000000000..d2712b356 --- /dev/null +++ b/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5HttpResponseTest.java @@ -0,0 +1,36 @@ +/* + * Copyright 2024 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. + */ + +package com.google.api.client.http.apache.v5; + +import static org.junit.Assert.assertNotNull; + +import java.io.InputStream; +import org.apache.hc.client5.http.classic.methods.HttpPost; +import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; +import org.junit.Test; + +public class Apache5HttpResponseTest { + @Test + public void testNullContent() throws Exception { + HttpUriRequestBase base = new HttpPost("http://www.google.com"); + MockClassicHttpResponse mockResponse = new MockClassicHttpResponse(); + mockResponse.setEntity(null); + Apache5HttpResponse response = new Apache5HttpResponse(base, mockResponse); + + InputStream content = response.getContent(); + + assertNotNull(content); + } +} diff --git a/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5ResponseContentTest.java b/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5ResponseContentTest.java new file mode 100644 index 000000000..ddbda0dd5 --- /dev/null +++ b/google-http-client-apache-v5/src/test/java/com/google/api/client/http/apache/v5/Apache5ResponseContentTest.java @@ -0,0 +1,44 @@ +/* + * Copyright 2024 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. + */ + +package com.google.api.client.http.apache.v5; + +import java.io.IOException; +import java.io.InputStream; +import org.junit.Test; + +public class Apache5ResponseContentTest { + @Test + public void testNullResponseContent_doesNotThrowExceptionOnClose() throws Exception { + Apache5ResponseContent response = + new Apache5ResponseContent( + new InputStream() { + @Override + public int read() throws IOException { + return 0; + } + }, + null); + + response.close(); + } + + @Test + public void testNullWrappedContent_doesNotThrowExceptionOnClose() throws Exception { + MockClassicHttpResponse mockResponse = new MockClassicHttpResponse(); + Apache5ResponseContent response = new Apache5ResponseContent(null, mockResponse); + + response.close(); + } +} From 8bb79e5448e0fa2767b029e7101e3d5d5112eaf2 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 4 Dec 2024 23:08:19 +0100 Subject: [PATCH 03/21] deps: update project.appengine.version to v2.0.31 (#2027) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb087eca1..109bd3dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -610,7 +610,7 @@ - Internally, update the default features.json file --> 1.45.1 - 2.0.29 + 2.0.31 UTF-8 3.0.2 2.11.0 From 9fba799ac04c7870f3ee5c425ccb0a51dc7e0d16 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 15:32:38 +0100 Subject: [PATCH 04/21] deps: update dependency io.grpc:grpc-context to v1.68.2 (#2038) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 109bd3dfa..bd6c3d94b 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,7 @@ io.grpc grpc-context - 1.66.0 + 1.68.2 io.opencensus From 5d247854d65075c9e0f8e9076c210f0e93742c46 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 15:33:48 +0100 Subject: [PATCH 05/21] deps: update dependency com.fasterxml.jackson.core:jackson-core to v2.18.2 (#2036) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd6c3d94b..958701ba0 100644 --- a/pom.xml +++ b/pom.xml @@ -614,7 +614,7 @@ UTF-8 3.0.2 2.11.0 - 2.17.2 + 2.18.2 3.21.12 30.1.1-android 1.1.4c From adae4511b0be42e6724fd32e435440d5e548b02e Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 15:34:36 +0100 Subject: [PATCH 06/21] chore(deps): update dependency com.google.cloud:libraries-bom to v26.51.0 (#2033) --- 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 9730678a1..c50e894d7 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -31,7 +31,7 @@ com.google.cloud libraries-bom - 26.44.0 + 26.51.0 pom import From 86179054e951f191faecee404232322767c0b015 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:25:54 +0100 Subject: [PATCH 07/21] build(deps): update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.11.1 (#2030) --- google-http-client-bom/pom.xml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 641009500..345d15b49 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -133,7 +133,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.11.1 true diff --git a/pom.xml b/pom.xml index 958701ba0..1fc7d19fd 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.11.1 attach-javadocs @@ -648,7 +648,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.11.1 1.8 false @@ -806,7 +806,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.8.0 + 3.11.1 com.microsoft.doclet.DocFxDoclet false From ac83eb259331de683806787c172514592d27de01 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:26:44 +0100 Subject: [PATCH 08/21] deps: update dependency ubuntu to v24 (#2041) --- .github/workflows/renovate_config_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 7c5ec7865..36da117bc 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -7,7 +7,7 @@ on: jobs: renovate_bot_config_validation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code From cc6eb61a9f7ae550951ee7b5c8a383d755e76959 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:27:12 +0100 Subject: [PATCH 09/21] deps: update dependency com.google.errorprone:error_prone_annotations to v2.36.0 (#2037) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fc7d19fd..ea76ef663 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ com.google.errorprone error_prone_annotations - 2.30.0 + 2.36.0 com.google.appengine From 024fd718793d20f9439d538b9c342daeb84b89bc Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:27:54 +0100 Subject: [PATCH 10/21] deps: update actions/checkout action to v4.2.2 (#2034) --- .github/workflows/scorecard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index f153dddd4..0181d5306 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -32,7 +32,7 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: persist-credentials: false From 38d523d81025668855f14300f63b2ae06e70523a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:29:23 +0100 Subject: [PATCH 11/21] build(deps): update dependency org.codehaus.mojo:exec-maven-plugin to v3.5.0 (#2032) --- samples/dailymotion-simple-cmdline-sample/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 1094cbe8f..c1bc351b6 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -15,7 +15,7 @@ org.codehaus.mojo exec-maven-plugin - 3.4.1 + 3.5.0 From a2f6adcff2fa1d3fba7706037aae08d323d85320 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:29:50 +0100 Subject: [PATCH 12/21] build(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.2 (#2031) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea76ef663..32c7afc84 100644 --- a/pom.xml +++ b/pom.xml @@ -624,7 +624,7 @@ 5.2.5 0.31.1 .. - 3.4.0 + 3.5.2 false From cc9c948f9f49d6fc672c8f92566f3a0f1c81357d Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 5 Dec 2024 17:30:31 +0100 Subject: [PATCH 13/21] build(deps): update dependency com.google.cloud:native-image-shared-config to v1.12.0 (#2028) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32c7afc84..113427078 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ com.google.cloud native-image-shared-config - 1.11.3 + 1.12.0 + 1.45.2-SNAPSHOT apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.45.1 + 1.45.2-SNAPSHOT android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.45.1 + 1.45.2-SNAPSHOT junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 89d77a108..4cbfa89d0 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-android - 1.45.1 + 1.45.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 2fb75d731..1569683cb 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-apache-v2 - 1.45.1 + 1.45.2-SNAPSHOT Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v5/pom.xml b/google-http-client-apache-v5/pom.xml index 83ecf4776..060dcf3fb 100644 --- a/google-http-client-apache-v5/pom.xml +++ b/google-http-client-apache-v5/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-apache-v5 - 1.45.1 + 1.45.2-SNAPSHOT Apache HTTP transport v5 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 0b2d45962..78444d25d 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-appengine - 1.45.1 + 1.45.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 aa8e32870..c0d50c758 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml com.google.http-client google-http-client-assembly - 1.45.1 + 1.45.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 ed295beef..0bff68ead 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.45.1 + 1.45.2-SNAPSHOT pom Google HTTP Client Library for Java BOM @@ -63,57 +63,57 @@ com.google.http-client google-http-client - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-android - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-apache-v2 - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-apache-v5 - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-appengine - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-findbugs - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-gson - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-jackson2 - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-protobuf - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-test - 1.45.1 + 1.45.2-SNAPSHOT com.google.http-client google-http-client-xml - 1.45.1 + 1.45.2-SNAPSHOT diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index b61cb9134..de4e6abad 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-findbugs - 1.45.1 + 1.45.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 63249542a..15ce7ae6c 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-gson - 1.45.1 + 1.45.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 7b95a307d..233b029ce 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-jackson2 - 1.45.1 + 1.45.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 b460a86a9..5d0fc30d9 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-protobuf - 1.45.1 + 1.45.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 20bcaeb5d..5edd3eb77 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-test - 1.45.1 + 1.45.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 c2964254d..f8576a5ad 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client-xml - 1.45.1 + 1.45.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 582e556ca..bce43649a 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.45.1 + 1.45.2-SNAPSHOT ../pom.xml google-http-client - 1.45.1 + 1.45.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 65daa2c8f..ec0896817 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.45.1 + 1.45.2-SNAPSHOT pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -609,7 +609,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.45.1 + 1.45.2-SNAPSHOT 2.0.31 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index c1bc351b6..acf29f407 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.45.1 + 1.45.2-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 6b6cf561a..de40e1b92 100644 --- a/versions.txt +++ b/versions.txt @@ -1,18 +1,18 @@ # Format: # module:released-version:current-version -google-http-client:1.45.1:1.45.1 -google-http-client-bom:1.45.1:1.45.1 -google-http-client-parent:1.45.1:1.45.1 -google-http-client-android:1.45.1:1.45.1 -google-http-client-android-test:1.45.1:1.45.1 -google-http-client-apache-v2:1.45.1:1.45.1 -google-http-client-apache-v5:1.45.1:1.45.1 -google-http-client-appengine:1.45.1:1.45.1 -google-http-client-assembly:1.45.1:1.45.1 -google-http-client-findbugs:1.45.1:1.45.1 -google-http-client-gson:1.45.1:1.45.1 -google-http-client-jackson2:1.45.1:1.45.1 -google-http-client-protobuf:1.45.1:1.45.1 -google-http-client-test:1.45.1:1.45.1 -google-http-client-xml:1.45.1:1.45.1 +google-http-client:1.45.1:1.45.2-SNAPSHOT +google-http-client-bom:1.45.1:1.45.2-SNAPSHOT +google-http-client-parent:1.45.1:1.45.2-SNAPSHOT +google-http-client-android:1.45.1:1.45.2-SNAPSHOT +google-http-client-android-test:1.45.1:1.45.2-SNAPSHOT +google-http-client-apache-v2:1.45.1:1.45.2-SNAPSHOT +google-http-client-apache-v5:1.45.1:1.45.2-SNAPSHOT +google-http-client-appengine:1.45.1:1.45.2-SNAPSHOT +google-http-client-assembly:1.45.1:1.45.2-SNAPSHOT +google-http-client-findbugs:1.45.1:1.45.2-SNAPSHOT +google-http-client-gson:1.45.1:1.45.2-SNAPSHOT +google-http-client-jackson2:1.45.1:1.45.2-SNAPSHOT +google-http-client-protobuf:1.45.1:1.45.2-SNAPSHOT +google-http-client-test:1.45.1:1.45.2-SNAPSHOT +google-http-client-xml:1.45.1:1.45.2-SNAPSHOT From b3f12421026ac3968e5682cf0cdd74a2eadae795 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:43:33 -0500 Subject: [PATCH 21/21] chore(main): release 1.45.2 (#2045) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 19 ++++++++++++ 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-apache-v5/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 24 +++++++-------- 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 | 30 +++++++++---------- 18 files changed, 76 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25a7684a0..52ac76ad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.45.2](https://github.com/googleapis/google-http-java-client/compare/v1.45.1...v1.45.2) (2024-12-05) + + +### Bug Fixes + +* NPE if response entity is null ([#2043](https://github.com/googleapis/google-http-java-client/issues/2043)) ([12c742b](https://github.com/googleapis/google-http-java-client/commit/12c742b1f7536fd1fd408a74071007b15480b149)) + + +### Dependencies + +* Update actions/checkout action to v4.2.2 ([#2034](https://github.com/googleapis/google-http-java-client/issues/2034)) ([024fd71](https://github.com/googleapis/google-http-java-client/commit/024fd718793d20f9439d538b9c342daeb84b89bc)) +* Update actions/upload-artifact action to v4.4.3 ([#2035](https://github.com/googleapis/google-http-java-client/issues/2035)) ([443157c](https://github.com/googleapis/google-http-java-client/commit/443157c5ff20fdddaf40193e005f43b7bc6a6f54)) +* Update dependency com.fasterxml.jackson.core:jackson-core to v2.18.2 ([#2036](https://github.com/googleapis/google-http-java-client/issues/2036)) ([5d24785](https://github.com/googleapis/google-http-java-client/commit/5d247854d65075c9e0f8e9076c210f0e93742c46)) +* Update dependency com.google.errorprone:error_prone_annotations to v2.36.0 ([#2037](https://github.com/googleapis/google-http-java-client/issues/2037)) ([cc6eb61](https://github.com/googleapis/google-http-java-client/commit/cc6eb61a9f7ae550951ee7b5c8a383d755e76959)) +* Update dependency io.grpc:grpc-context to v1.68.2 ([#2038](https://github.com/googleapis/google-http-java-client/issues/2038)) ([9fba799](https://github.com/googleapis/google-http-java-client/commit/9fba799ac04c7870f3ee5c425ccb0a51dc7e0d16)) +* Update dependency ubuntu to v24 ([#2041](https://github.com/googleapis/google-http-java-client/issues/2041)) ([ac83eb2](https://github.com/googleapis/google-http-java-client/commit/ac83eb259331de683806787c172514592d27de01)) +* Update github/codeql-action action to v3.27.6 ([#2003](https://github.com/googleapis/google-http-java-client/issues/2003)) ([dc8e46a](https://github.com/googleapis/google-http-java-client/commit/dc8e46a6b6308985380e312fad82b7c182dd9e6f)) +* Update project.appengine.version to v2.0.31 ([#2027](https://github.com/googleapis/google-http-java-client/issues/2027)) ([8bb79e5](https://github.com/googleapis/google-http-java-client/commit/8bb79e5448e0fa2767b029e7101e3d5d5112eaf2)) + ## [1.45.1](https://github.com/googleapis/google-http-java-client/compare/v1.45.0...v1.45.1) (2024-11-12) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index bea7ca2d7..168176a12 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.45.2-SNAPSHOT + 1.45.2 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.45.2-SNAPSHOT + 1.45.2 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.45.2-SNAPSHOT + 1.45.2 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 4cbfa89d0..e8ff8ac08 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-android - 1.45.2-SNAPSHOT + 1.45.2 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 1569683cb..d58f2ef8b 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-apache-v2 - 1.45.2-SNAPSHOT + 1.45.2 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v5/pom.xml b/google-http-client-apache-v5/pom.xml index 060dcf3fb..d8a193a2e 100644 --- a/google-http-client-apache-v5/pom.xml +++ b/google-http-client-apache-v5/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-apache-v5 - 1.45.2-SNAPSHOT + 1.45.2 Apache HTTP transport v5 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 78444d25d..eb02924cf 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-appengine - 1.45.2-SNAPSHOT + 1.45.2 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 c0d50c758..b058fb832 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml com.google.http-client google-http-client-assembly - 1.45.2-SNAPSHOT + 1.45.2 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 0bff68ead..91927b591 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.45.2-SNAPSHOT + 1.45.2 pom Google HTTP Client Library for Java BOM @@ -63,57 +63,57 @@ com.google.http-client google-http-client - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-android - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-apache-v2 - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-apache-v5 - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-appengine - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-findbugs - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-gson - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-jackson2 - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-protobuf - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-test - 1.45.2-SNAPSHOT + 1.45.2 com.google.http-client google-http-client-xml - 1.45.2-SNAPSHOT + 1.45.2 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index de4e6abad..02d1ccb80 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-findbugs - 1.45.2-SNAPSHOT + 1.45.2 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 15ce7ae6c..3d8c6f490 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-gson - 1.45.2-SNAPSHOT + 1.45.2 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 233b029ce..2d2bf424d 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-jackson2 - 1.45.2-SNAPSHOT + 1.45.2 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 5d0fc30d9..b3a3fb0d8 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-protobuf - 1.45.2-SNAPSHOT + 1.45.2 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 5edd3eb77..b45b9b873 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-test - 1.45.2-SNAPSHOT + 1.45.2 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 f8576a5ad..c667c14f8 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client-xml - 1.45.2-SNAPSHOT + 1.45.2 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 bce43649a..bceb1ddb4 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.45.2-SNAPSHOT + 1.45.2 ../pom.xml google-http-client - 1.45.2-SNAPSHOT + 1.45.2 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 ec0896817..b0994adf7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.45.2-SNAPSHOT + 1.45.2 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -609,7 +609,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.45.2-SNAPSHOT + 1.45.2 2.0.31 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index acf29f407..19b40aafc 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.45.2-SNAPSHOT + 1.45.2 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index de40e1b92..b7d7abe05 100644 --- a/versions.txt +++ b/versions.txt @@ -1,18 +1,18 @@ # Format: # module:released-version:current-version -google-http-client:1.45.1:1.45.2-SNAPSHOT -google-http-client-bom:1.45.1:1.45.2-SNAPSHOT -google-http-client-parent:1.45.1:1.45.2-SNAPSHOT -google-http-client-android:1.45.1:1.45.2-SNAPSHOT -google-http-client-android-test:1.45.1:1.45.2-SNAPSHOT -google-http-client-apache-v2:1.45.1:1.45.2-SNAPSHOT -google-http-client-apache-v5:1.45.1:1.45.2-SNAPSHOT -google-http-client-appengine:1.45.1:1.45.2-SNAPSHOT -google-http-client-assembly:1.45.1:1.45.2-SNAPSHOT -google-http-client-findbugs:1.45.1:1.45.2-SNAPSHOT -google-http-client-gson:1.45.1:1.45.2-SNAPSHOT -google-http-client-jackson2:1.45.1:1.45.2-SNAPSHOT -google-http-client-protobuf:1.45.1:1.45.2-SNAPSHOT -google-http-client-test:1.45.1:1.45.2-SNAPSHOT -google-http-client-xml:1.45.1:1.45.2-SNAPSHOT +google-http-client:1.45.2:1.45.2 +google-http-client-bom:1.45.2:1.45.2 +google-http-client-parent:1.45.2:1.45.2 +google-http-client-android:1.45.2:1.45.2 +google-http-client-android-test:1.45.2:1.45.2 +google-http-client-apache-v2:1.45.2:1.45.2 +google-http-client-apache-v5:1.45.2:1.45.2 +google-http-client-appengine:1.45.2:1.45.2 +google-http-client-assembly:1.45.2:1.45.2 +google-http-client-findbugs:1.45.2:1.45.2 +google-http-client-gson:1.45.2:1.45.2 +google-http-client-jackson2:1.45.2:1.45.2 +google-http-client-protobuf:1.45.2:1.45.2 +google-http-client-test:1.45.2:1.45.2 +google-http-client-xml:1.45.2:1.45.2