diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 47a70ea40..258389d1a 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -13,5 +13,5 @@
# limitations under the License.
docker:
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
- digest: sha256:32851debfefed2b66038e0141f1b5c2103bb59ba80b7475adbc10ef7abab3de7
-# created: 2023-06-22T15:06:52.039318836Z
+ digest: sha256:31c8276a1bfb43766597d32645721c029cb94571f1b8d996cb2c290744fe52f9
+# created: 2023-06-27T18:51:58.922150125Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 65436cde4..e27b2c575 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -30,7 +30,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/build.sh
@@ -45,7 +45,7 @@ jobs:
- uses: actions/setup-java@v3
with:
java-version: 8
- distribution: zulu
+ distribution: temurin
- name: "Set jvm system property environment variable for surefire plugin (unit tests)"
# Maven surefire plugin (unit tests) allows us to specify JVM to run the tests.
# https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm
@@ -54,7 +54,7 @@ jobs:
- uses: actions/setup-java@v3
with:
java-version: 17
- distribution: zulu
+ distribution: temurin
- run: .kokoro/build.sh
env:
JOB_TYPE: test
@@ -66,7 +66,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: 8
- run: java -version
- run: .kokoro/build.bat
@@ -81,17 +81,29 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: ${{matrix.java}}
- run: java -version
- run: .kokoro/dependencies.sh
+ javadoc:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-java@v3
+ with:
+ distribution: temurin
+ java-version: 17
+ - run: java -version
+ - run: .kokoro/build.sh
+ env:
+ JOB_TYPE: javadoc
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: 11
- run: java -version
- run: .kokoro/build.sh
@@ -103,7 +115,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: 8
- run: java -version
- run: .kokoro/build.sh
diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index 912ed8b2b..10d252d77 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
- distribution: zulu
+ distribution: temurin
java-version: 8
- name: Run checkstyle
run: mvn -P lint --quiet --batch-mode checkstyle:check
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff5ec7274..83a4d2f1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [2.11.3](https://github.com/googleapis/java-spanner-jdbc/compare/v2.11.2...v2.11.3) (2023-07-09)
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.13.0 ([#1278](https://github.com/googleapis/java-spanner-jdbc/issues/1278)) ([acb2626](https://github.com/googleapis/java-spanner-jdbc/commit/acb2626a6d34f876da8e552cf98ef5a75c57b758))
+
## [2.11.2](https://github.com/googleapis/java-spanner-jdbc/compare/v2.11.1...v2.11.2) (2023-06-26)
diff --git a/pom.xml b/pom.xml
index 5d9e4405f..b676d22d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
Calling {@link Connection#unwrap(Class)} with {@link CloudSpannerJdbcConnection#getClass()} as + *
Calling {@link Connection#unwrap(Class)} with {@code CloudSpannerJdbcConnection} class as * input on a {@link Connection} returned by the Cloud Spanner JDBC Driver will return a {@link * CloudSpannerJdbcConnection} instance. */ diff --git a/versions.txt b/versions.txt index ab9730ca6..acd558c67 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-spanner-jdbc:2.11.2:2.11.2 +google-cloud-spanner-jdbc:2.11.3:2.11.3