From a411110231aa828d982aa907448eb705758468eb Mon Sep 17 00:00:00 2001 From: "Jonathan Hess (he/him)" <103529393+hessjcg@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:06:09 -0600 Subject: [PATCH 1/6] test: Move ServiceAccountImpersonatingCredentialFactoryTest to integration tests. (#2053) This actually instantiates real Google Cloud credentials using the API. --- ...eAccountImpersonatingCredentialFactoryIntegrationTests.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename core/src/test/java/com/google/cloud/sql/core/{ServiceAccountImpersonatingCredentialFactoryTest.java => ServiceAccountImpersonatingCredentialFactoryIntegrationTests.java} (98%) diff --git a/core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryTest.java b/core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryIntegrationTests.java similarity index 98% rename from core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryTest.java rename to core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryIntegrationTests.java index eddbd6ce0..184f2b409 100644 --- a/core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryTest.java +++ b/core/src/test/java/com/google/cloud/sql/core/ServiceAccountImpersonatingCredentialFactoryIntegrationTests.java @@ -28,7 +28,7 @@ import java.util.Collections; import org.junit.Test; -public class ServiceAccountImpersonatingCredentialFactoryTest { +public class ServiceAccountImpersonatingCredentialFactoryIntegrationTests { @Test public void testImpersonatedCredentialsWithMultipleAccounts() { From 392ff4d73cf2ec7df30d58934220c4a23174eda2 Mon Sep 17 00:00:00 2001 From: Jack Wotherspoon Date: Tue, 13 Aug 2024 16:14:44 -0400 Subject: [PATCH 2/6] ci: remove secret manager secrets from unit tests (#2052) --- .github/workflows/tests.yml | 43 ++----------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c912e1632..6bb429ea7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,55 +50,16 @@ jobs: - id: auth name: Authenticate to Google Cloud + # only needed for Flakybot on periodic (schedule) and continuous (push) events + if: ${{ github.event_name == 'schedule' || github.event_name == 'push' }} uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3 with: workload_identity_provider: ${{ vars.PROVIDER_NAME }} service_account: ${{ vars.SERVICE_ACCOUNT }} access_token_lifetime: 600s - - id: secrets - name: Get secrets - uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3 - with: - secrets: |- - MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME - MYSQL_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER - MYSQL_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_JAVA_IAM_CONNECTION_NAME - MYSQL_IAM_USER_JAVA:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_USER_IAM_JAVA - MYSQL_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_PASS - MYSQL_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_DB - POSTGRES_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_CONNECTION_NAME - POSTGRES_IAM_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_IAM_CONNECTION_NAME - POSTGRES_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER - POSTGRES_IAM_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_USER_IAM_JAVA - POSTGRES_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_PASS - POSTGRES_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/POSTGRES_DB - SQLSERVER_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_CONNECTION_NAME - SQLSERVER_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_USER - SQLSERVER_PASS:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_PASS - SQLSERVER_DB:${{ vars.GOOGLE_CLOUD_PROJECT }}/SQLSERVER_DB - IMPERSONATED_USER:${{ vars.GOOGLE_CLOUD_PROJECT }}/IMPERSONATED_USER - QUOTA_PROJECT:${{ vars.GOOGLE_CLOUD_PROJECT }}/QUOTA_PROJECT - name: Run tests env: - MYSQL_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_CONNECTION_NAME }}" - MYSQL_USER: "${{ steps.secrets.outputs.MYSQL_USER }}" - MYSQL_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.MYSQL_IAM_CONNECTION_NAME }}" - MYSQL_IAM_USER: "${{ steps.secrets.outputs.MYSQL_IAM_USER_JAVA }}" - MYSQL_PASS: "${{ steps.secrets.outputs.MYSQL_PASS }}" - MYSQL_DB: "${{ steps.secrets.outputs.MYSQL_DB }}" - POSTGRES_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_CONNECTION_NAME }}" - POSTGRES_IAM_CONNECTION_NAME: "${{ steps.secrets.outputs.POSTGRES_IAM_CONNECTION_NAME }}" - POSTGRES_USER: "${{ steps.secrets.outputs.POSTGRES_USER }}" - POSTGRES_IAM_USER: "${{ steps.secrets.outputs.POSTGRES_IAM_USER }}" - POSTGRES_PASS: "${{ steps.secrets.outputs.POSTGRES_PASS }}" - POSTGRES_DB: "${{ steps.secrets.outputs.POSTGRES_DB }}" - SQLSERVER_CONNECTION_NAME: "${{ steps.secrets.outputs.SQLSERVER_CONNECTION_NAME }}" - SQLSERVER_USER: "${{ steps.secrets.outputs.SQLSERVER_USER }}" - SQLSERVER_PASS: "${{ steps.secrets.outputs.SQLSERVER_PASS }}" - SQLSERVER_DB: "${{ steps.secrets.outputs.SQLSERVER_DB }}" - IMPERSONATED_USER: "${{ steps.secrets.outputs.IMPERSONATED_USER }}" - QUOTA_PROJECT: "${{ steps.secrets.outputs.QUOTA_PROJECT }}" JOB_TYPE: test run: ./.github/scripts/run_tests.sh shell: bash From b5e9b505e834b171615ca3128ea608b640fa6319 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 14 Aug 2024 18:39:08 +0200 Subject: [PATCH 3/6] deps: Update Non-major dependencies (#2037) --- jdbc/mariadb/pom.xml | 6 ++--- jdbc/postgres/pom.xml | 2 +- jdbc/sqlserver/pom.xml | 4 ++-- pom.xml | 50 +++++++++++++++++++++--------------------- r2dbc/mysql/pom.xml | 4 ++-- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/jdbc/mariadb/pom.xml b/jdbc/mariadb/pom.xml index ccfa84cbc..d6e2b8e69 100644 --- a/jdbc/mariadb/pom.xml +++ b/jdbc/mariadb/pom.xml @@ -49,7 +49,7 @@ org.mariadb.jdbc mariadb-java-client - 3.4.0 + 3.4.1 org.slf4j @@ -87,7 +87,7 @@ org.mariadb.jdbc mariadb-java-client - 3.4.0 + 3.4.1 @@ -101,7 +101,7 @@ org.mariadb.jdbc mariadb-java-client - 3.4.0 + 3.4.1 diff --git a/jdbc/postgres/pom.xml b/jdbc/postgres/pom.xml index cace1a59d..5719df555 100644 --- a/jdbc/postgres/pom.xml +++ b/jdbc/postgres/pom.xml @@ -118,7 +118,7 @@ maven-surefire-plugin - 3.3.0 + 3.3.1 integration-test diff --git a/jdbc/sqlserver/pom.xml b/jdbc/sqlserver/pom.xml index 434e2ea9b..aaaf41cea 100644 --- a/jdbc/sqlserver/pom.xml +++ b/jdbc/sqlserver/pom.xml @@ -49,7 +49,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.3.jre8 + 12.8.0.jre8 provided @@ -96,7 +96,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.3.jre8 + 12.8.0.jre8 diff --git a/pom.xml b/pom.xml index da11fddb7..c9d08e340 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ com.google.cloud google-cloud-shared-config - 1.9.0 + 1.9.1 Cloud SQL JDBC Socket Factory @@ -77,8 +77,8 @@ UTF-8 9+181-r4173-1 - 24.0.1 - 4.1.111.Final + 24.0.2 + 4.1.112.Final 9.7 true @@ -133,7 +133,7 @@ org.checkerframework checker-qual - 3.45.0 + 3.46.0 org.checkerframework @@ -148,7 +148,7 @@ com.google.apis google-api-services-sqladmin - v1beta4-rev20240622-2.0.0 + v1beta4-rev20240724-2.0.0 com.google.http-client @@ -168,12 +168,12 @@ com.google.auth google-auth-library-credentials - 1.23.0 + 1.24.1 com.google.auth google-auth-library-oauth2-http - 1.23.0 + 1.24.1 com.google.oauth-client @@ -183,7 +183,7 @@ com.google.errorprone error_prone_annotations - 2.28.0 + 2.30.0 com.github.jnr @@ -203,12 +203,12 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 com.google.api gax - 2.50.0 + 2.51.0 org.reactivestreams @@ -223,12 +223,12 @@ io.projectreactor reactor-core - 3.6.8 + 3.6.9 io.projectreactor.netty reactor-netty - 1.1.21 + 1.1.22 io.netty @@ -269,13 +269,13 @@ org.slf4j slf4j-api - 2.0.13 + 2.0.16 com.google.truth truth - 1.4.3 + 1.4.4 test @@ -323,7 +323,7 @@ org.junit junit-bom - 5.10.3 + 5.11.0 pom import @@ -364,7 +364,7 @@ org.codehaus.mojo versions-maven-plugin - 2.17.0 + 2.17.1 @@ -452,7 +452,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.3.0 + 3.3.1 sponge_log false @@ -465,7 +465,7 @@ org.apache.maven.plugins maven-release-plugin - 3.1.0 + 3.1.1 @{project.version} false @@ -619,7 +619,7 @@ maven-surefire-plugin - 3.3.0 + 3.3.1 integration-test @@ -718,12 +718,12 @@ org.junit.platform junit-platform-engine - 1.10.3 + 1.11.0 org.junit.platform junit-platform-commons - 1.10.3 + 1.11.0 @@ -733,7 +733,7 @@ org.junit.vintage junit-vintage-engine - 5.10.3 + 5.11.0 test @@ -798,7 +798,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.4 + 3.2.5 sign-artifacts @@ -833,7 +833,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + 3.8.0 8 src/main/java @@ -933,7 +933,7 @@ maven-surefire-plugin - 3.3.0 + 3.3.1 integration-test diff --git a/r2dbc/mysql/pom.xml b/r2dbc/mysql/pom.xml index f83f6b14a..f3e59650d 100644 --- a/r2dbc/mysql/pom.xml +++ b/r2dbc/mysql/pom.xml @@ -57,7 +57,7 @@ io.asyncer r2dbc-mysql - 1.1.3 + 1.3.0 provided @@ -126,7 +126,7 @@ io.asyncer r2dbc-mysql - 1.1.3 + 1.3.0 From a8609412c9e501aadce23b957de3cdaf93dbf38d Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:56:55 -0600 Subject: [PATCH 4/6] chore(main): release 1.20.0 (#2042) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 12 ++++++++++++ core/pom.xml | 4 ++-- docs/jdbc.md | 16 ++++++++-------- docs/r2dbc.md | 16 ++++++++-------- jdbc/mariadb/pom.xml | 4 ++-- jdbc/mysql-j-8/pom.xml | 4 ++-- jdbc/postgres/pom.xml | 4 ++-- jdbc/sqlserver/pom.xml | 4 ++-- pom.xml | 2 +- r2dbc/core/pom.xml | 4 ++-- r2dbc/mariadb/pom.xml | 4 ++-- r2dbc/mysql/pom.xml | 4 ++-- r2dbc/postgres/pom.xml | 4 ++-- r2dbc/sqlserver/pom.xml | 4 ++-- versions.txt | 24 ++++++++++++------------ 15 files changed, 61 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7778d4475..326d06796 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.20.0](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.19.1...v1.20.0) (2024-08-14) + + +### Features + +* Retry API calls that return a 5xx error. Fixes [#2029](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2029). ([#2041](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2041)) ([d76e892](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/d76e8926f8f8ed2e5a8be952cec22cc77fe3b6d3)) + + +### Dependencies + +* Update Non-major dependencies ([#2037](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2037)) ([b5e9b50](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/b5e9b505e834b171615ca3128ea608b640fa6319)) + ## [1.19.1](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.19.0...v1.19.1) (2024-07-10) diff --git a/core/pom.xml b/core/pom.xml index 6a3d2be91..214dba880 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -23,10 +23,10 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 jdbc-socket-factory-core - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL Core Socket Factory (Core Library, don't depend on this directly) diff --git a/docs/jdbc.md b/docs/jdbc.md index e6a18a41a..f74c64034 100644 --- a/docs/jdbc.md +++ b/docs/jdbc.md @@ -16,14 +16,14 @@ Maven     com.google.cloud.sql     mysql-socket-factory-connector-j-8 -    1.19.1 +    1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.19.1' +compile 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.20.0' ``` @@ -37,14 +37,14 @@ Maven     com.google.cloud.sql     mariadb-socket-factory -    1.19.1 +    1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:mariadb-socket-factory:1.19.1' +compile 'com.google.cloud.sql:mariadb-socket-factory:1.20.0' ``` **Note:** Also include the JDBC Driver for @@ -60,14 +60,14 @@ Maven     com.google.cloud.sql     postgres-socket-factory -    1.19.1 +    1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:postgres-socket-factory:1.19.1' +compile 'com.google.cloud.sql:postgres-socket-factory:1.20.0' ``` **Note:** Also include the JDBC Driver for @@ -83,14 +83,14 @@ Maven     com.google.cloud.sql     cloud-sql-connector-jdbc-sqlserver -    1.19.1 +    1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:cloud-sql-connector-jdbc-sqlserver:1.19.1' +compile 'com.google.cloud.sql:cloud-sql-connector-jdbc-sqlserver:1.20.0' ``` **Note:** Also include the JDBC Driver for SQL diff --git a/docs/r2dbc.md b/docs/r2dbc.md index 3f3896b2b..3e0efe36d 100644 --- a/docs/r2dbc.md +++ b/docs/r2dbc.md @@ -18,14 +18,14 @@ Maven com.google.cloud.sql cloud-sql-connector-r2dbc-mysql - 1.19.1 + 1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-mysql:1.19.1' +compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-mysql:1.20.0' ``` **Note:** Also include the R2DBC Driver for @@ -40,14 +40,14 @@ Maven com.google.cloud cloud-sql-connector-r2dbc-mariadb - 1.19.1 + 1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud:cloud-sql-connector-r2dbc-mariadb:1.19.1' +compile 'com.google.cloud:cloud-sql-connector-r2dbc-mariadb:1.20.0' ``` **Note:** Also include the R2DBC Driver for @@ -63,14 +63,14 @@ Maven com.google.cloud.sql cloud-sql-connector-r2dbc-postgres - 1.19.1 + 1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-postgres:1.19.1' +compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-postgres:1.20.0' ``` **Note:** Also include the R2DBC Driver for @@ -86,14 +86,14 @@ Maven com.google.cloud.sql cloud-sql-connector-r2dbc-sqlserver - 1.19.1 + 1.20.0 ``` Gradle ```gradle -compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-sqlserver:1.19.1' +compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-sqlserver:1.20.0' ``` **Note:** Also include the R2DBC Driver for SQL diff --git a/jdbc/mariadb/pom.xml b/jdbc/mariadb/pom.xml index d6e2b8e69..82ec77c22 100644 --- a/jdbc/mariadb/pom.xml +++ b/jdbc/mariadb/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml mariadb-socket-factory - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL MariaDB Socket Factory diff --git a/jdbc/mysql-j-8/pom.xml b/jdbc/mysql-j-8/pom.xml index 1057381ee..21bb3fa7b 100644 --- a/jdbc/mysql-j-8/pom.xml +++ b/jdbc/mysql-j-8/pom.xml @@ -23,12 +23,12 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml mysql-socket-factory-connector-j-8 - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL MySQL Socket Factory (for Connector/J 8.x) diff --git a/jdbc/postgres/pom.xml b/jdbc/postgres/pom.xml index 5719df555..dd892a4af 100644 --- a/jdbc/postgres/pom.xml +++ b/jdbc/postgres/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml postgres-socket-factory - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL Postgres Socket Factory diff --git a/jdbc/sqlserver/pom.xml b/jdbc/sqlserver/pom.xml index aaaf41cea..656e594b5 100644 --- a/jdbc/sqlserver/pom.xml +++ b/jdbc/sqlserver/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml cloud-sql-connector-jdbc-sqlserver - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL JDBC Connector for SQL Server diff --git a/pom.xml b/pom.xml index c9d08e340..bcd91b147 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.google.cloud.sql jdbc-socket-factory-parent pom - 1.19.2-SNAPSHOT + 1.20.0 com.google.cloud diff --git a/r2dbc/core/pom.xml b/r2dbc/core/pom.xml index 2c16f2d0a..c230f2758 100644 --- a/r2dbc/core/pom.xml +++ b/r2dbc/core/pom.xml @@ -21,11 +21,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml cloud-sql-connector-r2dbc-core - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL R2DBC Connection Factory (R2DBC Core Library, don't depend on this directly) diff --git a/r2dbc/mariadb/pom.xml b/r2dbc/mariadb/pom.xml index 131906160..a67056735 100644 --- a/r2dbc/mariadb/pom.xml +++ b/r2dbc/mariadb/pom.xml @@ -22,12 +22,12 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml com.google.cloud cloud-sql-connector-r2dbc-mariadb - 1.19.2-SNAPSHOT + 1.20.0 jar Google Cloud SQL R2DBC Connector for MariaDB diff --git a/r2dbc/mysql/pom.xml b/r2dbc/mysql/pom.xml index f3e59650d..72f48e59c 100644 --- a/r2dbc/mysql/pom.xml +++ b/r2dbc/mysql/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml cloud-sql-connector-r2dbc-mysql - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL R2DBC Connection Factory for MySQL diff --git a/r2dbc/postgres/pom.xml b/r2dbc/postgres/pom.xml index 8957e4ed5..cab43a906 100644 --- a/r2dbc/postgres/pom.xml +++ b/r2dbc/postgres/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml cloud-sql-connector-r2dbc-postgres - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL R2DBC Connection Factory for Postgres diff --git a/r2dbc/sqlserver/pom.xml b/r2dbc/sqlserver/pom.xml index 63e776c3e..68b46c704 100644 --- a/r2dbc/sqlserver/pom.xml +++ b/r2dbc/sqlserver/pom.xml @@ -22,11 +22,11 @@ com.google.cloud.sql jdbc-socket-factory-parent - 1.19.2-SNAPSHOT + 1.20.0 ../../pom.xml cloud-sql-connector-r2dbc-sqlserver - 1.19.2-SNAPSHOT + 1.20.0 jar Cloud SQL R2DBC Connection Factory for SQL Server diff --git a/versions.txt b/versions.txt index d52bfc9ee..e7a576576 100644 --- a/versions.txt +++ b/versions.txt @@ -1,15 +1,15 @@ # Format: # module:released-version:current-version -jdbc-socket-factory-parent:1.19.1:1.19.2-SNAPSHOT -jdbc-socket-factory-core:1.19.1:1.19.2-SNAPSHOT -mariadb-socket-factory:1.19.1:1.19.2-SNAPSHOT -mysql-socket-factory:1.19.1:1.19.2-SNAPSHOT -mysql-socket-factory-connector-j-8:1.19.1:1.19.2-SNAPSHOT -postgres-socket-factory:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-jdbc-sqlserver:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-r2dbc-core:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-r2dbc-mariadb:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-r2dbc-mysql:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-r2dbc-postgres:1.19.1:1.19.2-SNAPSHOT -cloud-sql-connector-r2dbc-sqlserver:1.19.1:1.19.2-SNAPSHOT +jdbc-socket-factory-parent:1.20.0:1.20.0 +jdbc-socket-factory-core:1.20.0:1.20.0 +mariadb-socket-factory:1.20.0:1.20.0 +mysql-socket-factory:1.20.0:1.20.0 +mysql-socket-factory-connector-j-8:1.20.0:1.20.0 +postgres-socket-factory:1.20.0:1.20.0 +cloud-sql-connector-jdbc-sqlserver:1.20.0:1.20.0 +cloud-sql-connector-r2dbc-core:1.20.0:1.20.0 +cloud-sql-connector-r2dbc-mariadb:1.20.0:1.20.0 +cloud-sql-connector-r2dbc-mysql:1.20.0:1.20.0 +cloud-sql-connector-r2dbc-postgres:1.20.0:1.20.0 +cloud-sql-connector-r2dbc-sqlserver:1.20.0:1.20.0 From a75fa599c76f8cb62c040a9fe2b9f535756d0fca Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 15 Aug 2024 22:26:40 +0200 Subject: [PATCH 5/6] deps: Update dependency maven to v3.9.8 (#2025) --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index fe97fa31d..ecbbc633c 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -15,4 +15,4 @@ # specific language governing permissions and limitations # under the License. wrapperVersion=3.3.1 -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip From f269db8c712393c733dfaefc1c268d2f2d0b0e70 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Fri, 16 Aug 2024 17:10:22 +0200 Subject: [PATCH 6/6] chore(deps): Update dependencies for github (#2020) --- .github/workflows/codeql.yml | 8 ++++---- .github/workflows/labels.yaml | 2 +- .github/workflows/lint.yaml | 4 ++-- .github/workflows/scorecard.yml | 8 ++++---- .github/workflows/tests.yml | 22 +++++++++++----------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 14c6e7a51..35a6c1d78 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -42,20 +42,20 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2 with: languages: ${{ matrix.language }} # Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java). # If this step fails, then you should remove it and run the build manually - name: Autobuild - uses: github/codeql-action/autobuild@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index 551215c32..d7367bf5e 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -28,7 +28,7 @@ jobs: issues: write pull-requests: write steps: - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 9da246f9d..3045cfaa2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -25,9 +25,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up JDK 17 - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 with: distribution: "zulu" java-version: "17" diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 31638df53..66d9db5b5 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -35,12 +35,12 @@ jobs: steps: - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3 + uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0 with: results_file: results.sarif results_format: sarif @@ -57,7 +57,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 with: name: SARIF file path: results.sarif @@ -65,6 +65,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8 + uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2 with: sarif_file: resultsFiltered.sarif diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6bb429ea7..2aa6b211d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,10 +40,10 @@ jobs: pull-requests: write steps: - name: Checkout code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 with: distribution: "zulu" java-version: ${{matrix.java-version}} @@ -52,7 +52,7 @@ jobs: name: Authenticate to Google Cloud # only needed for Flakybot on periodic (schedule) and continuous (push) events if: ${{ github.event_name == 'schedule' || github.event_name == 'push' }} - uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3 + uses: google-github-actions/auth@f112390a2df9932162083945e46d439060d66ec2 # v2.1.4 with: workload_identity_provider: ${{ vars.PROVIDER_NAME }} service_account: ${{ vars.SERVICE_ACCOUNT }} @@ -105,17 +105,17 @@ jobs: pull-requests: write steps: - name: Checkout code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up JDK - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2 with: distribution: "zulu" java-version: ${{matrix.java-version}} - id: auth name: Authenticate to Google Cloud - uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3 + uses: google-github-actions/auth@f112390a2df9932162083945e46d439060d66ec2 # v2.1.4 with: workload_identity_provider: ${{ vars.PROVIDER_NAME }} service_account: ${{ vars.SERVICE_ACCOUNT }} @@ -123,7 +123,7 @@ jobs: - id: secrets name: Get secrets - uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3 + uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4 with: secrets: |- MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME @@ -202,10 +202,10 @@ jobs: pull-requests: write steps: - name: Checkout code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up GraalVM - uses: graalvm/setup-graalvm@2911b2304bee2c2f59b9a67bf45f025a6b6de4b1 # v1.2.2 + uses: graalvm/setup-graalvm@22cc13fe88ef133134b3798e128fb208df55e1f5 # v1.2.3 with: java-version: "21" distribution: "graalvm-community" @@ -214,7 +214,7 @@ jobs: - id: auth name: Authenticate to Google Cloud - uses: google-github-actions/auth@71fee32a0bb7e97b4d33d548e7d957010649d8fa # v2.1.3 + uses: google-github-actions/auth@f112390a2df9932162083945e46d439060d66ec2 # v2.1.4 with: workload_identity_provider: ${{ vars.PROVIDER_NAME }} service_account: ${{ vars.SERVICE_ACCOUNT }} @@ -222,7 +222,7 @@ jobs: - id: secrets name: Get secrets - uses: google-github-actions/get-secretmanager-secrets@dc4a1392bad0fd60aee00bb2097e30ef07a1caae # v2.1.3 + uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4 with: secrets: |- MYSQL_CONNECTION_NAME:${{ vars.GOOGLE_CLOUD_PROJECT }}/MYSQL_CONNECTION_NAME