From 253b4df521475fe3dea7084da44e7166e87de698 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 04:32:43 +0000 Subject: [PATCH 1/5] deps: bump com.google.cloud:libraries-bom from 26.53.0 to 26.54.0 Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.53.0 to 26.54.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.53.0...v26.54.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- spring-cloud-gcp-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml index fa851414c6..0a6070a544 100644 --- a/spring-cloud-gcp-dependencies/pom.xml +++ b/spring-cloud-gcp-dependencies/pom.xml @@ -34,7 +34,7 @@ - 26.53.0 + 26.54.0 1.23.0 1.0.7.RELEASE 1.3.0 From 546a59ecfeb4cc7ef1aa11f6bc4077bc96e1ba9a Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 4 Feb 2025 11:27:22 -0500 Subject: [PATCH 2/5] fix units --- .../spring/pubsub/support/DefaultPublisherFactoryTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java index 1fc4e7df42..558f3e220f 100644 --- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java +++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java @@ -19,6 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -47,6 +48,7 @@ public void setUp() throws IOException { TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class); TransportChannel mockTransportChannel = mock(TransportChannel.class); when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel); + when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider); ApiCallContext mockContext = mock(ApiCallContext.class); when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext); when(mockContext.withTransportChannel(any())).thenReturn(mockContext); From bd2064e2fe689081c5c91991ad75d97378a52fe8 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 4 Feb 2025 12:14:32 -0500 Subject: [PATCH 3/5] fix units ii --- .../cloud/language/v2/spring/LanguageAutoConfigurationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java index 723bc15cee..33e66e3044 100644 --- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java +++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java @@ -197,6 +197,7 @@ void testExecutorThreadCountFromProperties() { void testCustomTransportChannelProviderUsedWhenProvided() throws IOException { when(mockTransportChannelProvider.getTransportName()).thenReturn("grpc"); when(mockTransportChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel); + when(mockTransportChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockTransportChannelProvider); when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext); when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext); when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext); From 2d14237fc650d38b96a73fff8ff4cc24cc77480d Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 4 Feb 2025 12:17:27 -0500 Subject: [PATCH 4/5] update cache to v4 --- .github/workflows/unitTests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unitTests.yaml b/.github/workflows/unitTests.yaml index c5a5c6f1f9..9627c36ba7 100644 --- a/.github/workflows/unitTests.yaml +++ b/.github/workflows/unitTests.yaml @@ -32,7 +32,7 @@ jobs: with: java-version: ${{ matrix.java }} - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: mvn-cache with: path: ~/.m2/repository From 8e116eae1140dc31628aeee48b1d4529c65e6469 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 4 Feb 2025 12:26:24 -0500 Subject: [PATCH 5/5] update cache to v4 ii --- .github/workflows/unitTests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unitTests.yaml b/.github/workflows/unitTests.yaml index 9627c36ba7..496a30fde0 100644 --- a/.github/workflows/unitTests.yaml +++ b/.github/workflows/unitTests.yaml @@ -103,7 +103,7 @@ jobs: with: java-version: 17 - - uses: actions/cache@v2 + - uses: actions/cache@v4 id: mvn-cache with: path: ~/.m2/repository