diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml index 4ad6c6606..5e0aa64f7 100644 --- a/.github/blunderbuss.yml +++ b/.github/blunderbuss.yml @@ -1,7 +1,7 @@ # Configuration for the Blunderbuss GitHub app. For more info see # https://github.com/googleapis/repo-automation-bots/tree/main/packages/blunderbuss assign_issues: - - ansh0l + - rajatbhatta assign_prs_by: - labels: - samples diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e9387af..4ed9459fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.7.1](https://github.com/googleapis/java-spanner-jdbc/compare/v2.7.0...v2.7.1) (2022-05-27) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-spanner-bom to v6.25.2 ([#881](https://github.com/googleapis/java-spanner-jdbc/issues/881)) ([b1980b6](https://github.com/googleapis/java-spanner-jdbc/commit/b1980b68ec73bcf137546d167679bb7ae063cebf)) + ## [2.7.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.6.4...v2.7.0) (2022-05-24) diff --git a/pom.xml b/pom.xml index 2deb47a7d..ccff3eadc 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"> 4.0.0 google-cloud-spanner-jdbc - 2.7.0 + 2.7.1 jar Google Cloud Spanner JDBC https://github.com/googleapis/java-spanner-jdbc @@ -62,7 +62,7 @@ com.google.cloud google-cloud-spanner-bom - 6.23.3 + 6.25.2 pom import diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index b7f0e754d..bdb3cb97d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-spanner-jdbc - 2.6.4 + 2.7.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 086fcdf0e..a0be985d9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-spanner-jdbc - 2.7.0 + 2.7.1 diff --git a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java index dd988ca71..36c97fa5e 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/JdbcDriverTest.java @@ -132,7 +132,9 @@ public void testConnectWithCredentialsAndOAuthToken() { server.getPort(), TEST_KEY_PATH, "some-token"))) { fail("missing expected exception"); } catch (SQLException e) { - assertThat(e.getMessage()).contains("Cannot specify both credentials and an OAuth token"); + assertThat(e.getMessage()) + .contains( + "Specify only one of credentialsUrl, encodedCredentials, credentialsProvider and OAuth token"); } } diff --git a/src/test/resources/com/google/cloud/spanner/jdbc/PostgreSQL/ITScriptTest_TestInvalidStatements.sql b/src/test/resources/com/google/cloud/spanner/jdbc/PostgreSQL/ITScriptTest_TestInvalidStatements.sql index 4dd5e7bde..dc22a64a7 100644 --- a/src/test/resources/com/google/cloud/spanner/jdbc/PostgreSQL/ITScriptTest_TestInvalidStatements.sql +++ b/src/test/resources/com/google/cloud/spanner/jdbc/PostgreSQL/ITScriptTest_TestInvalidStatements.sql @@ -17,16 +17,6 @@ /* * Script for testing invalid/unrecognized statements */ --- EXPLAIN statement -@EXPECT EXCEPTION INVALID_ARGUMENT 'INVALID_ARGUMENT: Unknown statement: EXPLAIN' -EXPLAIN SELECT * - FROM Singers; - --- EXPLAIN ANALYZE statement -@EXPECT EXCEPTION INVALID_ARGUMENT 'INVALID_ARGUMENT: Unknown statement: EXPLAIN ANALYZE' -EXPLAIN ANALYZE SELECT * - FROM Singers; - -- SET unknown property @EXPECT EXCEPTION INVALID_ARGUMENT 'INVALID_ARGUMENT: Unknown statement: SET some_property' SET some_property='value'; diff --git a/versions.txt b/versions.txt index 560c695cc..e0285c069 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-spanner-jdbc:2.7.0:2.7.0 +google-cloud-spanner-jdbc:2.7.1:2.7.1