From 78a01d53acafa6399a0c2fcfa1a29965b0d3e609 Mon Sep 17 00:00:00 2001 From: svc-excavator-bot Date: Tue, 1 Oct 2024 20:49:51 +0000 Subject: [PATCH 01/11] Excavator: Allow Java 17 language features in all modules --- .../impl/InMemoryKeyValueService.java | 3 +- .../atlasdb/performance/BenchmarkParam.java | 2 +- .../processors/AutoDelegateProcessor.java | 2 +- build.gradle | 4 +- .../com/palantir/util/sql/SqlCallStats.java | 3 +- .../java/com/palantir/lock/ExpiringToken.java | 4 +- .../com/palantir/lock/SimpleTimeDuration.java | 3 +- versions.lock | 308 +++++++++--------- versions.props | 53 +-- 9 files changed, 191 insertions(+), 191 deletions(-) diff --git a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java index 1ab84302f51..749523a4886 100644 --- a/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java +++ b/atlasdb-client/src/main/java/com/palantir/atlasdb/keyvalue/impl/InMemoryKeyValueService.java @@ -24,7 +24,6 @@ import com.google.common.collect.Multimap; import com.google.common.collect.PeekingIterator; import com.google.common.io.BaseEncoding; -import com.google.common.primitives.Longs; import com.google.common.primitives.UnsignedBytes; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -810,7 +809,7 @@ public int compareTo(Key other) { if (comparison != 0) { return comparison; } - return Longs.compare(ts, other.ts); + return Long.compare(ts, other.ts); } @Override diff --git a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java index de74805ed1c..3bd8eeb83c1 100644 --- a/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java +++ b/atlasdb-perf/src/main/java/com/palantir/atlasdb/performance/BenchmarkParam.java @@ -16,7 +16,7 @@ package com.palantir.atlasdb.performance; /** - * Enum for keeping track of JMH parameters {@see @Param}. Edit this enum with caution. + * Enum for keeping track of JMH parameters. Edit this enum with caution. * The keys must match the name of their associated instance variable. */ public enum BenchmarkParam { diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java index ca26654e694..7af8448fde8 100644 --- a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java +++ b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java @@ -96,7 +96,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_11; + return SourceVersion.RELEASE_17; } @Override diff --git a/build.gradle b/build.gradle index 98cc3238350..f1ede302156 100644 --- a/build.gradle +++ b/build.gradle @@ -42,8 +42,8 @@ apply plugin: 'com.palantir.jdks' apply plugin: 'com.palantir.jdks.latest' javaVersions { - libraryTarget = 11 - runtime = 17 + libraryTarget = 17 + runtime = 17 } group = 'com.palantir.atlasdb' diff --git a/commons-api/src/main/java/com/palantir/util/sql/SqlCallStats.java b/commons-api/src/main/java/com/palantir/util/sql/SqlCallStats.java index 2233f7f7da5..c16ffb2888f 100644 --- a/commons-api/src/main/java/com/palantir/util/sql/SqlCallStats.java +++ b/commons-api/src/main/java/com/palantir/util/sql/SqlCallStats.java @@ -16,7 +16,6 @@ package com.palantir.util.sql; import com.google.common.collect.Ordering; -import com.google.common.primitives.Longs; import com.palantir.util.jmx.AbstractOperationStats; /** @@ -56,7 +55,7 @@ public double get75thPercentileCallTimeMillis() { } private static final Ordering TOTAL_TIME_ORDERING = Ordering.from((o1, o2) -> { - int cmp = Longs.compare(o1.getTotalTime(), o2.getTotalTime()); + int cmp = Long.compare(o1.getTotalTime(), o2.getTotalTime()); if (cmp != 0) { return cmp; } diff --git a/lock-api-objects/src/main/java/com/palantir/lock/ExpiringToken.java b/lock-api-objects/src/main/java/com/palantir/lock/ExpiringToken.java index 9cd68af4bfe..ec5290c60f2 100644 --- a/lock-api-objects/src/main/java/com/palantir/lock/ExpiringToken.java +++ b/lock-api-objects/src/main/java/com/palantir/lock/ExpiringToken.java @@ -15,7 +15,6 @@ */ package com.palantir.lock; -import com.google.common.primitives.Longs; import java.util.Comparator; import javax.annotation.Nullable; @@ -65,6 +64,5 @@ public interface ExpiringToken { Long getVersionId(); /** A comparator which uses an {@code ExpiringToken}'s expiration date. */ - Comparator COMPARATOR = - (o1, o2) -> Longs.compare(o1.getExpirationDateMs(), o2.getExpirationDateMs()); + Comparator COMPARATOR = (o1, o2) -> Long.compare(o1.getExpirationDateMs(), o2.getExpirationDateMs()); } diff --git a/lock-api-objects/src/main/java/com/palantir/lock/SimpleTimeDuration.java b/lock-api-objects/src/main/java/com/palantir/lock/SimpleTimeDuration.java index 4715ae20f30..e68de761ce7 100644 --- a/lock-api-objects/src/main/java/com/palantir/lock/SimpleTimeDuration.java +++ b/lock-api-objects/src/main/java/com/palantir/lock/SimpleTimeDuration.java @@ -17,7 +17,6 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.primitives.Longs; import com.palantir.logsafe.Preconditions; import java.io.InvalidObjectException; import java.io.ObjectInputStream; @@ -123,7 +122,7 @@ public void sleep() throws InterruptedException { @Override public int compareTo(TimeDuration other) { - return Longs.compare(toNanos(), other.toNanos()); + return Long.compare(toNanos(), other.toNanos()); } @Override diff --git a/versions.lock b/versions.lock index 65f74a55852..0a1c754273f 100644 --- a/versions.lock +++ b/versions.lock @@ -8,18 +8,18 @@ com.boundary:high-scale-lib:1.0.6 (2 constraints: 9d14d4a0) com.clearspring.analytics:stream:2.5.2 (1 constraints: 970f7788) com.datastax.cassandra:cassandra-driver-core:3.8.0 (1 constraints: 0d051236) com.fasterxml:classmate:1.5.1 (3 constraints: 8530e55a) -com.fasterxml.jackson.core:jackson-annotations:2.17.2 (26 constraints: f0af81bd) -com.fasterxml.jackson.core:jackson-core:2.17.2 (25 constraints: 0dfd5eaf) -com.fasterxml.jackson.core:jackson-databind:2.17.2 (38 constraints: c4d4aa62) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 (4 constraints: e9653a50) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.2 (2 constraints: be219c78) +com.fasterxml.jackson.core:jackson-annotations:2.17.2 (26 constraints: f4afe0c8) +com.fasterxml.jackson.core:jackson-core:2.17.2 (25 constraints: 12fd09b5) +com.fasterxml.jackson.core:jackson-databind:2.17.2 (38 constraints: cbd49775) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 (4 constraints: ec651a51) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.17.2 (2 constraints: bf21a178) com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2 (4 constraints: 2744c22d) -com.fasterxml.jackson.datatype:jackson-datatype-guava:2.17.2 (4 constraints: 3b3f3db3) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2 (3 constraints: 72305b60) -com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2 (2 constraints: 352b50b0) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2 (3 constraints: 72305b60) +com.fasterxml.jackson.datatype:jackson-datatype-guava:2.17.2 (4 constraints: 3c3f96b3) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.2 (3 constraints: 73308a60) +com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.2 (2 constraints: 362b7fb0) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2 (3 constraints: 73308a60) com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.17.2 (2 constraints: e12e596a) -com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.17.2 (1 constraints: 43197fbb) +com.fasterxml.jackson.jaxrs:jackson-jaxrs-cbor-provider:2.17.2 (1 constraints: 441984bb) com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.17.2 (2 constraints: 271dbf09) com.fasterxml.jackson.module:jackson-module-blackbird:2.17.2 (1 constraints: b50e635e) com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.2 (2 constraints: e12e596a) @@ -36,18 +36,18 @@ com.github.tjake:crc32ex:0.1.1 (1 constraints: 900f6088) com.google.auto.service:auto-service-annotations:1.0 (1 constraints: a5041a2c) com.google.code.findbugs:findbugs-annotations:3.0.1 (1 constraints: 0605fb35) com.google.code.findbugs:jsr305:3.0.2 (50 constraints: 5e31abaa) -com.google.dagger:dagger:2.51.1 (3 constraints: 28205474) -com.google.dagger:dagger-compiler:2.51.1 (1 constraints: 3b05433b) -com.google.dagger:dagger-spi:2.51.1 (1 constraints: 7f0e315d) -com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14 (3 constraints: 16269fb6) -com.google.errorprone:error_prone_annotations:2.26.1 (30 constraints: 4801acbe) +com.google.dagger:dagger:2.52 (3 constraints: 0e1f25d9) +com.google.dagger:dagger-compiler:2.52 (1 constraints: dd04ff30) +com.google.dagger:dagger-spi:2.52 (1 constraints: 210e6540) +com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20 (3 constraints: 182608b7) +com.google.errorprone:error_prone_annotations:2.28.0 (30 constraints: 4f01ccc6) com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc) com.google.googlejavaformat:google-java-format:1.5 (1 constraints: ee0d4132) com.google.guava:failureaccess:1.0.2 (3 constraints: 9624ef4a) -com.google.guava:guava:33.2.1-jre (49 constraints: ff768cfa) +com.google.guava:guava:33.3.1-jre (49 constraints: eb77aa92) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) -com.google.protobuf:protobuf-java:3.25.3 (1 constraints: 3f054b3b) +com.google.protobuf:protobuf-java:4.28.2 (1 constraints: 4205593b) com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4 (1 constraints: 350f7769) com.googlecode.json-simple:json-simple:1.1 (1 constraints: 320f7469) com.helger:profiler:1.1.1 (1 constraints: e21053b8) @@ -61,64 +61,63 @@ com.palantir.cassandra:cassandra-thrift:2.2.18-1.108.0 (2 constraints: 0f180ff6) com.palantir.common:streams:2.4.0 (1 constraints: 08050136) com.palantir.config.crypto:encrypted-config-value:6.0.0 (2 constraints: 881c8eb8) com.palantir.config.crypto:encrypted-config-value-module:6.0.0 (1 constraints: 08050936) -com.palantir.conjure.java:conjure-lib:8.28.0 (6 constraints: 4a6e2453) +com.palantir.conjure.java:conjure-lib:8.28.0 (6 constraints: 566ef257) com.palantir.conjure.java:conjure-undertow-annotations:8.28.0 (1 constraints: 44056f3b) com.palantir.conjure.java:conjure-undertow-lib:8.28.0 (2 constraints: f51ecd8e) com.palantir.conjure.java.api:errors:2.53.0 (7 constraints: fe81aa8e) com.palantir.conjure.java.api:service-config:2.53.0 (6 constraints: 3266c6d5) com.palantir.conjure.java.api:ssl-config:2.53.0 (5 constraints: b04fb22a) -com.palantir.conjure.java.runtime:client-config:8.12.0 (6 constraints: 1e6b57f6) -com.palantir.conjure.java.runtime:conjure-java-annotations:8.12.0 (1 constraints: c1187e9e) -com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.12.0 (2 constraints: bd217978) -com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.12.0 (6 constraints: 076e9c22) -com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:8.12.0 (1 constraints: 3d05593b) -com.palantir.conjure.java.runtime:conjure-java-jersey-server:8.12.0 (1 constraints: 3d05593b) -com.palantir.conjure.java.runtime:conjure-java-legacy-clients:8.12.0 (2 constraints: fd1d2143) -com.palantir.conjure.java.runtime:keystores:8.12.0 (3 constraints: e429e331) -com.palantir.conjure.java.runtime:refresh-utils:8.12.0 (1 constraints: c1187e9e) -com.palantir.dialogue:dialogue-apache-hc5-client:3.135.0 (2 constraints: d829044d) -com.palantir.dialogue:dialogue-blocking-channels:3.135.0 (2 constraints: 372426f4) -com.palantir.dialogue:dialogue-clients:3.135.0 (1 constraints: 6e05b840) -com.palantir.dialogue:dialogue-core:3.135.0 (3 constraints: 073eeb80) -com.palantir.dialogue:dialogue-futures:3.135.0 (3 constraints: 5b347844) -com.palantir.dialogue:dialogue-serde:3.135.0 (3 constraints: 452f9413) -com.palantir.dialogue:dialogue-target:3.135.0 (7 constraints: ce7795ec) +com.palantir.conjure.java.runtime:client-config:8.15.0 (6 constraints: ae6b4829) +com.palantir.conjure.java.runtime:conjure-java-annotations:8.15.0 (1 constraints: c418879e) +com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.15.0 (2 constraints: c3217579) +com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.15.0 (6 constraints: 376e2b85) +com.palantir.conjure.java.runtime:conjure-java-jaxrs-client:8.15.0 (1 constraints: 4005623b) +com.palantir.conjure.java.runtime:conjure-java-jersey-server:8.15.0 (1 constraints: 4005623b) +com.palantir.conjure.java.runtime:conjure-java-legacy-clients:8.15.0 (2 constraints: 031e0244) +com.palantir.conjure.java.runtime:keystores:8.15.0 (3 constraints: 172ac55d) +com.palantir.conjure.java.runtime:refresh-utils:8.15.0 (1 constraints: c418879e) +com.palantir.dialogue:dialogue-apache-hc5-client:4.1.0 (2 constraints: 092992b4) +com.palantir.dialogue:dialogue-blocking-channels:4.1.0 (2 constraints: 69238971) +com.palantir.dialogue:dialogue-clients:4.1.0 (1 constraints: 07050236) +com.palantir.dialogue:dialogue-core:4.1.0 (3 constraints: d13cee3b) +com.palantir.dialogue:dialogue-futures:4.1.0 (3 constraints: 26332534) +com.palantir.dialogue:dialogue-serde:4.1.0 (3 constraints: 0f2e732c) +com.palantir.dialogue:dialogue-target:4.1.0 (7 constraints: 98774329) com.palantir.goethe:goethe:0.12.0 (1 constraints: 3505293b) com.palantir.nylon:nylon-threads:0.4.0 (2 constraints: 1115e1a9) com.palantir.refreshable:refreshable:2.5.0 (4 constraints: aa380a8b) com.palantir.ri:resource-identifier:2.7.0 (5 constraints: 4e5ad307) -com.palantir.safe-logging:logger:3.7.0 (25 constraints: cab24a2c) +com.palantir.safe-logging:logger:3.7.0 (25 constraints: ccb2582e) com.palantir.safe-logging:logger-slf4j:3.7.0 (1 constraints: 050e6842) com.palantir.safe-logging:logger-spi:3.7.0 (2 constraints: 191ea27b) -com.palantir.safe-logging:preconditions:3.7.0 (36 constraints: 9a76cff8) -com.palantir.safe-logging:safe-logging:3.7.0 (35 constraints: 716ec91d) +com.palantir.safe-logging:preconditions:3.7.0 (36 constraints: 9c76f1fb) +com.palantir.safe-logging:safe-logging:3.7.0 (35 constraints: 736e3720) com.palantir.safethreadlocalrandom:safe-thread-local-random:0.1.0 (3 constraints: 933225f9) com.palantir.sls.versions:sls-versions:1.5.0 (1 constraints: 0805ff35) com.palantir.tokens:auth-tokens:3.18.0 (7 constraints: 55876a3b) -com.palantir.tracing:tracing:6.18.0 (8 constraints: 037e0e66) -com.palantir.tracing:tracing-api:6.18.0 (5 constraints: 1e45f7f8) -com.palantir.tracing:tracing-jersey:6.18.0 (1 constraints: 47199dbb) -com.palantir.tritium:tritium-annotations:0.88.0 (1 constraints: 4205573b) -com.palantir.tritium:tritium-api:0.88.0 (7 constraints: 72645760) -com.palantir.tritium:tritium-caffeine:0.88.0 (1 constraints: 4205573b) -com.palantir.tritium:tritium-core:0.88.0 (6 constraints: 795590a3) -com.palantir.tritium:tritium-ids:0.88.0 (2 constraints: 1415ccc3) -com.palantir.tritium:tritium-lib:0.88.0 (2 constraints: 40177f33) -com.palantir.tritium:tritium-metrics:0.88.0 (9 constraints: db8e6e95) -com.palantir.tritium:tritium-proxy:0.88.0 (1 constraints: 880e9759) -com.palantir.tritium:tritium-registry:0.88.0 (14 constraints: e3017ffa) -com.palantir.tritium:tritium-slf4j:0.88.0 (2 constraints: 8620d73e) -com.palantir.tritium:tritium-time:0.88.0 (1 constraints: 880e9759) -com.palantir.tritium:tritium-tracing:0.88.0 (2 constraints: 8620d73e) +com.palantir.tracing:tracing:6.20.0 (8 constraints: f27dd45b) +com.palantir.tracing:tracing-api:6.20.0 (5 constraints: 0b4543f3) +com.palantir.tracing:tracing-jersey:6.20.0 (1 constraints: 4819a0bb) +com.palantir.tritium:tritium-annotations:0.93.0 (1 constraints: 3e054c3b) +com.palantir.tritium:tritium-api:0.93.0 (7 constraints: 56645251) +com.palantir.tritium:tritium-caffeine:0.93.0 (1 constraints: 3e054c3b) +com.palantir.tritium:tritium-core:0.93.0 (6 constraints: 6155b698) +com.palantir.tritium:tritium-ids:0.93.0 (2 constraints: 101509c3) +com.palantir.tritium:tritium-lib:0.93.0 (2 constraints: 3817a132) +com.palantir.tritium:tritium-metrics:0.93.0 (9 constraints: b78e977a) +com.palantir.tritium:tritium-proxy:0.93.0 (1 constraints: 840e8c59) +com.palantir.tritium:tritium-registry:0.93.0 (14 constraints: ab0189b2) +com.palantir.tritium:tritium-slf4j:0.93.0 (2 constraints: 7e20193e) +com.palantir.tritium:tritium-time:0.93.0 (1 constraints: 840e8c59) +com.palantir.tritium:tritium-tracing:0.93.0 (2 constraints: 7e20193e) com.squareup:javapoet:1.13.0 (4 constraints: 102cc1ed) com.squareup:kotlinpoet:1.11.0 (1 constraints: 790e1a5d) com.thinkaurelius.thrift:thrift-server:0.3.7 (1 constraints: 980f6c88) -com.zaxxer:HikariCP:5.1.0 (1 constraints: 08050736) -commons-cli:commons-cli:1.8.0 (3 constraints: 7e249d97) -commons-codec:commons-codec:1.17.0 (2 constraints: 6d148085) +com.zaxxer:HikariCP:6.0.0 (1 constraints: 08050936) +commons-cli:commons-cli:1.9.0 (2 constraints: 3d146778) +commons-codec:commons-codec:1.17.1 (2 constraints: 6e14ac85) commons-dbutils:commons-dbutils:1.8.1 (1 constraints: 0c050936) -commons-io:commons-io:2.16.1 (2 constraints: 9f1a6617) -info.picocli:picocli:4.3.2 (1 constraints: 8c10e3b0) +commons-io:commons-io:2.17.0 (2 constraints: 9f1a6817) io.airlift:airline:0.9 (1 constraints: ad04202c) io.dropwizard:dropwizard-configuration:2.1.7 (3 constraints: e720a554) io.dropwizard:dropwizard-core:2.1.7 (2 constraints: a413e655) @@ -135,7 +134,7 @@ io.dropwizard:dropwizard-util:2.1.7 (12 constraints: aab0d126) io.dropwizard:dropwizard-validation:2.1.7 (8 constraints: ad77d7bd) io.dropwizard.logback:logback-throttling-appender:1.1.10 (1 constraints: ab0e7a5e) io.dropwizard.metrics:metrics-annotation:4.2.19 (5 constraints: 094ca714) -io.dropwizard.metrics:metrics-core:4.2.25 (32 constraints: 2a23af2a) +io.dropwizard.metrics:metrics-core:4.2.27 (32 constraints: 4223a989) io.dropwizard.metrics:metrics-healthchecks:4.2.19 (4 constraints: ac3b4754) io.dropwizard.metrics:metrics-jersey2:4.2.19 (1 constraints: 630e7b4e) io.dropwizard.metrics:metrics-jetty9:4.2.19 (2 constraints: 7a1bf385) @@ -145,41 +144,42 @@ io.dropwizard.metrics:metrics-jvm:4.2.19 (3 constraints: 292e2650) io.dropwizard.metrics:metrics-logback:4.2.19 (1 constraints: b80e995e) io.dropwizard.metrics:metrics-servlets:4.2.19 (1 constraints: 7a0db62c) io.leangen.geantyref:geantyref:1.3.13 (1 constraints: bb08bd94) -io.netty:netty-all:4.1.110.Final (1 constraints: e21188fd) -io.netty:netty-buffer:4.1.110.Final (14 constraints: 5ddba239) -io.netty:netty-codec:4.1.110.Final (7 constraints: 5f5f2330) -io.netty:netty-codec-dns:4.1.110.Final (2 constraints: f419512d) -io.netty:netty-codec-haproxy:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-http:4.1.110.Final (2 constraints: 5d1a1349) -io.netty:netty-codec-http2:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-memcache:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-mqtt:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-redis:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-smtp:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-socks:4.1.110.Final (2 constraints: 5d1a1349) -io.netty:netty-codec-stomp:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-codec-xml:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-common:4.1.110.Final (17 constraints: 58099b17) -io.netty:netty-handler:4.1.110.Final (5 constraints: 564483fb) -io.netty:netty-handler-proxy:4.1.110.Final (2 constraints: a5124247) -io.netty:netty-handler-ssl-ocsp:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-resolver:4.1.110.Final (4 constraints: 95346d97) -io.netty:netty-resolver-dns:4.1.110.Final (2 constraints: 4f1f4ae1) -io.netty:netty-resolver-dns-classes-macos:4.1.110.Final (2 constraints: e81e4fbf) -io.netty:netty-resolver-dns-native-macos:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-transport:4.1.110.Final (14 constraints: 05d5add3) -io.netty:netty-transport-classes-epoll:4.1.110.Final (2 constraints: fa1d4163) -io.netty:netty-transport-classes-kqueue:4.1.110.Final (2 constraints: 6e1e7c85) -io.netty:netty-transport-native-epoll:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-transport-native-kqueue:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-transport-native-unix-common:4.1.110.Final (7 constraints: 22791b66) -io.netty:netty-transport-rxtx:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-transport-sctp:4.1.110.Final (1 constraints: 250bfbd8) -io.netty:netty-transport-udt:4.1.110.Final (1 constraints: 250bfbd8) -io.smallrye.common:smallrye-common-constraint:2.4.0 (3 constraints: c633ce60) -io.smallrye.common:smallrye-common-cpu:2.4.0 (1 constraints: b10e835a) +io.netty:netty-all:4.1.114.Final (1 constraints: e21188fd) +io.netty:netty-buffer:4.1.114.Final (14 constraints: 95db2683) +io.netty:netty-codec:4.1.114.Final (7 constraints: 7b5ff33e) +io.netty:netty-codec-dns:4.1.114.Final (2 constraints: fc19392e) +io.netty:netty-codec-haproxy:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-http:4.1.114.Final (2 constraints: 651aff49) +io.netty:netty-codec-http2:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-memcache:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-mqtt:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-redis:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-smtp:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-socks:4.1.114.Final (2 constraints: 651aff49) +io.netty:netty-codec-stomp:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-codec-xml:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-common:4.1.114.Final (17 constraints: 9c096384) +io.netty:netty-handler:4.1.114.Final (5 constraints: 6644de00) +io.netty:netty-handler-proxy:4.1.114.Final (2 constraints: ad120648) +io.netty:netty-handler-ssl-ocsp:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-resolver:4.1.114.Final (4 constraints: a534c59b) +io.netty:netty-resolver-dns:4.1.114.Final (2 constraints: 571f6ae2) +io.netty:netty-resolver-dns-classes-macos:4.1.114.Final (2 constraints: f01e6bc0) +io.netty:netty-resolver-dns-native-macos:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-transport:4.1.114.Final (14 constraints: 3dd5381d) +io.netty:netty-transport-classes-epoll:4.1.114.Final (2 constraints: 021e5164) +io.netty:netty-transport-classes-kqueue:4.1.114.Final (2 constraints: 761e9086) +io.netty:netty-transport-native-epoll:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-transport-native-kqueue:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-transport-native-unix-common:4.1.114.Final (7 constraints: 3e79bf78) +io.netty:netty-transport-rxtx:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-transport-sctp:4.1.114.Final (1 constraints: 290b17d9) +io.netty:netty-transport-udt:4.1.114.Final (1 constraints: 290b17d9) +io.smallrye.common:smallrye-common-annotation:2.6.0 (1 constraints: c30d1c36) +io.smallrye.common:smallrye-common-constraint:2.6.0 (4 constraints: 8a413caf) +io.smallrye.common:smallrye-common-cpu:2.6.0 (2 constraints: 731c91d2) io.smallrye.common:smallrye-common-expression:2.4.0 (1 constraints: b10e835a) -io.smallrye.common:smallrye-common-function:2.4.0 (1 constraints: 9a132842) +io.smallrye.common:smallrye-common-function:2.6.0 (2 constraints: 5c215988) io.smallrye.common:smallrye-common-net:2.4.0 (1 constraints: b10e835a) io.smallrye.common:smallrye-common-os:2.4.0 (1 constraints: b10e835a) io.smallrye.common:smallrye-common-ref:2.4.0 (1 constraints: b10e835a) @@ -187,6 +187,7 @@ io.undertow:undertow-core:2.2.37.Final (3 constraints: 8f363de3) io.vavr:vavr:0.10.4 (1 constraints: 3705273b) io.vavr:vavr-match:0.10.4 (1 constraints: 8b061d57) it.unimi.dsi:fastutil:6.5.7 (1 constraints: 6d0e414b) +jakarta.inject:jakarta.inject-api:2.0.1 (1 constraints: c10ad2cb) javax.activation:javax.activation-api:1.2.0 (3 constraints: 053284b7) javax.annotation:javax.annotation-api:1.3.2 (7 constraints: 396987f4) javax.inject:javax.inject:1 (13 constraints: 1ec288bd) @@ -195,36 +196,35 @@ javax.validation:validation-api:2.0.1.Final (15 constraints: 44e32647) javax.ws.rs:javax.ws.rs-api:2.1.1 (16 constraints: e41a5143) javax.xml.bind:jaxb-api:2.3.1 (3 constraints: d3418bed) jline:jline:2.14.6 (1 constraints: f90f6890) -joda-time:joda-time:2.12.7 (6 constraints: b859fa31) -net.bytebuddy:byte-buddy:1.14.16 (4 constraints: 95313e1c) +joda-time:joda-time:2.13.0 (6 constraints: b259502c) +net.bytebuddy:byte-buddy:1.15.3 (4 constraints: 323192c7) net.java.dev.jna:jna:4.1.0 (2 constraints: 6e1bbbad) net.jpountz.lz4:lz4:1.3.0 (2 constraints: 971453a0) net.ltgt.gradle.incap:incap:0.2 (1 constraints: ea0d3b32) net.sf.supercsv:super-csv:2.1.0 (1 constraints: 910f6988) net.sourceforge.argparse4j:argparse4j:0.9.0 (2 constraints: da1b0890) -one.util:streamex:0.8.2 (3 constraints: 282f0daf) +one.util:streamex:0.8.3 (3 constraints: 292f84af) org.antlr:ST4:4.0.8 (1 constraints: 96073c6c) org.antlr:antlr:3.5.2 (1 constraints: 980f7c88) org.antlr:antlr-runtime:3.5.2 (3 constraints: 781d0aae) -org.apache.commons:commons-lang3:3.14.0 (8 constraints: bb7380af) +org.apache.commons:commons-lang3:3.17.0 (8 constraints: be7334b3) org.apache.commons:commons-math3:3.6.1 (2 constraints: f319372c) org.apache.commons:commons-pool2:2.12.0 (1 constraints: 3705353b) org.apache.commons:commons-text:1.12.0 (2 constraints: 70168703) org.apache.httpcomponents.client5:httpclient5:5.3.1 (2 constraints: d718f0c3) -org.apache.httpcomponents.core5:httpcore5:5.2.4 (3 constraints: 6639870e) +org.apache.httpcomponents.core5:httpcore5:5.3 (3 constraints: 053984be) org.apache.httpcomponents.core5:httpcore5-h2:5.2.4 (1 constraints: 3f130d3c) org.apache.thrift:libthrift:0.17.0 (4 constraints: 00372854) org.caffinitas.ohc:ohc-core:0.3.4 (1 constraints: 950f6988) org.checkerframework:checker-compat-qual:2.5.5 (1 constraints: 520eb34e) -org.checkerframework:checker-qual:3.42.0 (4 constraints: 1f37cada) -org.codehaus.groovy:groovy:2.5.14 (22 constraints: 7f43c7a8) -org.codehaus.groovy:groovy-cli-picocli:2.5.14 (5 constraints: d54e9017) -org.codehaus.groovy:groovy-console:2.5.14 (2 constraints: a71d7b2f) -org.codehaus.groovy:groovy-groovysh:2.5.14 (2 constraints: ed12fb43) -org.codehaus.groovy:groovy-json:2.5.14 (2 constraints: ed12fb43) -org.codehaus.groovy:groovy-swing:2.5.14 (2 constraints: 191dbb0d) -org.codehaus.groovy:groovy-templates:2.5.14 (5 constraints: 594e93c5) -org.codehaus.groovy:groovy-xml:2.5.14 (3 constraints: 702d10ee) +org.checkerframework:checker-qual:3.43.0 (4 constraints: 213745db) +org.codehaus.groovy:groovy:3.0.9 (22 constraints: 2d3faf85) +org.codehaus.groovy:groovy-console:3.0.9 (2 constraints: 471dd1fb) +org.codehaus.groovy:groovy-groovysh:3.0.9 (2 constraints: 8d127c24) +org.codehaus.groovy:groovy-json:3.0.9 (2 constraints: 8d127c24) +org.codehaus.groovy:groovy-swing:3.0.9 (2 constraints: b91ccfda) +org.codehaus.groovy:groovy-templates:3.0.9 (6 constraints: 305df95f) +org.codehaus.groovy:groovy-xml:3.0.9 (4 constraints: a73cf3bb) org.codehaus.jackson:jackson-core-asl:1.9.2 (2 constraints: 58207b33) org.codehaus.jackson:jackson-mapper-asl:1.9.2 (1 constraints: 9a0f7e88) org.derive4j:derive4j-annotation:1.1.1 (1 constraints: 0505f435) @@ -256,21 +256,21 @@ org.glassfish.jersey.core:jersey-server:2.40 (10 constraints: dfd9b625) org.glassfish.jersey.ext:jersey-bean-validation:2.40 (2 constraints: 58262380) org.glassfish.jersey.ext:jersey-metainf-services:2.39.1 (1 constraints: 620e864e) org.glassfish.jersey.inject:jersey-hk2:2.40 (2 constraints: 4127a6d3) -org.hdrhistogram:HdrHistogram:2.1.12 (1 constraints: 3e103aa2) +org.hdrhistogram:HdrHistogram:2.2.2 (1 constraints: 0e100092) org.hibernate:hibernate-validator:4.3.0.Final (2 constraints: ee248003) org.hibernate.validator:hibernate-validator:6.2.5.Final (4 constraints: a247cccf) org.immutables:value:2.10.1 (2 constraints: ee1a074f) org.javassist:javassist:3.29.2-GA (3 constraints: bc2d96ae) -org.jboss.logging:jboss-logging:3.5.3.Final (9 constraints: 0aa85efd) -org.jboss.marshalling:jboss-marshalling:2.1.4.Final (1 constraints: 2107c05a) -org.jboss.threads:jboss-threads:3.6.1.Final (4 constraints: d83165bc) +org.jboss.logging:jboss-logging:3.6.1.Final (9 constraints: 0ba80d00) +org.jboss.marshalling:jboss-marshalling:2.2.1.Final (1 constraints: 1f07b45a) +org.jboss.threads:jboss-threads:3.8.0.Final (4 constraints: d931edbc) org.jboss.xnio:xnio-api:3.8.16.Final (3 constraints: 34340a18) org.jboss.xnio:xnio-nio:3.8.16.Final (1 constraints: f80dc53d) org.jdbi:jdbi3-core:3.30.0 (2 constraints: 0e10d5bf) org.jdbi:jdbi3-sqlobject:3.30.0 (1 constraints: 38053d3b) org.jetbrains:annotations:24.1.0 (4 constraints: 10351039) org.jetbrains.kotlin:kotlin-reflect:1.6.10 (1 constraints: 360b7dd6) -org.jetbrains.kotlin:kotlin-stdlib:1.9.20 (4 constraints: 843fae69) +org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (4 constraints: 883fe66b) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 (1 constraints: b1101cc2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 (2 constraints: 7c1ee58d) org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb) @@ -287,14 +287,15 @@ org.slf4j:jul-to-slf4j:1.7.36 (1 constraints: b90e9c5e) org.slf4j:log4j-over-slf4j:1.7.36 (3 constraints: 492febed) org.slf4j:slf4j-api:1.7.36 (45 constraints: 86926295) org.wildfly.client:wildfly-client-config:1.0.1.Final (1 constraints: 940c6308) -org.wildfly.common:wildfly-common:2.0.0 (4 constraints: 25376ae6) +org.wildfly.common:wildfly-common:2.0.1 (4 constraints: 0935509d) org.xerial:sqlite-jdbc:3.42.0.0 (1 constraints: 99054946) org.xerial.snappy:snappy-java:1.1.10.4 (2 constraints: 8c15d6f4) -org.yaml:snakeyaml:2.2 (5 constraints: a44b62fe) +org.yaml:snakeyaml:2.3 (5 constraints: a54b2aff) [Test dependencies] -com.beust:jcommander:1.72 (1 constraints: 4e08137a) +com.beust:jcommander:1.78 (1 constraints: 5408197a) com.ea.agentloader:ea-agent-loader:1.0.3 (1 constraints: 0605f335) +com.github.javaparser:javaparser-core:3.23.0 (1 constraints: 4f1060a2) com.github.tomakehurst:wiremock-standalone:3.0.1 (1 constraints: 0605fb35) com.github.zafarkhaja:java-semver:0.9.0 (1 constraints: c315c0d2) com.google.code.findbugs:annotations:3.0.1u2 (1 constraints: 450b07da) @@ -305,36 +306,38 @@ com.palantir.docker.compose:docker-compose-rule-events-api-objects:1.9.0 (1 cons com.palantir.docker.proxy:docker-proxy-junit-jupiter:1.6.0 (1 constraints: 09050236) com.palantir.docker.proxy:docker-proxy-rule-core:1.6.0 (1 constraints: 2516adda) com.palantir.safe-logging:preconditions-assertj:3.7.0 (1 constraints: 0c050f36) -com.palantir.tracing:tracing-test-utils:6.18.0 (1 constraints: 41055f3b) +com.palantir.tracing:tracing-test-utils:6.20.0 (1 constraints: 3a054b3b) com.spotify.dataenum:dataenum:1.4.1 (1 constraints: e9105ac1) com.thoughtworks.qdox:qdox:1.12.1 (1 constraints: 6d11f7d9) +info.picocli:picocli:4.6.1 (1 constraints: 8e10ebb0) io.dropwizard:dropwizard-testing:2.1.7 (1 constraints: 0c05ff35) -net.bytebuddy:byte-buddy-agent:1.14.15 (1 constraints: 760bb5e9) +net.bytebuddy:byte-buddy-agent:1.15.3 (1 constraints: 440b44de) net.jcip:jcip-annotations:1.0 (2 constraints: fa13a659) net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc) org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b) -org.apache.ant:ant:1.9.15 (2 constraints: b21830c3) -org.apache.ant:ant-antlr:1.9.15 (1 constraints: be0d9c37) -org.apache.ant:ant-junit:1.9.15 (1 constraints: be0d9c37) -org.apache.ant:ant-launcher:1.9.15 (2 constraints: 5b16041e) +org.apache.ant:ant:1.10.11 (2 constraints: fa189bec) +org.apache.ant:ant-antlr:1.10.11 (1 constraints: e20d5a45) +org.apache.ant:ant-junit:1.10.11 (1 constraints: e20d5a45) +org.apache.ant:ant-launcher:1.10.11 (2 constraints: a316c142) org.apiguardian:apiguardian-api:1.1.2 (9 constraints: d7a0ccd2) -org.assertj:assertj-core:3.26.0 (4 constraints: a736d36c) -org.assertj:assertj-guava:3.26.0 (1 constraints: 3d054b3b) -org.awaitility:awaitility:4.2.1 (2 constraints: c81ac73b) -org.codehaus.groovy:groovy-all:2.5.14 (1 constraints: 7707a56a) -org.codehaus.groovy:groovy-ant:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-cli-commons:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-datetime:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-docgenerator:2.5.14 (2 constraints: 021e214f) -org.codehaus.groovy:groovy-groovydoc:2.5.14 (2 constraints: 691b2892) -org.codehaus.groovy:groovy-jmx:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-jsr223:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-macro:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-nio:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-servlet:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-sql:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-test-junit5:2.5.14 (1 constraints: b00d2137) -org.codehaus.groovy:groovy-testng:2.5.14 (1 constraints: b00d2137) +org.assertj:assertj-core:3.26.3 (4 constraints: ad36836e) +org.assertj:assertj-guava:3.26.3 (1 constraints: 40054e3b) +org.awaitility:awaitility:4.2.2 (2 constraints: c91a053c) +org.codehaus.groovy:groovy-all:3.0.9 (1 constraints: 7707a56a) +org.codehaus.groovy:groovy-ant:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-astbuilder:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-cli-picocli:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-datetime:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-docgenerator:3.0.9 (2 constraints: a21dfb1a) +org.codehaus.groovy:groovy-groovydoc:3.0.9 (2 constraints: 091bbb61) +org.codehaus.groovy:groovy-jmx:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-jsr223:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-macro:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-nio:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-servlet:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-sql:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-test-junit5:3.0.9 (1 constraints: 800d6f29) +org.codehaus.groovy:groovy-testng:3.0.9 (1 constraints: 800d6f29) org.freemarker:freemarker:2.3.33 (1 constraints: 3d053e3b) org.glassfish.grizzly:connection-pool:2.4.4 (1 constraints: 1418374b) org.glassfish.grizzly:grizzly-framework:2.4.4 (3 constraints: bc31e6d7) @@ -352,26 +355,27 @@ org.hamcrest:hamcrest-library:2.2 (1 constraints: 1607425c) org.jmock:jmock:2.13.1 (2 constraints: f210e8dc) org.jmock:jmock-imposters:2.13.1 (1 constraints: 3905393b) org.jmock:jmock-testjar:2.13.1 (1 constraints: a707a672) -org.junit.jupiter:junit-jupiter:5.10.2 (3 constraints: cb42b2ef) -org.junit.jupiter:junit-jupiter-api:5.10.2 (7 constraints: 3c6cd770) -org.junit.jupiter:junit-jupiter-engine:5.10.2 (2 constraints: c61ef0a3) -org.junit.jupiter:junit-jupiter-params:5.10.2 (2 constraints: 6e13725b) -org.junit.platform:junit-platform-commons:1.10.2 (4 constraints: 163977c8) -org.junit.platform:junit-platform-engine:1.10.2 (4 constraints: a94b8d3c) -org.junit.platform:junit-platform-launcher:1.10.2 (2 constraints: 0225c3e3) -org.junit.platform:junit-platform-suite:1.10.2 (1 constraints: 36052b3b) -org.junit.platform:junit-platform-suite-api:1.10.2 (3 constraints: ae3958e0) -org.junit.platform:junit-platform-suite-commons:1.10.2 (1 constraints: ef139d69) -org.junit.platform:junit-platform-suite-engine:1.10.2 (1 constraints: 4c11d2d8) -org.mockito:mockito-core:5.12.0 (3 constraints: 77251e54) -org.mockito:mockito-junit-jupiter:5.12.0 (1 constraints: 3a05473b) +org.junit.jupiter:junit-jupiter:5.11.1 (3 constraints: cb42b4ef) +org.junit.jupiter:junit-jupiter-api:5.11.1 (7 constraints: 3e6c0573) +org.junit.jupiter:junit-jupiter-engine:5.11.1 (2 constraints: c91e76a4) +org.junit.jupiter:junit-jupiter-params:5.11.1 (2 constraints: 6e13765b) +org.junit.platform:junit-platform-commons:1.11.1 (4 constraints: 16397fc8) +org.junit.platform:junit-platform-engine:1.11.1 (4 constraints: a94b953c) +org.junit.platform:junit-platform-launcher:1.11.1 (2 constraints: 052579e4) +org.junit.platform:junit-platform-suite:1.11.1 (1 constraints: 36052d3b) +org.junit.platform:junit-platform-suite-api:1.11.1 (3 constraints: ae395ee0) +org.junit.platform:junit-platform-suite-commons:1.11.1 (1 constraints: ef139f69) +org.junit.platform:junit-platform-suite-engine:1.11.1 (1 constraints: 4c11d4d8) +org.mockito:mockito-core:5.14.1 (3 constraints: 7d254355) +org.mockito:mockito-junit-jupiter:5.14.1 (1 constraints: 3d054e3b) org.objenesis:objenesis:3.3 (2 constraints: dc15a7df) org.openjdk.jmh:jmh-core:1.37 (2 constraints: f71557d9) org.openjdk.jmh:jmh-generator-annprocess:1.37 (1 constraints: df04fc30) org.opentest4j:opentest4j:1.3.0 (2 constraints: cf209249) org.reflections:reflections:0.10.2 (1 constraints: 3505253b) -org.rocksdb:rocksdbjni:9.2.1 (1 constraints: 0e051f36) -org.testng:testng:6.13.1 (1 constraints: 0b0f686b) +org.rocksdb:rocksdbjni:9.6.1 (1 constraints: 12052b36) +org.testng:testng:7.4.0 (1 constraints: db0e635c) +org.webjars:jquery:3.5.1 (1 constraints: 7b088e82) org.wiremock:wiremock-standalone:3.0.1 (1 constraints: 62128804) uk.org.lidalia:lidalia-lang:1.0.0 (1 constraints: f70a87d5) uk.org.lidalia:lidalia-slf4j-ext:1.0.0 (1 constraints: f70a87d5) diff --git a/versions.props b/versions.props index fa78183e834..e3e55d5a9f2 100644 --- a/versions.props +++ b/versions.props @@ -10,73 +10,74 @@ com.google.auto.service:auto-service-annotations = 1.0 com.google.auto:auto-common = 1.2.2 com.google.code.findbugs:findbugs-annotations = 3.0.1 com.google.code.findbugs:jsr305 = 3.0.2 -com.google.dagger:* = 2.51.1 +com.google.dagger:* = 2.52 # Ksp version is temporary, can be removed once Maven calms down. com.google.devtools.ksp:symbol-processing-api = 1.5.21-1.0.0-beta07 com.google.errorprone:* = 2.10.0 # upgrading to 2.11.0 is blocked by a google bug com.google.errorprone:error_prone_annotations = 2.10.0 -com.google.guava:guava = 33.2.1-jre -com.google.protobuf:* = 3.25.3 +com.google.guava:guava = 33.3.1-jre +com.google.protobuf:* = 4.28.2 com.lmax:disruptor = 3.4.2 com.palantir.common:streams = 2.4.0 com.palantir.config.crypto:* = 6.0.0 com.palantir.conjure.java.api:* = 2.53.0 -com.palantir.conjure.java.runtime:* = 8.12.0 +com.palantir.conjure.java.runtime:* = 8.15.0 com.palantir.conjure.java:* = 8.28.0 com.palantir.conjure:conjure = 4.49.0 -com.palantir.dialogue:* = 3.135.0 +com.palantir.dialogue:* = 4.1.0 com.palantir.docker.proxy:* = 1.6.0 com.palantir.nylon:* = 0.4.0 com.palantir.refreshable:refreshable = 2.5.0 com.palantir.safe-logging:* = 3.7.0 com.palantir.sls.versions:* = 1.5.0 -com.palantir.tracing:* = 6.18.0 -com.palantir.tritium:* = 0.88.0 +com.palantir.tracing:* = 6.20.0 +com.palantir.tritium:* = 0.93.0 com.squareup:javapoet = 1.13.0 -com.zaxxer:HikariCP = 5.1.0 -commons-cli:* = 1.8.0 -commons-codec:* = 1.17.0 +com.zaxxer:HikariCP = 6.0.0 +commons-cli:* = 1.9.0 +commons-codec:* = 1.17.1 commons-dbutils:* = 1.8.1 -commons-io:* = 2.16.1 +commons-io:* = 2.17.0 io.airlift:airline = 0.9 -io.netty:* = 4.1.110.Final +io.netty:* = 4.1.114.Final io.undertow:* = 2.2.37.Final io.vavr:* = 0.10.4 javax.annotation:javax.annotation-api = 1.3.2 javax.inject:javax.inject = 1 javax.validation:validation-api = 2.0.1.Final -joda-time:joda-time = 2.12.7 +joda-time:joda-time = 2.13.0 net.jcip:jcip-annotations = 1.0 net.jpountz.lz4:lz4 = 1.3.0 -one.util:streamex = 0.8.2 -org.apache.commons:commons-lang3 = 3.14.0 +one.util:streamex = 0.8.3 +org.apache.commons:commons-lang3 = 3.17.0 org.apache.commons:commons-pool2 = 2.12.0 org.apache.commons:commons-text = 1.12.0 org.apache.httpcomponents.client5:httpclient5 = 5.3.1 -org.assertj:* = 3.26.0 -org.awaitility:awaitility = 4.2.1 +org.assertj:* = 3.26.3 +org.awaitility:awaitility = 4.2.2 +org.clojure:clojure = 1.8.0 org.derive4j:* = 1.1.1 org.eclipse.collections:* = 11.1.0 org.freemarker:freemarker = 2.3.33 org.glassfish.jersey.core:jersey-common = 2.34 org.gmock:* = 0.8.3 org.immutables:* = 2.10.1 -org.jboss.marshalling:jboss-marshalling = 2.1.4.Final -org.jboss.threads:jboss-threads = 3.6.1.Final +org.jboss.marshalling:jboss-marshalling = 2.2.1.Final +org.jboss.threads:jboss-threads = 3.8.0.Final org.jdbi:* = 3.30.0 org.jmock:jmock* = 2.13.1 -org.junit.jupiter:* = 5.10.2 -org.junit.platform:* = 1.10.2 +org.junit.jupiter:* = 5.11.1 +org.junit.platform:* = 1.11.1 org.mindrot:jbcrypt = 0.4 -org.mockito:* = 5.12.0 +org.mockito:* = 5.14.1 org.openjdk.jmh:* = 1.37 org.reflections:reflections = 0.10.2 -org.rocksdb:rocksdbjni = 9.2.1 +org.rocksdb:rocksdbjni = 9.6.1 org.slf4j:* = 1.7.36 -org.wildfly.common:wildfly-common = 2.0.0 +org.wildfly.common:wildfly-common = 2.0.1 org.xerial.snappy:snappy-java = 1.1.10.4 org.xerial:sqlite-jdbc = 3.42.0.0 -org.yaml:snakeyaml = 2.2 +org.yaml:snakeyaml = 2.3 uk.org.lidalia:slf4j-test = 1.1.0 # Manually upgraded versions @@ -104,7 +105,7 @@ org.postgresql:postgresql = 42.7.3 org.apache.thrift:libthrift = 0.17.0 # Large internal product uses 2.x -org.codehaus.groovy:* = 2.5.14 +org.codehaus.groovy:* = 3.0.9 # Subsequent versions use Java 17, which we don't use right now. com.palantir.goethe:* = 0.12.0 From 0e3a013bf5d65162f5f8cf3e8af9bb5fcb1ee844 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Wed, 30 Oct 2024 14:43:56 +0000 Subject: [PATCH 02/11] suppress warning --- .../groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java index f10300273f6..4db36a16cf9 100644 --- a/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java +++ b/atlasdb-console/src/main/groovy/com/palantir/atlasdb/console/AtlasConsoleMain.java @@ -182,6 +182,9 @@ private static Binding setupBinding(Binding binding, boolean mutationsEnabled) { * access (removes the need for users to create an explicit ~/.java.policy * file). */ + // groovysh still sets the security manager, see + // https://github.com/groovy/groovy-core/blob/4c05980922a927b32691e4c3eba5633825cc01e3/subprojects/groovy-groovysh/src/main/groovy/org/codehaus/groovy/tools/shell/Main.groovy#L184C39-L184C60 + @SuppressWarnings("removal") public static void callback(Script script, boolean mutationsEnabled) throws CompilationFailedException, IOException { System.setSecurityManager(null); From b8183d85ab24b72aab5848b99420306d54c61db2 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Wed, 30 Oct 2024 23:28:06 +0000 Subject: [PATCH 03/11] poke From 53eb316b70e48f2402edac859ca4fecf60c5b470 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Wed, 30 Oct 2024 23:32:25 +0000 Subject: [PATCH 04/11] poke From 20bdc09d8700da67e827749dc9625336720ccbd6 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 08:59:14 +0000 Subject: [PATCH 05/11] remove clojure --- versions.props | 1 - 1 file changed, 1 deletion(-) diff --git a/versions.props b/versions.props index e3e55d5a9f2..a1f78dfe564 100644 --- a/versions.props +++ b/versions.props @@ -55,7 +55,6 @@ org.apache.commons:commons-text = 1.12.0 org.apache.httpcomponents.client5:httpclient5 = 5.3.1 org.assertj:* = 3.26.3 org.awaitility:awaitility = 4.2.2 -org.clojure:clojure = 1.8.0 org.derive4j:* = 1.1.1 org.eclipse.collections:* = 11.1.0 org.freemarker:freemarker = 2.3.33 From 2a52427fa6a151c506e7be66b032d8ded259f638 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 09:26:16 +0000 Subject: [PATCH 06/11] downgrade dagger --- versions.lock | 11 +++++------ versions.props | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/versions.lock b/versions.lock index 0a1c754273f..a7342e717e0 100644 --- a/versions.lock +++ b/versions.lock @@ -36,10 +36,10 @@ com.github.tjake:crc32ex:0.1.1 (1 constraints: 900f6088) com.google.auto.service:auto-service-annotations:1.0 (1 constraints: a5041a2c) com.google.code.findbugs:findbugs-annotations:3.0.1 (1 constraints: 0605fb35) com.google.code.findbugs:jsr305:3.0.2 (50 constraints: 5e31abaa) -com.google.dagger:dagger:2.52 (3 constraints: 0e1f25d9) -com.google.dagger:dagger-compiler:2.52 (1 constraints: dd04ff30) -com.google.dagger:dagger-spi:2.52 (1 constraints: 210e6540) -com.google.devtools.ksp:symbol-processing-api:1.9.24-1.0.20 (3 constraints: 182608b7) +com.google.dagger:dagger:2.51.1 (3 constraints: 28205474) +com.google.dagger:dagger-compiler:2.51.1 (1 constraints: 3b05433b) +com.google.dagger:dagger-spi:2.51.1 (1 constraints: 7f0e315d) +com.google.devtools.ksp:symbol-processing-api:1.9.20-1.0.14 (3 constraints: 16269fb6) com.google.errorprone:error_prone_annotations:2.28.0 (30 constraints: 4f01ccc6) com.google.errorprone:javac-shaded:9-dev-r4023-3 (1 constraints: 151671fc) com.google.googlejavaformat:google-java-format:1.5 (1 constraints: ee0d4132) @@ -187,7 +187,6 @@ io.undertow:undertow-core:2.2.37.Final (3 constraints: 8f363de3) io.vavr:vavr:0.10.4 (1 constraints: 3705273b) io.vavr:vavr-match:0.10.4 (1 constraints: 8b061d57) it.unimi.dsi:fastutil:6.5.7 (1 constraints: 6d0e414b) -jakarta.inject:jakarta.inject-api:2.0.1 (1 constraints: c10ad2cb) javax.activation:javax.activation-api:1.2.0 (3 constraints: 053284b7) javax.annotation:javax.annotation-api:1.3.2 (7 constraints: 396987f4) javax.inject:javax.inject:1 (13 constraints: 1ec288bd) @@ -270,7 +269,7 @@ org.jdbi:jdbi3-core:3.30.0 (2 constraints: 0e10d5bf) org.jdbi:jdbi3-sqlobject:3.30.0 (1 constraints: 38053d3b) org.jetbrains:annotations:24.1.0 (4 constraints: 10351039) org.jetbrains.kotlin:kotlin-reflect:1.6.10 (1 constraints: 360b7dd6) -org.jetbrains.kotlin:kotlin-stdlib:1.9.24 (4 constraints: 883fe66b) +org.jetbrains.kotlin:kotlin-stdlib:1.9.20 (4 constraints: 843fae69) org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0 (1 constraints: b1101cc2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0 (2 constraints: 7c1ee58d) org.jvnet:animal-sniffer-annotation:1.0 (1 constraints: f20b95eb) diff --git a/versions.props b/versions.props index a1f78dfe564..e54b08c7a6f 100644 --- a/versions.props +++ b/versions.props @@ -10,7 +10,7 @@ com.google.auto.service:auto-service-annotations = 1.0 com.google.auto:auto-common = 1.2.2 com.google.code.findbugs:findbugs-annotations = 3.0.1 com.google.code.findbugs:jsr305 = 3.0.2 -com.google.dagger:* = 2.52 +com.google.dagger:* = 2.51.1 # Ksp version is temporary, can be removed once Maven calms down. com.google.devtools.ksp:symbol-processing-api = 1.5.21-1.0.0-beta07 com.google.errorprone:* = 2.10.0 # upgrading to 2.11.0 is blocked by a google bug From 593349a93577dc9a998e607e73bf14814aaaffc0 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 11:01:07 +0000 Subject: [PATCH 07/11] downgrade junit --- versions.lock | 30 +++++++++++++++--------------- versions.props | 6 +++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/versions.lock b/versions.lock index a7342e717e0..e779f773b2d 100644 --- a/versions.lock +++ b/versions.lock @@ -196,7 +196,7 @@ javax.ws.rs:javax.ws.rs-api:2.1.1 (16 constraints: e41a5143) javax.xml.bind:jaxb-api:2.3.1 (3 constraints: d3418bed) jline:jline:2.14.6 (1 constraints: f90f6890) joda-time:joda-time:2.13.0 (6 constraints: b259502c) -net.bytebuddy:byte-buddy:1.15.3 (4 constraints: 323192c7) +net.bytebuddy:byte-buddy:1.15.1 (4 constraints: 6431f1f8) net.java.dev.jna:jna:4.1.0 (2 constraints: 6e1bbbad) net.jpountz.lz4:lz4:1.3.0 (2 constraints: 971453a0) net.ltgt.gradle.incap:incap:0.2 (1 constraints: ea0d3b32) @@ -310,7 +310,7 @@ com.spotify.dataenum:dataenum:1.4.1 (1 constraints: e9105ac1) com.thoughtworks.qdox:qdox:1.12.1 (1 constraints: 6d11f7d9) info.picocli:picocli:4.6.1 (1 constraints: 8e10ebb0) io.dropwizard:dropwizard-testing:2.1.7 (1 constraints: 0c05ff35) -net.bytebuddy:byte-buddy-agent:1.15.3 (1 constraints: 440b44de) +net.bytebuddy:byte-buddy-agent:1.14.15 (1 constraints: 760bb5e9) net.jcip:jcip-annotations:1.0 (2 constraints: fa13a659) net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc) org.apache-extras.beanshell:bsh:2.0b6 (1 constraints: ac07626b) @@ -354,19 +354,19 @@ org.hamcrest:hamcrest-library:2.2 (1 constraints: 1607425c) org.jmock:jmock:2.13.1 (2 constraints: f210e8dc) org.jmock:jmock-imposters:2.13.1 (1 constraints: 3905393b) org.jmock:jmock-testjar:2.13.1 (1 constraints: a707a672) -org.junit.jupiter:junit-jupiter:5.11.1 (3 constraints: cb42b4ef) -org.junit.jupiter:junit-jupiter-api:5.11.1 (7 constraints: 3e6c0573) -org.junit.jupiter:junit-jupiter-engine:5.11.1 (2 constraints: c91e76a4) -org.junit.jupiter:junit-jupiter-params:5.11.1 (2 constraints: 6e13765b) -org.junit.platform:junit-platform-commons:1.11.1 (4 constraints: 16397fc8) -org.junit.platform:junit-platform-engine:1.11.1 (4 constraints: a94b953c) -org.junit.platform:junit-platform-launcher:1.11.1 (2 constraints: 052579e4) -org.junit.platform:junit-platform-suite:1.11.1 (1 constraints: 36052d3b) -org.junit.platform:junit-platform-suite-api:1.11.1 (3 constraints: ae395ee0) -org.junit.platform:junit-platform-suite-commons:1.11.1 (1 constraints: ef139f69) -org.junit.platform:junit-platform-suite-engine:1.11.1 (1 constraints: 4c11d4d8) -org.mockito:mockito-core:5.14.1 (3 constraints: 7d254355) -org.mockito:mockito-junit-jupiter:5.14.1 (1 constraints: 3d054e3b) +org.junit.jupiter:junit-jupiter:5.10.2 (3 constraints: cb42b2ef) +org.junit.jupiter:junit-jupiter-api:5.10.2 (7 constraints: 3f6cfc72) +org.junit.jupiter:junit-jupiter-engine:5.10.2 (2 constraints: c91e74a4) +org.junit.jupiter:junit-jupiter-params:5.10.2 (2 constraints: 6e13725b) +org.junit.platform:junit-platform-commons:1.10.2 (4 constraints: 163977c8) +org.junit.platform:junit-platform-engine:1.10.2 (4 constraints: a94b8d3c) +org.junit.platform:junit-platform-launcher:1.10.2 (2 constraints: 052577e4) +org.junit.platform:junit-platform-suite:1.10.2 (1 constraints: 36052b3b) +org.junit.platform:junit-platform-suite-api:1.10.2 (3 constraints: ae3958e0) +org.junit.platform:junit-platform-suite-commons:1.10.2 (1 constraints: ef139d69) +org.junit.platform:junit-platform-suite-engine:1.10.2 (1 constraints: 4c11d2d8) +org.mockito:mockito-core:5.12.0 (3 constraints: 77251e54) +org.mockito:mockito-junit-jupiter:5.12.0 (1 constraints: 3a05473b) org.objenesis:objenesis:3.3 (2 constraints: dc15a7df) org.openjdk.jmh:jmh-core:1.37 (2 constraints: f71557d9) org.openjdk.jmh:jmh-generator-annprocess:1.37 (1 constraints: df04fc30) diff --git a/versions.props b/versions.props index e54b08c7a6f..1e4e1410132 100644 --- a/versions.props +++ b/versions.props @@ -65,10 +65,10 @@ org.jboss.marshalling:jboss-marshalling = 2.2.1.Final org.jboss.threads:jboss-threads = 3.8.0.Final org.jdbi:* = 3.30.0 org.jmock:jmock* = 2.13.1 -org.junit.jupiter:* = 5.11.1 -org.junit.platform:* = 1.11.1 +org.junit.jupiter:* = 5.10.2 +org.junit.platform:* = 1.10.2 org.mindrot:jbcrypt = 0.4 -org.mockito:* = 5.14.1 +org.mockito:* = 5.12.0 org.openjdk.jmh:* = 1.37 org.reflections:reflections = 0.10.2 org.rocksdb:rocksdbjni = 9.6.1 From 180b68560c04489ba045f22eb46672ccf5c6d20d Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Thu, 31 Oct 2024 11:21:59 +0000 Subject: [PATCH 08/11] Add generated changelog entries --- changelog/@unreleased/pr-7413.v2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/@unreleased/pr-7413.v2.yml diff --git a/changelog/@unreleased/pr-7413.v2.yml b/changelog/@unreleased/pr-7413.v2.yml new file mode 100644 index 00000000000..9f42ee4b881 --- /dev/null +++ b/changelog/@unreleased/pr-7413.v2.yml @@ -0,0 +1,5 @@ +type: improvement +improvement: + description: Upgrade AtlasDB to target compile 17 + links: + - https://github.com/palantir/atlasdb/pull/7413 From 2ab350371085835379331c665094e1156f45c162 Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 11:27:38 +0000 Subject: [PATCH 09/11] re-jigger deps --- versions.lock | 2 +- versions.props | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/versions.lock b/versions.lock index e779f773b2d..c7db2216a9a 100644 --- a/versions.lock +++ b/versions.lock @@ -47,7 +47,7 @@ com.google.guava:failureaccess:1.0.2 (3 constraints: 9624ef4a) com.google.guava:guava:33.3.1-jre (49 constraints: eb77aa92) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) -com.google.protobuf:protobuf-java:4.28.2 (1 constraints: 4205593b) +com.google.protobuf:protobuf-java:3.25.4 (1 constraints: 40054c3b) com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4 (1 constraints: 350f7769) com.googlecode.json-simple:json-simple:1.1 (1 constraints: 320f7469) com.helger:profiler:1.1.1 (1 constraints: e21053b8) diff --git a/versions.props b/versions.props index 1e4e1410132..fdf24df9707 100644 --- a/versions.props +++ b/versions.props @@ -10,13 +10,11 @@ com.google.auto.service:auto-service-annotations = 1.0 com.google.auto:auto-common = 1.2.2 com.google.code.findbugs:findbugs-annotations = 3.0.1 com.google.code.findbugs:jsr305 = 3.0.2 -com.google.dagger:* = 2.51.1 # Ksp version is temporary, can be removed once Maven calms down. com.google.devtools.ksp:symbol-processing-api = 1.5.21-1.0.0-beta07 com.google.errorprone:* = 2.10.0 # upgrading to 2.11.0 is blocked by a google bug com.google.errorprone:error_prone_annotations = 2.10.0 com.google.guava:guava = 33.3.1-jre -com.google.protobuf:* = 4.28.2 com.lmax:disruptor = 3.4.2 com.palantir.common:streams = 2.4.0 com.palantir.config.crypto:* = 6.0.0 @@ -26,6 +24,7 @@ com.palantir.conjure.java:* = 8.28.0 com.palantir.conjure:conjure = 4.49.0 com.palantir.dialogue:* = 4.1.0 com.palantir.docker.proxy:* = 1.6.0 +com.palantir.goethe:* = 0.12.0 com.palantir.nylon:* = 0.4.0 com.palantir.refreshable:refreshable = 2.5.0 com.palantir.safe-logging:* = 3.7.0 @@ -55,6 +54,7 @@ org.apache.commons:commons-text = 1.12.0 org.apache.httpcomponents.client5:httpclient5 = 5.3.1 org.assertj:* = 3.26.3 org.awaitility:awaitility = 4.2.2 +org.codehaus.groovy:* = 3.0.9 org.derive4j:* = 1.1.1 org.eclipse.collections:* = 11.1.0 org.freemarker:freemarker = 2.3.33 @@ -65,10 +65,7 @@ org.jboss.marshalling:jboss-marshalling = 2.2.1.Final org.jboss.threads:jboss-threads = 3.8.0.Final org.jdbi:* = 3.30.0 org.jmock:jmock* = 2.13.1 -org.junit.jupiter:* = 5.10.2 -org.junit.platform:* = 1.10.2 org.mindrot:jbcrypt = 0.4 -org.mockito:* = 5.12.0 org.openjdk.jmh:* = 1.37 org.reflections:reflections = 0.10.2 org.rocksdb:rocksdbjni = 9.6.1 @@ -94,6 +91,19 @@ io.dropwizard:* = 2.1.7 # Thus we cannot upgrade logback until dropwizard supports jakarta servlet 5.x.x ch.qos.logback:* = 1.2.11 +# Dropwizard 2.1.x DropwizardExtensionsSupport relies on junit 5.10.x and below +# All the below bump junit to an incompatible version. Bump this after bumping Dropwizard to 3.x +org.junit.jupiter:* = 5.10.2 +org.junit.platform:* = 1.10.2 +org.mockito:* = 5.12.0 + +# Dagger 2.52.0+ adds a dependency on jakarta. Bump this with the javax -> jakarta migration. +com.google.dagger:* = 2.51.1 + +# Large internal consumer still relies on protobuf 3.x. +# We need to bump this in coordination with them. +com.google.protobuf:* = 3.25.4 + # Database drivers can have unexpected breaking changes and should be upgraded with caution com.datastax.cassandra:cassandra-driver-core = 3.8.0 com.oracle.database.jdbc:ojdbc11 = 23.4.0.24.05 @@ -102,9 +112,3 @@ org.postgresql:postgresql = 42.7.3 # transitive dep with API breaks in 0.14.0 org.apache.thrift:libthrift = 0.17.0 - -# Large internal product uses 2.x -org.codehaus.groovy:* = 3.0.9 - -# Subsequent versions use Java 17, which we don't use right now. -com.palantir.goethe:* = 0.12.0 From fe840c5eca26024d04ee7dd155c1b3c1fe287b8c Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 14:46:06 +0000 Subject: [PATCH 10/11] Update atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java Co-authored-by: Carter Kozak --- .../java/com/palantir/processors/AutoDelegateProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java index 7af8448fde8..3ab71166192 100644 --- a/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java +++ b/atlasdb-processors/src/main/java/com/palantir/processors/AutoDelegateProcessor.java @@ -96,7 +96,7 @@ public Set getSupportedAnnotationTypes() { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_17; + return SourceVersion.latestSupported(); } @Override From fb93f24268da081ac4578832ed3ce8233ce7c67c Mon Sep 17 00:00:00 2001 From: Samuel Souza Date: Thu, 31 Oct 2024 16:32:18 +0000 Subject: [PATCH 11/11] downgrade hikari --- versions.lock | 2 +- versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.lock b/versions.lock index c7db2216a9a..fa3c15c7913 100644 --- a/versions.lock +++ b/versions.lock @@ -113,7 +113,7 @@ com.palantir.tritium:tritium-tracing:0.93.0 (2 constraints: 7e20193e) com.squareup:javapoet:1.13.0 (4 constraints: 102cc1ed) com.squareup:kotlinpoet:1.11.0 (1 constraints: 790e1a5d) com.thinkaurelius.thrift:thrift-server:0.3.7 (1 constraints: 980f6c88) -com.zaxxer:HikariCP:6.0.0 (1 constraints: 08050936) +com.zaxxer:HikariCP:5.1.0 (1 constraints: 08050736) commons-cli:commons-cli:1.9.0 (2 constraints: 3d146778) commons-codec:commons-codec:1.17.1 (2 constraints: 6e14ac85) commons-dbutils:commons-dbutils:1.8.1 (1 constraints: 0c050936) diff --git a/versions.props b/versions.props index fdf24df9707..f060bf6d89a 100644 --- a/versions.props +++ b/versions.props @@ -32,7 +32,7 @@ com.palantir.sls.versions:* = 1.5.0 com.palantir.tracing:* = 6.20.0 com.palantir.tritium:* = 0.93.0 com.squareup:javapoet = 1.13.0 -com.zaxxer:HikariCP = 6.0.0 +com.zaxxer:HikariCP = 5.1.0 commons-cli:* = 1.9.0 commons-codec:* = 1.17.1 commons-dbutils:* = 1.8.1