Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0 #3395

Merged
merged 3 commits into from
Dec 5, 2024
Merged

deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0 #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
149faa4
deps: bump com.google.cloud:libraries-bom from 26.49.0 to 26.51.0
dependabot[bot] Dec 5, 2024
b06028a
add addition mock
JoeWang1127 Dec 5, 2024
741e908
remove redundant assert
JoeWang1127 Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...re/src/test/java/com/google/cloud/spring/autoconfigure/trace/pubsub/TraceHelperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ void should_inject_child_context() {
assertThat(producerSpan.kind()).isEqualTo(PRODUCER);
assertChildOf(producerSpan, parent);
assertThat(instrumentedMessage.getAttributesMap())
.isNotNull()
.containsEntry("b3", producerSpan.traceId() + "-" + producerSpan.id() + "-1");
}

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-gcp-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</distributionManagement>

<properties>
<gcp-libraries-bom.version>26.49.0</gcp-libraries-bom.version>
<gcp-libraries-bom.version>26.51.0</gcp-libraries-bom.version>
<cloud-sql-socket-factory.version>1.20.1</cloud-sql-socket-factory.version>
<r2dbc-mysql-driver.version>0.9.7</r2dbc-mysql-driver.version>
<r2dbc-postgres-driver.version>0.8.13.RELEASE</r2dbc-postgres-driver.version>
Expand Down
2 changes: 2 additions & 0 deletions ...ub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -46,6 +47,7 @@ public void setUp() throws IOException {
factory.setCredentialsProvider(NoCredentialsProvider.create());
TransportChannelProvider mockChannelProvider = mock(TransportChannelProvider.class);
TransportChannel mockTransportChannel = mock(TransportChannel.class);
when(mockChannelProvider.withUseS2A(anyBoolean())).thenReturn(mockChannelProvider);
when(mockChannelProvider.getTransportChannel()).thenReturn(mockTransportChannel);
ApiCallContext mockContext = mock(ApiCallContext.class);
when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);
Expand Down
Loading