diff --git a/build.gradle b/build.gradle index 93bed56e6..2993200f9 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ import net.ltgt.gradle.errorprone.CheckSeverity buildscript { repositories { - gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } + gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } } dependencies { @@ -28,8 +28,8 @@ apply plugin: 'com.palantir.baseline-java-versions' allprojects { repositories { - gradlePluginPortal() mavenCentral() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } } + gradlePluginPortal() } // Since we are using gradle-baseline in gradle-baseline we need to undo forces on project dependencies. Following diff --git a/changelog/@unreleased/pr-2280.v2.yml b/changelog/@unreleased/pr-2280.v2.yml new file mode 100644 index 000000000..8c5dd155f --- /dev/null +++ b/changelog/@unreleased/pr-2280.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Rerelease due to failed publish + links: + - https://github.com/palantir/gradle-baseline/pull/2280 diff --git a/versions.lock b/versions.lock index ef6d1a03c..e0cc2a2aa 100644 --- a/versions.lock +++ b/versions.lock @@ -44,7 +44,7 @@ commons-lang:commons-lang:2.6 (1 constraints: ac04232c) io.dropwizard.metrics:metrics-core:4.1.1 (1 constraints: 901088a5) io.github.java-diff-utils:java-diff-utils:4.0 (1 constraints: 811205f6) junit:junit:4.13.2 (9 constraints: ce843506) -net.bytebuddy:byte-buddy:1.12.9 (2 constraints: db1849db) +net.bytebuddy:byte-buddy:1.12.9 (1 constraints: 470b41de) net.bytebuddy:byte-buddy-agent:1.12.9 (1 constraints: 470b41de) net.ltgt.gradle:gradle-errorprone-plugin:2.0.2 (1 constraints: 0605f735) org.apache.commons:commons-lang3:3.12.0 (1 constraints: 38053b3b) @@ -57,7 +57,7 @@ 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.12.0 (1 constraints: 36052f3b) org.apache.maven.wagon:wagon-provider-api:1.0-beta-2 (1 constraints: 54120e10) -org.assertj:assertj-core:3.22.0 (4 constraints: 0a3dfe29) +org.assertj:assertj-core:3.22.0 (3 constraints: de2aa09d) org.checkerframework:checker-qual:3.22.0 (3 constraints: 08256088) org.checkerframework:dataflow-errorprone:3.22.0 (4 constraints: f93dc85b) org.codehaus.groovy:groovy:3.0.9 (3 constraints: b52813bc) @@ -73,18 +73,17 @@ org.immutables:value:2.8.8 (1 constraints: 14051536) org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b) org.mockito:mockito-core:4.5.1 (4 constraints: a4328ec8) org.mockito:mockito-errorprone:4.5.1 (1 constraints: 0c050f36) -org.objenesis:objenesis:3.2 (3 constraints: 6b2483ae) -org.ow2.asm:asm:9.3 (4 constraints: bf2f0cd9) +org.objenesis:objenesis:3.2 (2 constraints: 9a17f457) +org.ow2.asm:asm:9.3 (3 constraints: e92232eb) org.pcollections:pcollections:3.1.4 (1 constraints: f51029b8) org.slf4j:slf4j-api:1.7.36 (6 constraints: 2d520723) [Test dependencies] -cglib:cglib-nodep:3.3.0 (2 constraints: 7a1acf3c) -com.fasterxml.jackson:jackson-bom:2.13.2.1 (3 constraints: de375443) -com.fasterxml.jackson.core:jackson-annotations:2.13.2 (5 constraints: 1044b9fd) -com.fasterxml.jackson.core:jackson-core:2.13.2 (3 constraints: bf38af42) -com.fasterxml.jackson.core:jackson-databind:2.13.2.1 (6 constraints: dc5a7830) -com.fasterxml.jackson.module:jackson-module-afterburner:2.13.2 (2 constraints: f1138182) +cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24) +com.fasterxml.jackson.core:jackson-annotations:2.13.2 (4 constraints: 59359db8) +com.fasterxml.jackson.core:jackson-core:2.13.2 (2 constraints: 082a4713) +com.fasterxml.jackson.core:jackson-databind:2.13.2.1 (5 constraints: c64bdab8) +com.fasterxml.jackson.module:jackson-module-afterburner:2.13.2 (1 constraints: 3a053a3b) com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b) com.netflix.nebula:nebula-test:10.1.0 (1 constraints: 34052a3b) com.palantir.conjure.java:conjure-lib:6.48.0 (1 constraints: 44056b3b) @@ -104,21 +103,18 @@ jakarta.xml.bind:jakarta.xml.bind-api:3.0.0 (1 constraints: bd069059) junit:junit-dep:4.11 (1 constraints: ba1063b3) net.lingala.zip4j:zip4j:1.3.2 (1 constraints: 0805fb35) one.util:streamex:0.8.1 (1 constraints: 0b050436) -org.jetbrains:annotations:19.0.0 (1 constraints: 660d8f2c) +org.apiguardian:apiguardian-api:1.1.2 (7 constraints: 9d791b5f) org.jooq:jooq:3.16.6 (1 constraints: 42054d3b) -org.junit:junit-bom:5.8.2 (12 constraints: 6ac77fbf) -org.junit.jupiter:junit-jupiter:5.8.2 (2 constraints: 260e7a59) -org.junit.jupiter:junit-jupiter-api:5.8.2 (6 constraints: 735c0198) -org.junit.jupiter:junit-jupiter-engine:5.8.2 (2 constraints: 2117d23c) -org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 (2 constraints: 260e7a59) -org.junit.jupiter:junit-jupiter-params:5.8.2 (2 constraints: 2117d23c) -org.junit.platform:junit-platform-commons:1.8.2 (3 constraints: ee29ed2b) -org.junit.platform:junit-platform-engine:1.8.2 (4 constraints: 863c7bdc) -org.junit.platform:junit-platform-launcher:1.8.2 (2 constraints: 121b944a) -org.junit.platform:junit-platform-testkit:1.8.2 (1 constraints: 12097995) -org.junit.vintage:junit-vintage-engine:5.8.2 (1 constraints: 16098d95) +org.junit.jupiter:junit-jupiter:5.8.2 (1 constraints: 11051e36) +org.junit.jupiter:junit-jupiter-api:5.8.2 (5 constraints: 5e53d0bd) +org.junit.jupiter:junit-jupiter-engine:5.8.2 (1 constraints: 0c0edf3b) +org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 (1 constraints: 11051e36) +org.junit.jupiter:junit-jupiter-params:5.8.2 (1 constraints: 0c0edf3b) +org.junit.platform:junit-platform-commons:1.8.2 (2 constraints: dd200b4b) +org.junit.platform:junit-platform-engine:1.8.2 (3 constraints: 5e2e6f7f) +org.junit.vintage:junit-vintage-engine:5.8.2 (1 constraints: 11051e36) org.mockito:mockito-junit-jupiter:4.5.1 (1 constraints: 0c050f36) -org.opentest4j:opentest4j:1.2.0 (3 constraints: c53224a1) +org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49) org.reactivestreams:reactive-streams:1.0.3 (1 constraints: ef07e77b) 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 4a436264a..28e04a74d 100644 --- a/versions.props +++ b/versions.props @@ -32,6 +32,8 @@ org.apache.commons:commons-lang3 = 3.12.0 org.assertj:assertj-core = 3.22.0 org.hamcrest:hamcrest-core = 2.2 org.junit.jupiter:* = 5.8.2 +org.junit.vintage:* = 5.8.2 +org.junit.platform:* = 1.8.2 org.mockito:* = 4.5.1 # dependency-upgrader:OFF