diff --git a/.github/workflows/cross-version.yml b/.github/workflows/cross-version.yml index 13b0394fd420..c1b88c5e4046 100644 --- a/.github/workflows/cross-version.yml +++ b/.github/workflows/cross-version.yml @@ -31,13 +31,14 @@ jobs: type: ga - version: 27 type: ea - broken-by-issue: "https://github.com/junit-team/junit-framework/issues/5605" + broken-by-issue: "https://github.com/uber/NullAway/issues/1534" - version: 26 type: ea release: leyden - version: 27 type: ea release: valhalla + broken-by-issue: "https://github.com/uber/NullAway/issues/1534" name: "OpenJDK ${{ matrix.jdk.version }} (${{ matrix.jdk.release || matrix.jdk.type }})" runs-on: ubuntu-latest steps: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c028d999efa6..71f77a9fc9e1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -31,7 +31,7 @@ checkstyle = { module = "com.puppycrawl.tools:checkstyle", version.ref = "checks classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.184" } commons-io = { module = "commons-io:commons-io", version = "2.21.0" } error-prone-contrib = { module = "tech.picnic.error-prone-support:error-prone-contrib", version = "0.29.0" } -error-prone-core = { module = "com.google.errorprone:error_prone_core", version = "2.48.0" } +error-prone-core = { module = "com.google.errorprone:error_prone_core", version = "2.49.0" } fastcsv = { module = "de.siegmar:fastcsv", version = "4.2.0" } groovy = { module = "org.apache.groovy:groovy", version = "5.0.5" } groovy2-bom = { module = "org.codehaus.groovy:groovy-bom", version = "2.5.23" } @@ -60,7 +60,7 @@ mockito-bom = { module = "org.mockito:mockito-bom", version = "5.23.0" } mockito-core = { module = "org.mockito:mockito-core" } mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" } nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version = "0.0.11" } -nullaway = { module = "com.uber.nullaway:nullaway", version = "0.13.1" } +nullaway = { module = "com.uber.nullaway:nullaway", version = "0.13.3" } opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" } openTestReporting-cli = { module = "org.opentest4j.reporting:open-test-reporting-cli", version.ref = "openTestReporting" } openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" } diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java index 72d06c77a9b7..16fcf4fe1640 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/AssertLinesMatch.java @@ -54,6 +54,7 @@ static void assertLinesMatch(Stream expectedLines, Stream actual assertLinesMatch(expectedLines, actualLines, (Object) message); } + @SuppressWarnings("ReferenceEquality") static void assertLinesMatch(Stream expectedLines, Stream actualLines, @Nullable Object messageOrSupplier) { notNull(expectedLines, "expectedLines must not be null"); @@ -69,6 +70,7 @@ static void assertLinesMatch(Stream expectedLines, Stream actual assertLinesMatch(expectedListOfStrings, actualListOfStrings, messageOrSupplier); } + @SuppressWarnings("ReferenceEquality") static void assertLinesMatch(List expectedLines, List actualLines, @Nullable Object messageOrSupplier) { notNull(expectedLines, "expectedLines must not be null"); diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java index c1bba50bb8b3..6d90121cd2ad 100644 --- a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java +++ b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/DynamicNode.java @@ -95,7 +95,7 @@ public String toString() { */ @API(status = EXPERIMENTAL, since = "6.1") public sealed interface Configuration> - permits AbstractConfiguration, DynamicTest.Configuration, DynamicContainer.Configuration { + permits AbstractConfiguration, DynamicContainer.Configuration, DynamicTest.Configuration { /** * Set the {@linkplain DynamicNode#getDisplayName() display name} to use