From 7b37076014f68d2dc4699037876bef166d807365 Mon Sep 17 00:00:00 2001 From: Dan Berkowitz Date: Thu, 11 Jul 2024 12:03:47 -0400 Subject: [PATCH 1/4] Bump spotless and versionlock --- versions.lock | 29 ++++++++++++++++++++--------- versions.props | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/versions.lock b/versions.lock index 674a60714..1f63d779c 100644 --- a/versions.lock +++ b/versions.lock @@ -3,9 +3,10 @@ aopalliance:aopalliance:1.0 (1 constraints: 170a83ac) com.diffplug.durian:durian-collect:1.2.0 (3 constraints: 4d313bd2) com.diffplug.durian:durian-core:1.2.0 (4 constraints: 2640ae56) com.diffplug.durian:durian-io:1.2.0 (1 constraints: 1313c62d) -com.diffplug.spotless:spotless-lib:2.25.3 (2 constraints: f424dde6) -com.diffplug.spotless:spotless-lib-extra:2.25.3 (1 constraints: 4c132341) -com.diffplug.spotless:spotless-plugin-gradle:6.6.0 (1 constraints: 0e051b36) +com.diffplug.durian:durian-swt.os:4.2.2 (1 constraints: c70947a9) +com.diffplug.spotless:spotless-lib:2.44.0 (2 constraints: f02475e6) +com.diffplug.spotless:spotless-lib-extra:2.44.0 (1 constraints: 4a132541) +com.diffplug.spotless:spotless-plugin-gradle:6.24.0 (1 constraints: 3e05573b) com.github.ben-manes.caffeine:caffeine:3.1.8 (2 constraints: f0175a58) com.github.kevinstern:software-and-algorithms:1.0 (1 constraints: 7e12fcf5) com.google.auto:auto-common:1.2.2 (3 constraints: a432fc93) @@ -26,14 +27,19 @@ com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) com.google.protobuf:protobuf-java:3.19.6 (1 constraints: 301169c9) com.googlecode.concurrent-trees:concurrent-trees:2.6.1 (1 constraints: 761166da) com.googlecode.java-diff-utils:diffutils:1.3.0 (1 constraints: 0605f935) -com.googlecode.javaewah:JavaEWAH:1.1.12 (1 constraints: 750eee5e) +com.googlecode.javaewah:JavaEWAH:1.2.3 (1 constraints: 460e7e50) com.palantir.gradle.failure-reports:gradle-failure-reports-exceptions:1.2.0 (1 constraints: 0505f635) com.palantir.gradle.utils:lazily-configured-mapping:0.1.0 (1 constraints: 0305ee35) com.palantir.javaformat:gradle-palantir-java-format:1.1.0 (1 constraints: 0405f335) com.palantir.javaformat:palantir-java-format-spi:1.1.0 (1 constraints: 711560be) +com.squareup.okhttp3:okhttp:4.12.0 (1 constraints: f6093eb3) +com.squareup.okio:okio:3.6.0 (1 constraints: 530c38fd) +com.squareup.okio:okio-jvm:3.6.0 (1 constraints: 500ad3b9) com.uber.nullaway:nullaway:0.10.26 (1 constraints: 6b059040) +commons-codec:commons-codec:1.16.0 (1 constraints: 780efe5e) commons-io:commons-io:2.16.1 (2 constraints: f919e608) commons-lang:commons-lang:2.6 (1 constraints: ac04232c) +dev.equo.ide:solstice:1.7.5 (1 constraints: 7a1168da) io.github.eisop:dataflow-errorprone:3.41.0-eisop1 (3 constraints: 3e40ddde) io.github.java-diff-utils:java-diff-utils:4.12 (1 constraints: b412c908) javax.annotation:javax.annotation-api:1.2 (1 constraints: e01020af) @@ -59,22 +65,27 @@ org.apache.maven.shared:maven-dependency-analyzer:1.13.2 (1 constraints: 3905343 org.apache.maven.shared:maven-shared-utils:3.3.4 (1 constraints: e60b61f3) org.checkerframework:checker-qual:3.42.0 (4 constraints: 5a37a241) org.checkerframework:dataflow-nullaway:3.42.0 (2 constraints: 66118ff1) -org.codehaus.groovy:groovy:3.0.13 (3 constraints: e62866d7) -org.codehaus.groovy:groovy-xml:3.0.13 (1 constraints: 791161da) org.codehaus.plexus:plexus-cipher:2.0 (1 constraints: 641174c7) org.codehaus.plexus:plexus-classworlds:2.6.0 (3 constraints: 572b5104) org.codehaus.plexus:plexus-component-annotations:2.1.0 (2 constraints: 241d860a) org.codehaus.plexus:plexus-interpolation:1.26 (3 constraints: 7b2bf0f5) org.codehaus.plexus:plexus-sec-dispatcher:2.0 (1 constraints: 5c100b99) org.codehaus.plexus:plexus-utils:3.5.1 (11 constraints: 3fa89966) -org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (2 constraints: 562b9625) +org.eclipse.jgit:org.eclipse.jgit:6.7.0.202309050840-r (2 constraints: f22a55d9) +org.eclipse.platform:org.eclipse.osgi:3.18.300 (1 constraints: 5e0ad9c7) org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 (3 constraints: 852caa93) org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 (2 constraints: 141abc34) org.immutables:value:2.10.1 (2 constraints: fc1456c1) org.inferred:freebuilder:1.14.6 (1 constraints: 3e053b3b) +org.jetbrains:annotations:24.1.0 (3 constraints: da2fc133) +org.jetbrains.kotlin:kotlin-stdlib:1.9.10 (2 constraints: c2210fe1) +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 (2 constraints: 3f1b4b83) +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2) +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (2 constraints: 8118c1c5) org.ow2.asm:asm:9.7 (3 constraints: f522aaed) org.pcollections:pcollections:4.0.1 (1 constraints: f21028b8) -org.slf4j:slf4j-api:1.7.36 (10 constraints: 769c0f4c) +org.slf4j:slf4j-api:1.7.36 (11 constraints: 7ba60d0f) +org.tukaani:xz:1.9 (1 constraints: 6b09e995) [Test dependencies] cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24) @@ -114,12 +125,12 @@ net.lingala.zip4j:zip4j:1.3.2 (1 constraints: 0805fb35) one.util:streamex:0.8.2 (1 constraints: 0c050536) org.apiguardian:apiguardian-api:1.1.2 (7 constraints: 9d791b5f) org.assertj:assertj-core:3.25.3 (3 constraints: ee2a9aa1) +org.codehaus.groovy:groovy:3.0.13 (2 constraints: 241bc56d) org.eclipse.collections:eclipse-collections:11.1.0 (1 constraints: 1b108aa9) org.eclipse.collections:eclipse-collections-api:11.1.0 (2 constraints: f8229c26) org.hamcrest:hamcrest:2.2 (2 constraints: 43187376) org.hamcrest:hamcrest-core:2.2 (4 constraints: 2b2b359e) org.hamcrest:hamcrest-library:2.2 (1 constraints: fc138e38) -org.jetbrains:annotations:24.1.0 (2 constraints: fc20c06d) org.jooq:jooq:3.19.8 (1 constraints: 4705583b) org.junit.jupiter:junit-jupiter:5.10.2 (1 constraints: 3a05433b) org.junit.jupiter:junit-jupiter-api:5.10.2 (4 constraints: 39451ef8) diff --git a/versions.props b/versions.props index ec6f61bd7..637bc9fea 100644 --- a/versions.props +++ b/versions.props @@ -46,7 +46,7 @@ org.mockito:* = 5.12.0 # Users should depend on this plugin directly such that it will get updated by excavator. com.palantir.javaformat:gradle-palantir-java-format = 1.1.0 # Newer spotless versions have issues resolving dependencies at configuration time -com.diffplug.spotless:spotless-plugin-gradle = 6.6.0 +com.diffplug.spotless:spotless-plugin-gradle = 6.24.0 # Groovy versions must be compatible with gradle org.codehaus.groovy:* = 3.0.13 # checkerframework dependencies should be limited to errorpropne and nullaway From fa8914a962d4c7376cbffcdc5057bae1a0c8ad1e Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Thu, 11 Jul 2024 16:06:35 +0000 Subject: [PATCH 2/4] Add generated changelog entries --- changelog/@unreleased/pr-2829.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-2829.v2.yml diff --git a/changelog/@unreleased/pr-2829.v2.yml b/changelog/@unreleased/pr-2829.v2.yml new file mode 100644 index 000000000..3a5f1b6dd --- /dev/null +++ b/changelog/@unreleased/pr-2829.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Update spotless java to 6.24.0 from 6.6.0 + links: + - https://github.com/palantir/gradle-baseline/pull/2829 From 9f11db54c695920b42614590180916be5e193040 Mon Sep 17 00:00:00 2001 From: Dan Berkowitz Date: Thu, 11 Jul 2024 12:32:23 -0400 Subject: [PATCH 3/4] Bump spotless to 6.25.0 --- changelog/@unreleased/pr-2829.v2.yml | 2 +- versions.lock | 6 +++--- versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/changelog/@unreleased/pr-2829.v2.yml b/changelog/@unreleased/pr-2829.v2.yml index 3a5f1b6dd..95f24746f 100644 --- a/changelog/@unreleased/pr-2829.v2.yml +++ b/changelog/@unreleased/pr-2829.v2.yml @@ -1,5 +1,5 @@ type: fix fix: - description: Update spotless java to 6.24.0 from 6.6.0 + description: Update spotless java to 6.25.0 from 6.6.0 links: - https://github.com/palantir/gradle-baseline/pull/2829 diff --git a/versions.lock b/versions.lock index 1f63d779c..cb1b4cc8e 100644 --- a/versions.lock +++ b/versions.lock @@ -4,9 +4,9 @@ com.diffplug.durian:durian-collect:1.2.0 (3 constraints: 4d313bd2) com.diffplug.durian:durian-core:1.2.0 (4 constraints: 2640ae56) com.diffplug.durian:durian-io:1.2.0 (1 constraints: 1313c62d) com.diffplug.durian:durian-swt.os:4.2.2 (1 constraints: c70947a9) -com.diffplug.spotless:spotless-lib:2.44.0 (2 constraints: f02475e6) -com.diffplug.spotless:spotless-lib-extra:2.44.0 (1 constraints: 4a132541) -com.diffplug.spotless:spotless-plugin-gradle:6.24.0 (1 constraints: 3e05573b) +com.diffplug.spotless:spotless-lib:2.45.0 (2 constraints: f224b1e6) +com.diffplug.spotless:spotless-lib-extra:2.45.0 (1 constraints: 4b132841) +com.diffplug.spotless:spotless-plugin-gradle:6.25.0 (1 constraints: 3f055a3b) com.github.ben-manes.caffeine:caffeine:3.1.8 (2 constraints: f0175a58) com.github.kevinstern:software-and-algorithms:1.0 (1 constraints: 7e12fcf5) com.google.auto:auto-common:1.2.2 (3 constraints: a432fc93) diff --git a/versions.props b/versions.props index 637bc9fea..307b5523a 100644 --- a/versions.props +++ b/versions.props @@ -46,7 +46,7 @@ org.mockito:* = 5.12.0 # Users should depend on this plugin directly such that it will get updated by excavator. com.palantir.javaformat:gradle-palantir-java-format = 1.1.0 # Newer spotless versions have issues resolving dependencies at configuration time -com.diffplug.spotless:spotless-plugin-gradle = 6.24.0 +com.diffplug.spotless:spotless-plugin-gradle = 6.25.0 # Groovy versions must be compatible with gradle org.codehaus.groovy:* = 3.0.13 # checkerframework dependencies should be limited to errorpropne and nullaway From aa2b2a49b0788371e1c76bcef8c998ef06f5b860 Mon Sep 17 00:00:00 2001 From: Dan Berkowitz Date: Thu, 11 Jul 2024 12:41:53 -0400 Subject: [PATCH 4/4] Remove unused comment --- versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/versions.props b/versions.props index 307b5523a..82bc2d9ce 100644 --- a/versions.props +++ b/versions.props @@ -45,7 +45,6 @@ org.mockito:* = 5.12.0 # Don't upgrade, we will remove this in a future release. # Users should depend on this plugin directly such that it will get updated by excavator. com.palantir.javaformat:gradle-palantir-java-format = 1.1.0 -# Newer spotless versions have issues resolving dependencies at configuration time com.diffplug.spotless:spotless-plugin-gradle = 6.25.0 # Groovy versions must be compatible with gradle org.codehaus.groovy:* = 3.0.13