diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 30da7c7b..26a1ffc6 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -41,12 +41,6 @@ ], commitMessagePrefix: 'chore(deps):', }, - { - groupName: 'error-prone-core', - matchPackageNames: [ - '/^com.google.errorprone:error_prone_core/', - ], - }, { groupName: 'junit platform dependencies', matchPackageNames: [ diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 55c6406a..76635bac 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -197,7 +197,7 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Set up GraalVM - uses: graalvm/setup-graalvm@e1df20a713a4cc6ab5b0eb03f0e0dcdc0199b805 # v1.3.4 + uses: graalvm/setup-graalvm@2a2412009026a83f51d179f92dc2b3fd4c8142df # v1.4.1 with: java-version: "21" distribution: "graalvm-community" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f9276839..beaa85cb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -56,7 +56,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 + uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9 with: languages: ${{ matrix.language }} @@ -64,9 +64,9 @@ jobs: # 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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 + uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 + uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 1c77a4af..7e6b0646 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -40,7 +40,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2 + uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 with: results_file: results.sarif results_format: 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@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 + uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9 with: sarif_file: resultsFiltered.sarif diff --git a/CHANGELOG.md b/CHANGELOG.md index d1262747..ad7f6689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.2.7](https://github.com/GoogleCloudPlatform/alloydb-java-connector/compare/v1.2.6...v1.2.7) (2025-10-21) + + +### Dependencies + +* Update dependency com.google.errorprone:error_prone_core to v2.41.0 ([#612](https://github.com/GoogleCloudPlatform/alloydb-java-connector/issues/612)) ([8ea3ade](https://github.com/GoogleCloudPlatform/alloydb-java-connector/commit/8ea3ade7bd603cfb2a5715e662c9608f02f1a6ea)) +* Update dependency com.google.errorprone:error_prone_core to v2.42.0 ([#676](https://github.com/GoogleCloudPlatform/alloydb-java-connector/issues/676)) ([1407d97](https://github.com/GoogleCloudPlatform/alloydb-java-connector/commit/1407d971c0cd5b4a4a1d11c817a1f35ad61a8c41)) +* Update Non-major dependencies ([#674](https://github.com/GoogleCloudPlatform/alloydb-java-connector/issues/674)) ([71309fb](https://github.com/GoogleCloudPlatform/alloydb-java-connector/commit/71309fbcce4c4f267f18c76601560cb33a9103ab)) + ## [1.2.6](https://github.com/GoogleCloudPlatform/alloydb-java-connector/compare/v1.2.5...v1.2.6) (2025-09-12) diff --git a/alloydb-jdbc-connector/pom.xml b/alloydb-jdbc-connector/pom.xml index 66bfa1fd..f6c711e5 100644 --- a/alloydb-jdbc-connector/pom.xml +++ b/alloydb-jdbc-connector/pom.xml @@ -23,11 +23,11 @@ com.google.cloud alloydb-connector-parent - 1.2.6 + 1.2.7 ../pom.xml alloydb-jdbc-connector - 1.2.6 + 1.2.7 jar Google Cloud AlloyDB JDBC Connector @@ -40,7 +40,7 @@ https://github.com/GoogleCloudPlatform/alloydb-java-connector - 42.7.7 + 42.7.8 diff --git a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/ConnectionConfig.java b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/ConnectionConfig.java index b7567941..2b7a6dda 100644 --- a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/ConnectionConfig.java +++ b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/ConnectionConfig.java @@ -115,9 +115,8 @@ private static void validateProperties(Properties props) { final String instanceNameStr = props.getProperty(ALLOYDB_INSTANCE_NAME, ""); Preconditions.checkArgument( InstanceName.isParsableFrom(instanceNameStr), - String.format( - "'%s' must have format: projects//locations//clusters//instances/", - ALLOYDB_INSTANCE_NAME)); + "'%s' must have format: projects//locations//clusters//instances/", + ALLOYDB_INSTANCE_NAME); } private ConnectionConfig( diff --git a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/RefreshCalculator.java b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/RefreshCalculator.java index 832b0836..738248d5 100644 --- a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/RefreshCalculator.java +++ b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/RefreshCalculator.java @@ -29,6 +29,7 @@ class RefreshCalculator { // time to complete. static final Duration DEFAULT_REFRESH_BUFFER = Duration.ofMinutes(4); + @SuppressWarnings("JavaDurationGetSecondsToToSeconds") long calculateSecondsUntilNextRefresh(Instant now, Instant expiration) { Duration timeUntilExp = Duration.between(now, expiration); diff --git a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/Version.java b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/Version.java index bbf5e2d4..98825b02 100644 --- a/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/Version.java +++ b/alloydb-jdbc-connector/src/main/java/com/google/cloud/alloydb/Version.java @@ -17,6 +17,6 @@ class Version { // {x-version-update-start:alloydb-jdbc-connector:current} - static final String VERSION = "1.2.6"; + static final String VERSION = "1.2.7"; // {x-version-update-end} } diff --git a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/LazyConnectionInfoCacheTest.java b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/LazyConnectionInfoCacheTest.java index c3da0a9d..e8c8a9b4 100644 --- a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/LazyConnectionInfoCacheTest.java +++ b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/LazyConnectionInfoCacheTest.java @@ -29,6 +29,7 @@ import org.bouncycastle.operator.OperatorCreationException; import org.junit.Test; +@SuppressWarnings("TimeInStaticInitializer") public class LazyConnectionInfoCacheTest { private static final Instant ONE_HOUR_AGO = diff --git a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshAheadConnectionInfoCacheTest.java b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshAheadConnectionInfoCacheTest.java index 30ae5163..3f5cbd51 100644 --- a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshAheadConnectionInfoCacheTest.java +++ b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshAheadConnectionInfoCacheTest.java @@ -37,6 +37,7 @@ import org.junit.Before; import org.junit.Test; +@SuppressWarnings("TimeInStaticInitializer") public class RefreshAheadConnectionInfoCacheTest { private static final String TEST_INSTANCE_IP = "10.0.0.1"; diff --git a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshCalculatorTest.java b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshCalculatorTest.java index 43823edd..d1d06277 100644 --- a/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshCalculatorTest.java +++ b/alloydb-jdbc-connector/src/test/java/com/google/cloud/alloydb/RefreshCalculatorTest.java @@ -28,6 +28,7 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) +@SuppressWarnings("TimeInStaticInitializer") public class RefreshCalculatorTest { private final Duration input; diff --git a/docs/jdbc.md b/docs/jdbc.md index a103f3c9..2b14760f 100644 --- a/docs/jdbc.md +++ b/docs/jdbc.md @@ -19,7 +19,7 @@ Include the following in the project's `pom.xml`: com.google.cloud alloydb-jdbc-connector - 1.2.6 + 1.2.7 ``` @@ -40,7 +40,7 @@ Include the following the project's `gradle.build` ```gradle // Add connector with the latest version -implementation group: 'com.google.cloud', name: 'alloydb-jdbc-connector', version: '1.2.6' +implementation group: 'com.google.cloud', name: 'alloydb-jdbc-connector', version: '1.2.7' ``` diff --git a/pom.xml b/pom.xml index eae97750..4657d1bd 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 alloydb-connector-parent pom - 1.2.6 + 1.2.7 Google Cloud AlloyDB Java Connector Parent https://github.com/GoogleCloudPlatform/alloydb-java-connector @@ -29,7 +29,7 @@ com.google.cloud google-cloud-shared-config - 1.16.1 + 1.17.0 @@ -59,9 +59,9 @@ github alloydb-connector-parent https://googleapis.dev/java/google-api-grpc/latest - 2.31.0 - 2.41.0 - 1.81 + 2.42.0 + 2.42.0 + 1.82 @@ -69,28 +69,28 @@ com.google.cloud google-cloud-shared-dependencies - 3.52.1 + 3.53.0 pom import com.google.cloud google-cloud-alloydb-bom - 0.63.0 + 0.66.0 pom import com.google.cloud google-cloud-alloydb-connectors-bom - 0.52.0 + 0.55.0 pom import io.grpc grpc-bom - 1.75.0 + 1.76.0 pom import @@ -142,12 +142,12 @@ com.google.api gax-grpc - 2.70.1 + 2.71.0 com.google.api.grpc proto-google-common-protos - 2.61.1 + 2.62.0 com.google.guava @@ -179,21 +179,22 @@ - java9 + java17 - [9,) + [17,) org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 UTF-8 true -XDcompilePolicy=simple + --should-stop=ifError=FLOW -Xplugin:ErrorProne -Xlint:-options -J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED @@ -228,7 +229,7 @@ org.jacoco jacoco-maven-plugin - 0.8.13 + 0.8.14 prepare-agent diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index f12c45a8..70268521 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -30,7 +30,7 @@ com.google.cloud alloydb-jdbc-connector - 1.2.6 + 1.2.7 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 051109fa..a1e80705 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud alloydb-jdbc-connector - 1.2.6 + 1.2.7 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index b75c55fe..72604f05 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -29,7 +29,7 @@ com.google.cloud alloydb-jdbc-connector - 1.2.6 + 1.2.7 diff --git a/versions.txt b/versions.txt index 6ae23816..8969a075 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -alloydb-jdbc-connector:1.2.6:1.2.6 +alloydb-jdbc-connector:1.2.7:1.2.7