diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 74184c655da..96e009fb69a 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -79,7 +79,7 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc RETURN_CODE=$? ;; -integration|integration-directpath-enabled) +integration) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ -Penable-integration-tests \ @@ -94,7 +94,38 @@ integration|integration-directpath-enabled) verify RETURN_CODE=$? ;; -integration-cloud-devel|integration-cloud-devel-directpath-enabled) +integration-directpath-enabled) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ + -Penable-integration-tests \ + -Djava.net.preferIPv4Stack=true \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.main.skip=true \ + -Dspanner.gce.config.project_id=gcloud-devel \ + -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-directpath \ + -fae \ + verify + RETURN_CODE=$? + ;; +integration-cloud-devel) + mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ + -Penable-integration-tests \ + -Djava.net.preferIPv4Stack=true \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -Dmaven.main.skip=true \ + -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ + -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-testing \ + -Dspanner.gce.config.project_id=span-cloud-testing \ + -fae \ + verify + RETURN_CODE=$? + ;; +integration-cloud-devel-directpath-enabled) mvn -B ${INTEGRATION_TEST_ARGS} \ -ntp \ -Penable-integration-tests \ @@ -104,7 +135,7 @@ integration-cloud-devel|integration-cloud-devel-directpath-enabled) -Denforcer.skip=true \ -Dmaven.main.skip=true \ -Dspanner.gce.config.server_url=https://staging-wrenchworks.sandbox.googleapis.com \ - -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-testing-east1 \ + -Dspanner.testenv.instance=projects/span-cloud-testing/instances/spanner-java-client-directpath \ -Dspanner.gce.config.project_id=span-cloud-testing \ -fae \ verify diff --git a/.kokoro/presubmit/integration-cloud-devel.cfg b/.kokoro/presubmit/integration-cloud-devel.cfg new file mode 100644 index 00000000000..94b698199e1 --- /dev/null +++ b/.kokoro/presubmit/integration-cloud-devel.cfg @@ -0,0 +1,22 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "integration-cloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "secret_manager/java-client-testing" +} + +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-client-testing" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 84a6ce1d979..c7eae29cd88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [6.60.1](https://github.com/googleapis/java-spanner/compare/v6.60.0...v6.60.1) (2024-02-23) + + +### Dependencies + +* Update dependency com.google.cloud:google-cloud-monitoring to v3.37.0 ([#2920](https://github.com/googleapis/java-spanner/issues/2920)) ([a3441bb](https://github.com/googleapis/java-spanner/commit/a3441bbad546a1aac1349d6e142a4ac8d32d2a90)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.0 ([#2861](https://github.com/googleapis/java-spanner/issues/2861)) ([a652c3b](https://github.com/googleapis/java-spanner/commit/a652c3b6ef6d6ed87d581e73a26a5086acdc5f07)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.1 ([#2919](https://github.com/googleapis/java-spanner/issues/2919)) ([8800a28](https://github.com/googleapis/java-spanner/commit/8800a2894a1c17bde1a0da3ffcc868f10f7690d5)) +* Update dependency org.json:json to v20240205 ([#2913](https://github.com/googleapis/java-spanner/issues/2913)) ([277ed81](https://github.com/googleapis/java-spanner/commit/277ed81a0beb95ea57f95a9660a4a6b6adea645b)) +* Update dependency org.junit.vintage:junit-vintage-engine to v5.10.2 ([#2868](https://github.com/googleapis/java-spanner/issues/2868)) ([71a65ec](https://github.com/googleapis/java-spanner/commit/71a65ecee5af63996297f8692d569d2a9acfd8ac)) +* Update opentelemetry.version to v1.35.0 ([#2902](https://github.com/googleapis/java-spanner/issues/2902)) ([3286eae](https://github.com/googleapis/java-spanner/commit/3286eaea96a40c6ace8abed22040a637d291b09c)) + ## [6.60.0](https://github.com/googleapis/java-spanner/compare/v6.59.0...v6.60.0) (2024-02-21) diff --git a/README.md b/README.md index a166d62fb65..257ec20bc16 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.32.0 + 26.33.0 pom import @@ -42,7 +42,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-spanner - 6.57.0 + 6.60.0 ``` @@ -50,20 +50,20 @@ If you are using Maven without the BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies: ```Groovy -implementation platform('com.google.cloud:libraries-bom:26.32.0') +implementation platform('com.google.cloud:libraries-bom:26.33.0') implementation 'com.google.cloud:google-cloud-spanner' ``` If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-spanner:6.59.0' +implementation 'com.google.cloud:google-cloud-spanner:6.60.0' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.59.0" +libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.60.0" ``` @@ -643,7 +643,7 @@ Java is a registered trademark of Oracle and/or its affiliates. [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-spanner/java11.html [stability-image]: https://img.shields.io/badge/stability-stable-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-spanner.svg -[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.59.0 +[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-spanner/6.60.0 [authentication]: https://github.com/googleapis/google-cloud-java#authentication [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml index fbf4474c4ff..0ef292d4ca3 100644 --- a/google-cloud-spanner-bom/pom.xml +++ b/google-cloud-spanner-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner-bom - 6.60.0 + 6.60.1 pom com.google.cloud @@ -53,43 +53,43 @@ com.google.cloud google-cloud-spanner - 6.60.0 + 6.60.1 com.google.cloud google-cloud-spanner test-jar - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml index f24a11ec758..2d563185aa2 100644 --- a/google-cloud-spanner-executor/pom.xml +++ b/google-cloud-spanner-executor/pom.xml @@ -5,14 +5,14 @@ 4.0.0 com.google.cloud google-cloud-spanner-executor - 6.60.0 + 6.60.1 jar Google Cloud Spanner Executor com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 @@ -188,7 +188,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.1 + 3.2.5 diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml index bfcea0a75c7..ef121f7a323 100644 --- a/google-cloud-spanner/pom.xml +++ b/google-cloud-spanner/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-spanner - 6.60.0 + 6.60.1 jar Google Cloud Spanner https://github.com/googleapis/java-spanner @@ -11,12 +11,12 @@ com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 google-cloud-spanner 0.31.1 - 1.34.1 + 1.35.0 com.google.cloud.spanner.GceTestEnvConfig projects/gcloud-devel/instances/spanner-testing-east1 gcloud-devel @@ -388,7 +388,7 @@ org.json json - 20231013 + 20240205 test diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml index 6e2541bbb27..fe0aae9d55b 100644 --- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 grpc-google-cloud-spanner-admin-database-v1 GRPC library for grpc-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml index 263b3b53a2a..7d4e7ec9620 100644 --- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 grpc-google-cloud-spanner-admin-instance-v1 GRPC library for grpc-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml index 5f5b727f72e..5d508b1cc25 100644 --- a/grpc-google-cloud-spanner-executor-v1/pom.xml +++ b/grpc-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.60.0 + 6.60.1 grpc-google-cloud-spanner-executor-v1 GRPC library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml index 91300761882..399a04ef7b7 100644 --- a/grpc-google-cloud-spanner-v1/pom.xml +++ b/grpc-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 grpc-google-cloud-spanner-v1 GRPC library for grpc-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/pom.xml b/pom.xml index 1ffaf3891ad..ef95e28fbf0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-spanner-parent pom - 6.60.0 + 6.60.1 Google Cloud Spanner Parent https://github.com/googleapis/java-spanner @@ -61,47 +61,47 @@ com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-executor-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 com.google.cloud google-cloud-spanner - 6.60.0 + 6.60.1 @@ -121,7 +121,7 @@ com.google.truth truth - 1.1.5 + 1.4.1 test diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml index c066f37e658..0514be006bc 100644 --- a/proto-google-cloud-spanner-admin-database-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 6.60.0 + 6.60.1 proto-google-cloud-spanner-admin-database-v1 PROTO library for proto-google-cloud-spanner-admin-database-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml index 6576bda68e0..9fe5dad3a68 100644 --- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml +++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 6.60.0 + 6.60.1 proto-google-cloud-spanner-admin-instance-v1 PROTO library for proto-google-cloud-spanner-admin-instance-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml index f7b1381a924..4e560822d19 100644 --- a/proto-google-cloud-spanner-executor-v1/pom.xml +++ b/proto-google-cloud-spanner-executor-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-executor-v1 - 6.60.0 + 6.60.1 proto-google-cloud-spanner-executor-v1 Proto library for google-cloud-spanner com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml index 6f709106114..dafe631172d 100644 --- a/proto-google-cloud-spanner-v1/pom.xml +++ b/proto-google-cloud-spanner-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-spanner-v1 - 6.60.0 + 6.60.1 proto-google-cloud-spanner-v1 PROTO library for proto-google-cloud-spanner-v1 com.google.cloud google-cloud-spanner-parent - 6.60.0 + 6.60.1 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index caad4fdb543..af217d9bd41 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -24,7 +24,7 @@ UTF-8 0.31.1 2.36.0 - 3.23.0 + 3.37.0 @@ -33,7 +33,7 @@ com.google.cloud google-cloud-spanner - 6.57.0 + 6.60.0 @@ -100,7 +100,7 @@ com.google.truth truth - 1.1.5 + 1.4.1 test @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.1 + 3.2.5 java-client-integration-test diff --git a/samples/native-image/pom.xml b/samples/native-image/pom.xml index 0dffe25d769..0c72603f1a8 100644 --- a/samples/native-image/pom.xml +++ b/samples/native-image/pom.xml @@ -29,7 +29,7 @@ com.google.cloud libraries-bom - 26.32.0 + 26.33.0 pom import @@ -51,7 +51,7 @@ com.google.truth truth - 1.1.5 + 1.4.1 test @@ -104,7 +104,7 @@ org.junit.vintage junit-vintage-engine - 5.10.1 + 5.10.2 test @@ -131,7 +131,7 @@ org.graalvm.buildtools native-maven-plugin - 0.9.28 + 0.10.1 true com.example.spanner.NativeImageSpannerSample diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 4cc29d5fd6d..cc31362f1aa 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -24,7 +24,7 @@ UTF-8 0.31.1 2.36.0 - 3.23.0 + 3.37.0 @@ -32,7 +32,7 @@ com.google.cloud google-cloud-spanner - 6.60.0 + 6.60.1 @@ -99,7 +99,7 @@ com.google.truth truth - 1.1.5 + 1.4.1 test @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.1 + 3.2.5 java-client-integration-test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ff356df5375..5dbe22f146e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -34,7 +34,7 @@ com.google.cloud libraries-bom - 26.32.0 + 26.33.0 pom import @@ -111,7 +111,7 @@ com.google.truth truth - 1.1.5 + 1.4.1 test @@ -175,7 +175,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.1 + 3.2.5 java-client-integration-test diff --git a/versions.txt b/versions.txt index 394e6de37a9..debc27fc48f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,13 +1,13 @@ # Format: # module:released-version:current-version -proto-google-cloud-spanner-admin-instance-v1:6.60.0:6.60.0 -proto-google-cloud-spanner-v1:6.60.0:6.60.0 -proto-google-cloud-spanner-admin-database-v1:6.60.0:6.60.0 -grpc-google-cloud-spanner-v1:6.60.0:6.60.0 -grpc-google-cloud-spanner-admin-instance-v1:6.60.0:6.60.0 -grpc-google-cloud-spanner-admin-database-v1:6.60.0:6.60.0 -google-cloud-spanner:6.60.0:6.60.0 -google-cloud-spanner-executor:6.60.0:6.60.0 -proto-google-cloud-spanner-executor-v1:6.60.0:6.60.0 -grpc-google-cloud-spanner-executor-v1:6.60.0:6.60.0 +proto-google-cloud-spanner-admin-instance-v1:6.60.1:6.60.1 +proto-google-cloud-spanner-v1:6.60.1:6.60.1 +proto-google-cloud-spanner-admin-database-v1:6.60.1:6.60.1 +grpc-google-cloud-spanner-v1:6.60.1:6.60.1 +grpc-google-cloud-spanner-admin-instance-v1:6.60.1:6.60.1 +grpc-google-cloud-spanner-admin-database-v1:6.60.1:6.60.1 +google-cloud-spanner:6.60.1:6.60.1 +google-cloud-spanner-executor:6.60.1:6.60.1 +proto-google-cloud-spanner-executor-v1:6.60.1:6.60.1 +grpc-google-cloud-spanner-executor-v1:6.60.1:6.60.1