diff --git a/baseline-error-prone/build.gradle b/baseline-error-prone/build.gradle index d00edc3b2..f0712667a 100644 --- a/baseline-error-prone/build.gradle +++ b/baseline-error-prone/build.gradle @@ -4,24 +4,24 @@ apply plugin: 'java-library' apply plugin: 'com.palantir.external-publish-jar' dependencies { - compile 'com.google.errorprone:error_prone_core' - compile 'org.mockito:mockito-errorprone' - compile 'org.immutables:value::annotations' + implementation 'com.google.errorprone:error_prone_core' + implementation 'org.mockito:mockito-errorprone' + implementation 'org.immutables:value::annotations' - testCompile gradleApi() - testCompile 'com.palantir.tokens:auth-tokens' - testCompile 'com.fasterxml.jackson.core:jackson-annotations' - testCompile 'com.google.errorprone:error_prone_test_helpers' - testCompile 'com.palantir.safe-logging:preconditions' - testCompile 'com.palantir.safe-logging:safe-logging' - testCompile 'com.palantir.safe-logging:logger' - testCompile 'org.slf4j:slf4j-api' - testCompile 'org.apache.commons:commons-lang3' - testCompile 'commons-lang:commons-lang' - testCompile 'org.assertj:assertj-core' - testCompile 'org.jooq:jooq' - testCompile 'com.palantir.tritium:tritium-registry' - testCompile 'com.palantir.conjure.java:conjure-lib' + testImplementation gradleApi() + testImplementation 'com.palantir.tokens:auth-tokens' + testImplementation 'com.fasterxml.jackson.core:jackson-annotations' + testImplementation 'com.google.errorprone:error_prone_test_helpers' + testImplementation 'com.palantir.safe-logging:preconditions' + testImplementation 'com.palantir.safe-logging:safe-logging' + testImplementation 'com.palantir.safe-logging:logger' + testImplementation 'org.slf4j:slf4j-api' + testImplementation 'org.apache.commons:commons-lang3' + testImplementation 'commons-lang:commons-lang' + testImplementation 'org.assertj:assertj-core' + testImplementation 'org.jooq:jooq' + testImplementation 'com.palantir.tritium:tritium-registry' + testImplementation 'com.palantir.conjure.java:conjure-lib' testCompileOnly 'org.immutables:value::annotations' testImplementation 'org.junit.jupiter:junit-jupiter' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-migrationsupport' diff --git a/baseline-refaster-javac-plugin/build.gradle b/baseline-refaster-javac-plugin/build.gradle index 7083a6fc8..d5286448f 100644 --- a/baseline-refaster-javac-plugin/build.gradle +++ b/baseline-refaster-javac-plugin/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'java-library' apply plugin: 'com.palantir.external-publish-jar' dependencies { - compile 'com.google.errorprone:error_prone_refaster' - compile 'org.slf4j:slf4j-api' + implementation 'com.google.errorprone:error_prone_refaster' + implementation 'org.slf4j:slf4j-api' annotationProcessor 'com.google.auto.service:auto-service' compileOnly 'com.google.auto.service:auto-service' diff --git a/baseline-refaster-rules/build.gradle b/baseline-refaster-rules/build.gradle index 546c3d502..e10a82bb6 100644 --- a/baseline-refaster-rules/build.gradle +++ b/baseline-refaster-rules/build.gradle @@ -6,9 +6,9 @@ dependencies { implementation 'org.mockito:mockito-core' implementation 'com.palantir.tritium:tritium-registry' - testCompile 'junit:junit' - testCompile project(':baseline-refaster-testing') - testCompile 'org.immutables:value::annotations' + testImplementation 'junit:junit' + testImplementation project(':baseline-refaster-testing') + testImplementation 'org.immutables:value::annotations' compileOnly 'org.immutables:value::annotations' } diff --git a/baseline-refaster-testing/build.gradle b/baseline-refaster-testing/build.gradle index 5951693d0..89b5c337b 100644 --- a/baseline-refaster-testing/build.gradle +++ b/baseline-refaster-testing/build.gradle @@ -18,10 +18,10 @@ apply plugin: 'java-library' apply plugin: 'com.palantir.external-publish-jar' dependencies { - compile 'com.google.errorprone:error_prone_refaster' - compile 'com.google.errorprone:error_prone_test_helpers' + api 'com.google.errorprone:error_prone_refaster' + api 'com.google.errorprone:error_prone_test_helpers' - compile 'com.google.guava:guava' - compile 'junit:junit' - compile 'org.assertj:assertj-core' + api 'com.google.guava:guava' + api 'junit:junit' + api 'org.assertj:assertj-core' } diff --git a/gradle-baseline-java/build.gradle b/gradle-baseline-java/build.gradle index 24656bdde..b4be7ddca 100644 --- a/gradle-baseline-java/build.gradle +++ b/gradle-baseline-java/build.gradle @@ -4,15 +4,15 @@ apply plugin: 'com.palantir.external-publish-jar' apply plugin: 'com.palantir.external-publish-gradle-plugin' dependencies { - compile project(':gradle-junit-reports') - compile gradleApi() - compile 'org.apache.commons:commons-lang3' - compile 'com.diffplug.spotless:spotless-plugin-gradle' - compile 'com.google.errorprone:error_prone_refaster' - compile 'com.google.guava:guava' - compile 'net.ltgt.gradle:gradle-errorprone-plugin' - compile 'org.apache.maven.shared:maven-dependency-analyzer' - compile 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11' + implementation project(':gradle-junit-reports') + implementation gradleApi() + implementation 'org.apache.commons:commons-lang3' + implementation 'com.diffplug.spotless:spotless-plugin-gradle' + implementation 'com.google.errorprone:error_prone_refaster' + implementation 'com.google.guava:guava' + implementation 'net.ltgt.gradle:gradle-errorprone-plugin' + implementation 'org.apache.maven.shared:maven-dependency-analyzer' + implementation 'org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11' implementation 'commons-lang:commons-lang' implementation 'com.palantir.javaformat:palantir-java-format-spi' // Add an explicit dependency to ensure consumers can use JDK14 source compat @@ -21,12 +21,12 @@ dependencies { runtimeOnly 'com.palantir.javaformat:gradle-palantir-java-format' - testCompile gradleTestKit() - testCompile 'com.github.stefanbirkner:system-rules' - testCompile 'com.netflix.nebula:nebula-test' // for better temp directory junit rule only - testCompile 'junit:junit' - testCompile 'net.lingala.zip4j:zip4j' - testCompile 'org.assertj:assertj-core' + testImplementation gradleTestKit() + testImplementation 'com.github.stefanbirkner:system-rules' + testImplementation 'com.netflix.nebula:nebula-test' // for better temp directory junit rule only + testImplementation 'junit:junit' + testImplementation 'net.lingala.zip4j:zip4j' + testImplementation 'org.assertj:assertj-core' annotationProcessor 'org.inferred:freebuilder' compileOnly 'org.inferred:freebuilder' @@ -128,6 +128,10 @@ pluginBundle { } } +tasks.named('processResources').configure { + duplicatesStrategy 'include' +} + // Run `./gradlew test -Drecreate=true` to recreate all the expected // generated code that we have checked into the repo. tasks.withType(Test) { diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineExactDependencies.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineExactDependencies.java index 5fb3c234c..2aa1cb10a 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineExactDependencies.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineExactDependencies.java @@ -18,7 +18,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableSet; import com.palantir.baseline.tasks.CheckImplicitDependenciesParentTask; import com.palantir.baseline.tasks.CheckImplicitDependenciesTask; @@ -199,7 +198,7 @@ private static void configureSourceSet( checkUnusedDependencies.configure(task -> task.dependsOn(sourceSetUnusedDependencies)); TaskProvider sourceSetCheckImplicitDependencies = project.getTasks() .register( - GUtil.toLowerCamelCase("checkImplicitDependencies " + sourceSet.getName()), + "checkImplicitDependencies" + StringUtils.capitalize(sourceSet.getName()), CheckImplicitDependenciesTask.class, task -> { task.dependsOn(sourceSet.getClassesTaskName()); @@ -216,7 +215,7 @@ private static void configureSourceSet( } static String checkUnusedDependenciesNameForSourceSet(SourceSet sourceSet) { - return GUtil.toLowerCamelCase("checkUnusedDependencies " + sourceSet.getName()); + return "checkUnusedDependencies" + StringUtils.capitalize(sourceSet.getName()); } /** @@ -232,14 +231,10 @@ private static String getCompileConfigurationName(SourceSet sourceSet) { } private static Map excludeRuleAsMap(ExcludeRule rule) { - Builder excludeRule = ImmutableMap.builder(); - if (rule.getGroup() != null) { - excludeRule.put("group", rule.getGroup()); - } - if (rule.getModule() != null) { - excludeRule.put("module", rule.getModule()); - } - return excludeRule.build(); + return ImmutableMap.builder() + .put("group", rule.getGroup()) + .put("module", rule.getModule()) + .build(); } /** Given a {@code com/palantir/product/Foo.class} file, what other classes does it import/reference. */ diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckExplicitSourceCompatibilityTask.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckExplicitSourceCompatibilityTask.java index e50a2bd50..a9ee1f62e 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckExplicitSourceCompatibilityTask.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/CheckExplicitSourceCompatibilityTask.java @@ -132,21 +132,23 @@ private JavaVersion getRawSourceCompat() { org.gradle.api.plugins.internal.DefaultJavaPluginConvention convention = (org.gradle.api.plugins.internal.DefaultJavaPluginConvention) getProject().getConvention().getPlugin(JavaPluginConvention.class); - return convention.getRawSourceCompatibility(); + + try { + Method getRawSourceCompatibility = + org.gradle.api.plugins.internal.DefaultJavaPluginConvention.class.getMethod( + "getRawSourceCompatibility"); + return (JavaVersion) getRawSourceCompatibility.invoke(convention); + } catch (Exception e) { + throw new RuntimeException( + "Error calling DefaultJavaPluginConvention#getRawSourceCompatibility for " + + GradleVersion.current(), + e); + } } - // TODO(fwindheuser): Don't use reflection after building with Gradle 7 org.gradle.api.plugins.internal.DefaultJavaPluginExtension extension = (org.gradle.api.plugins.internal.DefaultJavaPluginExtension) getProject().getExtensions().getByType(JavaPluginExtension.class); - try { - Method rawSourceCompat = org.gradle.api.plugins.internal.DefaultJavaPluginExtension.class.getMethod( - "getRawSourceCompatibility"); - return (JavaVersion) rawSourceCompat.invoke(extension); - } catch (Exception e) { - throw new RuntimeException( - "Error calling DefaultJavaPluginExtension#getRawSourceCompatibility for " + GradleVersion.current(), - e); - } + return extension.getRawSourceCompatibility(); } } diff --git a/gradle-baseline-java/src/test/resources/com/palantir/baseline/build.gradle b/gradle-baseline-java/src/test/resources/com/palantir/baseline/build.gradle index 8134cf0b3..c934b5f76 100644 --- a/gradle-baseline-java/src/test/resources/com/palantir/baseline/build.gradle +++ b/gradle-baseline-java/src/test/resources/com/palantir/baseline/build.gradle @@ -11,8 +11,8 @@ repositories { sourceCompatibility = 1.8 dependencies { - testCompile 'junit:junit:4.12' - testCompile 'org.assertj:assertj-core:3.10.0' + testImplementation 'junit:junit:4.12' + testImplementation 'org.assertj:assertj-core:3.10.0' } tasks.withType(Checkstyle) { diff --git a/gradle-baseline-java/src/test/resources/com/palantir/baseline/subproject.gradle b/gradle-baseline-java/src/test/resources/com/palantir/baseline/subproject.gradle index 94faca5ae..4dddc3d26 100644 --- a/gradle-baseline-java/src/test/resources/com/palantir/baseline/subproject.gradle +++ b/gradle-baseline-java/src/test/resources/com/palantir/baseline/subproject.gradle @@ -26,8 +26,8 @@ repositories { sourceCompatibility = 1.7 dependencies { - testCompile 'junit:junit:4.12' - testCompile 'org.assertj:assertj-core:3.10.0' + testImplementation 'junit:junit:4.12' + testImplementation 'org.assertj:assertj-core:3.10.0' } tasks.withType(Checkstyle) { diff --git a/gradle-junit-reports/build.gradle b/gradle-junit-reports/build.gradle index 403e08c03..0af1e9190 100644 --- a/gradle-junit-reports/build.gradle +++ b/gradle-junit-reports/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'java-library' apply plugin: 'com.palantir.external-publish-jar' dependencies { - compile gradleApi() - compile 'com.google.guava:guava' + api gradleApi() + api 'com.google.guava:guava' annotationProcessor 'org.immutables:value' annotationProcessor 'org.inferred:freebuilder' diff --git a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsFinalizer.java b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsFinalizer.java index 4019ffa68..591b49465 100644 --- a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsFinalizer.java +++ b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/JunitReportsFinalizer.java @@ -35,7 +35,6 @@ import org.gradle.api.tasks.OutputFile; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.TaskProvider; -import org.gradle.util.GUtil; import org.w3c.dom.Document; public abstract class JunitReportsFinalizer extends DefaultTask { @@ -48,21 +47,16 @@ public static void registerFinalizer( Provider reportDir) { TaskProvider wrappedTask = project.getTasks().named(taskName); TaskProvider finalizer = project.getTasks() - .register( - GUtil.toLowerCamelCase(taskName + " junitReportsFinalizer"), - JunitReportsFinalizer.class, - task -> { - task.getWrappedDidWork() - .set(project.provider( - () -> wrappedTask.get().getDidWork())); - task.getWrappedTaskName().set(taskName); - task.getDurationNanos() - .set(project.provider(() -> taskTimer.getTaskTimeNanos(wrappedTask.get()))); - task.setFailuresSupplier(failuresSupplier); - task.getTargetFile() - .set(reportDir.map(dir -> dir.file(project.getName() + "-" + taskName + ".xml"))); - task.getReportDir().set(reportDir); - }); + .register(taskName + "JunitReportsFinalizer", JunitReportsFinalizer.class, task -> { + task.getWrappedDidWork() + .set(project.provider(() -> wrappedTask.get().getDidWork())); + task.getWrappedTaskName().set(taskName); + task.getDurationNanos().set(project.provider(() -> taskTimer.getTaskTimeNanos(wrappedTask.get()))); + task.setFailuresSupplier(failuresSupplier); + task.getTargetFile() + .set(reportDir.map(dir -> dir.file(project.getName() + "-" + taskName + ".xml"))); + task.getReportDir().set(reportDir); + }); wrappedTask.configure(task -> { task.finalizedBy(finalizer); diff --git a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java index 594a6aff9..d5d12ca7b 100644 --- a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java +++ b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java @@ -21,6 +21,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import java.util.Optional; import java.util.UUID; import org.gradle.api.Action; import org.gradle.api.Project; @@ -55,7 +56,9 @@ private XmlReportFailuresSupplier( @Override public List getFailures() throws IOException { - File sourceReport = reporting.getReports().findByName("xml").getDestination(); + File sourceReport = Optional.ofNullable(reporting.getReports().findByName("xml")) + .map(report -> report.getOutputLocation().getAsFile().getOrNull()) + .orElseThrow(() -> new RuntimeException("Could not find junit reports")); try { return XmlUtils.parseXml(reportHandler, new FileInputStream(sourceReport)) .failures(); @@ -73,12 +76,12 @@ public RuntimeException handleInternalFailure(Path reportDir, RuntimeException e throw new RuntimeException(e); } for (SingleFileReport rawReport : reporting.getReports()) { - if (rawReport.isEnabled()) { - rawReport - .getDestination() - .renameTo(rawReportsDir - .resolve(rawReport.getDestination().getName()) - .toFile()); + if (rawReport.getRequired().get()) { + File rawReportFile = Optional.ofNullable( + rawReport.getOutputLocation().getAsFile().getOrNull()) + .orElseThrow(() -> new IllegalStateException("Could not get raw report file: " + rawReport)); + rawReportFile.renameTo( + rawReportsDir.resolve(rawReportFile.getName()).toFile()); } } return new RuntimeException( diff --git a/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java b/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java index 0d53fb71a..b69ce1697 100644 --- a/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java +++ b/gradle-junit-reports/src/test/java/com/palantir/gradle/junit/JunitReportsFinalizerTests.java @@ -105,7 +105,7 @@ private Checkstyle createCheckstyleTask(Project project) throws IOException { File modifiedReportFile = projectDir.newFile(); Files.write(modifiedReportXml.getBytes(StandardCharsets.UTF_8), modifiedReportFile); - xmlReport.setDestination(modifiedReportFile); + xmlReport.getOutputLocation().set(modifiedReportFile); return checkstyle; } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..7454180f2 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 549d84424..05679dc3c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..744e882ed 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/versions.lock b/versions.lock index b3a22ff95..62fa36010 100644 --- a/versions.lock +++ b/versions.lock @@ -46,8 +46,8 @@ commons-io:commons-io:2.6 (1 constraints: 3414465b) commons-lang:commons-lang:2.6 (1 constraints: ac04232c) io.dropwizard.metrics:metrics-core:3.2.6 (1 constraints: 95108ba5) io.github.java-diff-utils:java-diff-utils:4.0 (1 constraints: 811205f6) -junit:junit:4.13.2 (10 constraints: ae9100f0) -net.bytebuddy:byte-buddy:1.11.3 (1 constraints: 400b38de) +junit:junit:4.13.2 (10 constraints: 6492a317) +net.bytebuddy:byte-buddy:1.11.3 (2 constraints: d41828da) net.bytebuddy:byte-buddy-agent:1.11.3 (1 constraints: 400b38de) net.ltgt.gradle:gradle-errorprone-plugin:2.0.2 (1 constraints: 0605f735) org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b) @@ -60,25 +60,25 @@ org.apache.maven:maven-repository-metadata:2.0.5 (1 constraints: 9010bab6) org.apache.maven:maven-settings:2.0.5 (1 constraints: 310dcb20) org.apache.maven.shared:maven-dependency-analyzer:1.11.3 (1 constraints: 38052f3b) org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 (1 constraints: 54120e10) -org.assertj:assertj-core:3.20.2 (1 constraints: 39053b3b) +org.assertj:assertj-core:3.20.2 (2 constraints: 69174f47) org.checkerframework:checker-qual:3.8.0 (3 constraints: 7e247427) org.checkerframework:dataflow-errorprone:3.15.0 (3 constraints: c7384aee) -org.codehaus.groovy:groovy:3.0.8 (1 constraints: 970d8d2a) +org.codehaus.groovy:groovy:3.0.8 (3 constraints: b428c4bb) org.codehaus.groovy:groovy-xml:3.0.8 (1 constraints: 781160da) org.codehaus.plexus:plexus-component-annotations:2.1.0 (1 constraints: 8d142b84) org.codehaus.plexus:plexus-container-default:1.0-alpha-9 (4 constraints: 6841d5d5) org.codehaus.plexus:plexus-utils:1.5.1 (10 constraints: a99af4e0) org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r (3 constraints: 943f600e) org.github.ngbinh.scalastyle:gradle-scalastyle-plugin_2.11:1.0.1 (1 constraints: 0405f135) -org.hamcrest:hamcrest:2.2 (1 constraints: 720b95d5) +org.hamcrest:hamcrest:2.2 (2 constraints: 43187376) org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b319e) org.hamcrest:hamcrest-library:1.3 (1 constraints: fc138c38) org.immutables:value:2.8.8 (1 constraints: 14051536) org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b) org.mockito:mockito-core:3.11.2 (3 constraints: 0f22a4e7) org.mockito:mockito-errorprone:3.11.2 (1 constraints: 39053a3b) -org.objenesis:objenesis:3.2 (2 constraints: 9a17f457) -org.ow2.asm:asm:9.2 (3 constraints: 43230231) +org.objenesis:objenesis:3.2 (3 constraints: 6b2483ae) +org.ow2.asm:asm:9.2 (4 constraints: 1930842b) org.pcollections:pcollections:2.1.2 (1 constraints: f21022b8) org.scala-lang:scala-library:2.11.11 (4 constraints: a13f1e3f) org.scala-lang.modules:scala-parser-combinators_2.11:1.0.6 (1 constraints: 960d3e43) @@ -88,13 +88,13 @@ org.scalastyle:scalastyle_2.11:1.0.0 (1 constraints: 8117cd64) org.slf4j:slf4j-api:1.7.32 (6 constraints: 1a527c1a) [Test dependencies] -cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24) +cglib:cglib-nodep:3.3.0 (2 constraints: 7a1acf3c) com.fasterxml.jackson:jackson-bom:2.12.3 (3 constraints: 7f37b4d3) com.fasterxml.jackson.core:jackson-annotations:2.12.3 (5 constraints: 0b4459fb) com.fasterxml.jackson.core:jackson-core:2.12.3 (2 constraints: 3f21e893) com.fasterxml.jackson.core:jackson-databind:2.12.3 (4 constraints: 823cb16e) com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b) -com.netflix.nebula:nebula-test:9.0.0 (1 constraints: 0b051836) +com.netflix.nebula:nebula-test:10.0.0 (1 constraints: 3305273b) com.palantir.conjure.java:conjure-lib:6.1.0 (1 constraints: 09050c36) com.palantir.conjure.java.api:errors:2.19.0 (1 constraints: 2410a5a9) com.palantir.ri:resource-identifier:1.5.0 (1 constraints: ee0f7499) @@ -110,18 +110,22 @@ javax.xml.bind:jaxb-api:2.3.1 (1 constraints: c0069559) junit:junit-dep:4.11 (1 constraints: ba1063b3) net.lingala.zip4j:zip4j:1.3.2 (1 constraints: 0805fb35) one.util:streamex:0.7.3 (1 constraints: 0c050336) -org.apiguardian:apiguardian-api:1.1.0 (7 constraints: 8f790357) +org.apiguardian:apiguardian-api:1.1.0 (9 constraints: c79df1f8) +org.jetbrains:annotations:19.0.0 (1 constraints: 660d8f2c) org.jooq:jooq:3.15.1 (1 constraints: 3c05453b) -org.junit:junit-bom:5.7.2 (8 constraints: ed87a278) +org.junit:junit-bom:5.7.2 (12 constraints: 60c7a8b3) org.junit.jupiter:junit-jupiter:5.7.2 (2 constraints: 240e5859) org.junit.jupiter:junit-jupiter-api:5.7.2 (6 constraints: 6d5c3095) org.junit.jupiter:junit-jupiter-engine:5.7.2 (2 constraints: 1f17a43c) org.junit.jupiter:junit-jupiter-migrationsupport:5.7.2 (2 constraints: 240e5859) org.junit.jupiter:junit-jupiter-params:5.7.2 (2 constraints: 1f17a43c) org.junit.platform:junit-platform-commons:1.7.2 (3 constraints: eb29562b) -org.junit.platform:junit-platform-engine:1.7.2 (3 constraints: 392a2f5d) +org.junit.platform:junit-platform-engine:1.7.2 (4 constraints: 823c4ddb) +org.junit.platform:junit-platform-launcher:1.7.2 (2 constraints: 101b5c4a) +org.junit.platform:junit-platform-testkit:1.7.2 (1 constraints: 11097695) org.junit.vintage:junit-vintage-engine:5.7.2 (1 constraints: 15098a95) org.mockito:mockito-junit-jupiter:3.11.2 (1 constraints: 39053a3b) -org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) +org.opentest4j:opentest4j:1.2.0 (3 constraints: c53224a1) org.reactivestreams:reactive-streams:1.0.3 (1 constraints: ef07e77b) -org.spockframework:spock-core:1.3-groovy-2.4 (1 constraints: 7c10f3af) +org.spockframework:spock-core:2.0-M4-groovy-3.0 (2 constraints: e822d65a) +org.spockframework:spock-junit4:2.0-M4-groovy-3.0 (1 constraints: 25115ddf) diff --git a/versions.props b/versions.props index 1d15cc633..98e532bc1 100644 --- a/versions.props +++ b/versions.props @@ -20,7 +20,7 @@ com.puppycrawl.tools:checkstyle = 8.45.1 # test deps com.fasterxml.jackson.*:* = 2.11.1 com.github.stefanbirkner:system-rules = 1.19.0 -com.netflix.nebula:nebula-test = 9.0.0 +com.netflix.nebula:nebula-test = 10.0.0 com.palantir.tokens:auth-tokens = 3.10.0 com.palantir.conjure.java:conjure-lib = 6.1.0 com.palantir.tritium:tritium-registry = 0.28.0