postgresql-jdbc.git / summary / log / commit / refs

commit    2d864376438d8a4eb43cf20dbe207a2db130cbed
Author:   Mend Renovate <bot@renovateapp.com>
Commit:   Vladimir Sitnikov <sitnikov.vladimir@gmail.com>
Date:     Tue Dec 03 17:40:38 2024 +0000

    fix(deps): update checkerframework


build-logic/verification/build.gradle.kts | 2 +- .../src/main/kotlin/build-logic.checkerframework.gradle.kts | 2 +- pgjdbc/build.gradle.kts | 4 ++-- .../main/java/org/postgresql/core/v3/AuthenticationPluginManager.java | 4 +++- pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build-logic/verification/build.gradle.kts b/build-logic/verification/build.gradle.kts index 73e63878..c3a0a0cd 100644 --- a/build-logic/verification/build.gradle.kts +++ b/build-logic/verification/build.gradle.kts @@ -10,6 +10,6 @@ dependencies { implementation("com.github.vlsi.gradle-extensions:com.github.vlsi.gradle-extensions.gradle.plugin:1.90") implementation("de.thetaphi.forbiddenapis:de.thetaphi.forbiddenapis.gradle.plugin:3.8") implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:3.1.0") - implementation("org.checkerframework:org.checkerframework.gradle.plugin:0.6.37") + implementation("org.checkerframework:org.checkerframework.gradle.plugin:0.6.47") implementation("org.openrewrite.rewrite:org.openrewrite.rewrite.gradle.plugin:6.15.1") } diff --git a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts index 583e9327..76cb6ae7 100644 --- a/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts +++ b/build-logic/verification/src/main/kotlin/build-logic.checkerframework.gradle.kts @@ -16,7 +16,7 @@ dependencies { "checkerFrameworkAnnotatedJDK"("org.checkerframework:jdk8:$checkerframeworkVersion") } } ?: run { - val checkerframeworkVersion = "3.42.0" + val checkerframeworkVersion = "3.48.3" "checkerFramework"("org.checkerframework:checker:$checkerframeworkVersion") if (buildParameters.buildJdkVersion == 8) { // only needed for JDK 8 diff --git a/pgjdbc/build.gradle.kts b/pgjdbc/build.gradle.kts index c7d34983..0bce6edb 100644 --- a/pgjdbc/build.gradle.kts +++ b/pgjdbc/build.gradle.kts @@ -86,14 +86,14 @@ dependencies { } shaded("com.ongres.scram:scram-client:3.1") - implementation("org.checkerframework:checker-qual:3.42.0") + implementation("org.checkerframework:checker-qual:3.48.3") testImplementation("se.jiderhamn:classloader-leak-test-framework:1.1.2") testFixturesImplementation("junit:junit:4.13.2") testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3") testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.11.3") { because("We use BeforeEachMethodAdapter to add parameters to beforeeach and aftereach methods") } - testFixturesImplementation("org.checkerframework:checker-qual:3.42.0") + testFixturesImplementation("org.checkerframework:checker-qual:3.48.3") } val skipReplicationTests by props() diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/AuthenticationPluginManager.java b/pgjdbc/src/main/java/org/postgresql/core/v3/AuthenticationPluginManager.java index 54159b2d..3f187e9e 100644 --- a/pgjdbc/src/main/java/org/postgresql/core/v3/AuthenticationPluginManager.java +++ b/pgjdbc/src/main/java/org/postgresql/core/v3/AuthenticationPluginManager.java @@ -105,7 +105,9 @@ class AuthenticationPluginManager { */ public static <T> T withEncodedPassword(AuthenticationRequestType type, Properties info, PasswordAction<byte[], T> action) throws PSQLException, IOException { - byte[] encodedPassword = withPassword(type, info, password -> { + // Checkerframework infers `nullable byte[]` for the return type for unknown reason + @SuppressWarnings("RedundantTypeArguments") + byte [] encodedPassword = AuthenticationPluginManager.<byte[]>withPassword(type, info, password -> { if (password == null) { throw new PSQLException( GT.tr("The server requested password-based authentication, but no password was provided by plugin {0}", diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java b/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java index e34c42c0..30528ee7 100644 --- a/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java +++ b/pgjdbc/src/main/java/org/postgresql/core/v3/SimpleParameterList.java @@ -238,6 +238,7 @@ class SimpleParameterList implements V3ParameterList { } @Override + @SuppressWarnings("type.arguments.not.inferred") public String toString(@Positive int index, boolean standardConformingStrings) { --index; Object paramValue = paramValues[index]; [parent: d051f85ab260]