diff --git a/google-cloud-spanner-cassandra/pom.xml b/google-cloud-spanner-cassandra/pom.xml index db9b4211..7580469d 100644 --- a/google-cloud-spanner-cassandra/pom.xml +++ b/google-cloud-spanner-cassandra/pom.xml @@ -101,7 +101,7 @@ org.yaml snakeyaml - 2.2 + 2.7 diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterClientWrapperTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterClientWrapperTest.java index dadb78ad..302d46b1 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterClientWrapperTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/AdapterClientWrapperTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; import com.google.api.gax.grpc.GrpcCallContext; import com.google.api.gax.rpc.ApiCallContext; @@ -45,9 +46,10 @@ public final class AdapterClientWrapperTest { private final Session mockSession = mock(Session.class); private AttachmentsCache attachmentsCache; private final AdapterClient mockAdapterClient = mock(AdapterClient.class); - private final ServerStream mockServerStream = mock(ServerStream.class); + private final ServerStream mockServerStream = + mock(ServerStream.class, withSettings().withoutAnnotations()); private final ServerStreamingCallable mockCallable = - mock(ServerStreamingCallable.class); + mock(ServerStreamingCallable.class, withSettings().withoutAnnotations()); private final SessionManager mockSessionManager = mock(SessionManager.class); private final ApiCallContext context = GrpcCallContext.createDefault(); diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 1a06c6d7..2f48e6e0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -18,6 +18,7 @@ 17 17 false + 3.5.5 true @@ -45,13 +46,13 @@ org.junit.jupiter junit-jupiter-api - 5.10.3 + 5.14.4 test com.google.cloud google-cloud-spanner - 6.93.0 + 6.128.0 test @@ -68,7 +69,7 @@ org.assertj assertj-core - 3.27.3 + 3.27.7 test @@ -80,7 +81,7 @@ maven-failsafe-plugin - 3.5.3 + 3.5.5 diff --git a/pom.xml b/pom.xml index b672d3cf..50bb72bb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.google.cloud sdk-platform-java-config - 3.54.2 + 3.73.0 4.0.0 @@ -68,25 +68,17 @@ - 2.18.3 + 2.22.4 - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations + com.fasterxml.jackson + jackson-bom ${jackson.version} + pom + import com.google.cloud @@ -98,17 +90,17 @@ com.google.cloud google-cloud-spanneradapter - 0.16.0 + 0.39.0 com.google.cloud google-cloud-core - 2.55.0 + 2.81.0 org.apache.cassandra java-driver-core - 4.19.0 + 4.19.4 com.datastax.oss @@ -118,33 +110,43 @@ org.slf4j slf4j-api - 2.0.17 + 2.0.20 org.slf4j slf4j-simple - 2.0.17 + 2.0.20 runtime io.opentelemetry opentelemetry-api - 1.52.0 + 1.67.0 io.opentelemetry opentelemetry-sdk - 1.52.0 + 1.67.0 com.google.cloud.opentelemetry detector-resources-support - 0.33.0 + 0.36.0 com.google.cloud.opentelemetry exporter-metrics - 0.33.0 + 0.37.0 + + + com.google.cloud.opentelemetry + shared-resourcemapping + 0.37.0 + + + io.opentelemetry.semconv + opentelemetry-semconv + 1.41.0 org.mockito @@ -155,19 +157,31 @@ net.bytebuddy byte-buddy - 1.17.5 + 1.18.17 test com.google.truth truth - 1.4.4 + 1.4.5 test org.apache.httpcomponents.client5 httpclient5 - 5.3.1 + 5.6.3 + test + + + org.apache.httpcomponents.core5 + httpcore5 + 5.4.3 + test + + + org.apache.httpcomponents.core5 + httpcore5-h2 + 5.4.3 test @@ -188,7 +202,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.16.0 1.8 1.8 @@ -266,7 +280,7 @@ com.spotify.fmt fmt-maven-plugin - 2.27 + 2.29 diff --git a/samples/pom.xml b/samples/pom.xml index dd6e5d2d..dc9fdfdf 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -34,7 +34,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.4 + 3.2.0 true diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 0d8f304f..7b544d8a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -34,17 +34,17 @@ org.apache.cassandra java-driver-core - 4.19.0 + 4.19.4 com.google.auth google-auth-library-oauth2-http - 1.36.0 + 1.58.0 com.google.protobuf protobuf-java - 4.31.1 + 4.36.2 @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.4 + 3.2.0 true