From e302c5a20c24a9b9f2664f3dd516ded1382b6584 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Tue, 9 Jul 2024 12:50:43 -0700 Subject: [PATCH] build: Migrate remaining library dependencies to gradle version catalog (#5738) Follow-up to #5683 --- Base/build.gradle | 2 +- BenchmarkSupport/BenchmarkSupport.gradle | 2 +- DHProcess/build.gradle | 6 +- Plot/Plot.gradle | 2 +- Stats/build.gradle | 2 +- Util/immutables/build.gradle | 2 +- application-mode/build.gradle | 2 +- .../example-providers/oidc/build.gradle | 4 +- .../sql-username-password/build.gradle | 4 +- authorization-codegen/build.gradle | 2 +- base-test-utils/build.gradle | 2 +- codegen/build.gradle | 2 +- engine/api/build.gradle | 4 +- engine/benchmark/build.gradle | 4 +- engine/context/build.gradle | 4 +- engine/processor/build.gradle | 2 +- engine/rowset/build.gradle | 2 +- engine/table/build.gradle | 16 +-- engine/test-utils/build.gradle | 2 +- engine/updategraph/build.gradle | 2 +- extensions/barrage/build.gradle | 6 +- extensions/bson-jackson/build.gradle | 6 +- extensions/classgraph/build.gradle | 4 +- extensions/csv/build.gradle | 6 +- extensions/iceberg/build.gradle | 2 +- extensions/jdbc/build.gradle | 2 +- extensions/json-jackson/build.gradle | 6 +- extensions/json/build.gradle | 4 +- extensions/kafka/build.gradle | 8 +- extensions/parquet/benchmark/build.gradle | 4 +- extensions/parquet/compression/build.gradle | 6 +- extensions/parquet/table/build.gradle | 6 +- extensions/protobuf/build.gradle | 4 +- extensions/s3/build.gradle | 2 +- extensions/source-support/build.gradle | 2 +- extensions/suanshu/build.gradle | 4 +- gradle/libs.versions.toml | 130 +++++++++++++++++- grpc-java/grpc-servlet-jakarta/build.gradle | 3 +- .../build.gradle | 4 +- java-client/barrage/build.gradle | 4 +- java-client/example-utilities/build.gradle | 2 +- java-client/flight-examples/build.gradle | 2 +- java-client/flight/build.gradle | 2 +- java-client/session/build.gradle | 4 +- java-client/uri/build.gradle | 2 +- open-api/lang-tools/lang-tools.gradle | 2 +- plugin/build.gradle | 2 +- proto/proto-backplane-grpc/build.gradle | 6 +- py/jpy-ext/build.gradle | 2 +- qst/build.gradle | 2 +- qst/graphviz/build.gradle | 4 +- qst/type/build.gradle | 2 +- replication/reflective/build.gradle | 2 +- replication/util/build.gradle | 2 +- server/build.gradle | 8 +- server/jetty/build.gradle | 4 +- server/netty/build.gradle | 2 +- server/test-utils/build.gradle | 2 +- sql/build.gradle | 4 +- ssl/config/build.gradle | 2 +- table-api/build.gradle | 4 +- web/client-api/client-api.gradle | 8 +- 62 files changed, 239 insertions(+), 112 deletions(-) diff --git a/Base/build.gradle b/Base/build.gradle index ced34b26a52..dfca5c784f1 100644 --- a/Base/build.gradle +++ b/Base/build.gradle @@ -11,7 +11,7 @@ dependencies { compileOnlyApi libs.jetbrains.annotations implementation libs.commons.lang3 - api 'io.deephaven:hash:0.1.0' + api libs.deephaven.hash testImplementation libs.junit4 testImplementation libs.jmock.junit4 diff --git a/BenchmarkSupport/BenchmarkSupport.gradle b/BenchmarkSupport/BenchmarkSupport.gradle index 0308980c99b..d9e0a7dab27 100644 --- a/BenchmarkSupport/BenchmarkSupport.gradle +++ b/BenchmarkSupport/BenchmarkSupport.gradle @@ -24,7 +24,7 @@ dependencies { implementation project(':extensions-parquet-table') implementation project(':extensions-parquet-base') implementation project(':Configuration') - implementation 'org.openjdk.jmh:jmh-core:1.20' + implementation libs.jmh.core implementation libs.univocity.parsers diff --git a/DHProcess/build.gradle b/DHProcess/build.gradle index 70d36dd9ff4..5b88f86eed7 100644 --- a/DHProcess/build.gradle +++ b/DHProcess/build.gradle @@ -5,10 +5,10 @@ plugins { } dependencies { - annotationProcessor 'org.immutables:value:2.8.1' - compileOnly 'org.immutables:value-annotations:2.8.1' + annotationProcessor libs.immutables.value + compileOnly libs.immutables.value.annotations - implementation ('com.github.oshi:oshi-core:5.8.3') { + implementation (libs.oshi.core) { because 'it is able to greatly simplify collection of system information' } } diff --git a/Plot/Plot.gradle b/Plot/Plot.gradle index 3e49a320498..2623b342174 100644 --- a/Plot/Plot.gradle +++ b/Plot/Plot.gradle @@ -18,7 +18,7 @@ dependencies { compileOnly libs.autoservice annotationProcessor libs.autoservice.compiler - compileOnly 'javax.inject:javax.inject:1' + compileOnly libs.javax.inject implementation libs.guava implementation libs.commons.lang3 diff --git a/Stats/build.gradle b/Stats/build.gradle index 224ca312843..dcd55f60a2c 100644 --- a/Stats/build.gradle +++ b/Stats/build.gradle @@ -9,7 +9,7 @@ dependencies { implementation project(':Configuration') implementation project(':log-factory') implementation project(':engine-context') - compileOnly 'com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0' + compileOnly libs.google.java.allocation.instrumenter testImplementation project(path: ':Base', configuration: 'tests') diff --git a/Util/immutables/build.gradle b/Util/immutables/build.gradle index c785c9e8fe6..491886a8bec 100644 --- a/Util/immutables/build.gradle +++ b/Util/immutables/build.gradle @@ -4,5 +4,5 @@ plugins { } dependencies { - compileOnlyApi 'org.immutables:value-annotations:2.9.2' + compileOnlyApi libs.immutables.value.annotations } diff --git a/application-mode/build.gradle b/application-mode/build.gradle index 26ca8bc8a22..8eb16c34d6c 100644 --- a/application-mode/build.gradle +++ b/application-mode/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation project(':Integrations') compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value // we'll rely on the engine-table module to provide the necessary groovy dependencies compileOnly libs.groovy diff --git a/authentication/example-providers/oidc/build.gradle b/authentication/example-providers/oidc/build.gradle index 330637cb5fd..ca3ca0da322 100644 --- a/authentication/example-providers/oidc/build.gradle +++ b/authentication/example-providers/oidc/build.gradle @@ -1,4 +1,4 @@ dependencies { - implementation 'org.pac4j:pac4j-oidc:5.7.0' - implementation 'org.pac4j:pac4j-http:5.7.0' + implementation libs.pac4j.oidc + implementation libs.pac4j.http } \ No newline at end of file diff --git a/authentication/example-providers/sql-username-password/build.gradle b/authentication/example-providers/sql-username-password/build.gradle index d7f1cc9e5e3..09e844fced9 100644 --- a/authentication/example-providers/sql-username-password/build.gradle +++ b/authentication/example-providers/sql-username-password/build.gradle @@ -3,10 +3,10 @@ configurations { pwGen } dependencies { - implementation('org.postgresql:postgresql:42.7.1') { + implementation(libs.postgresql) { because 'Postgres driver to connect to a running DB to query for user information' } - implementation('org.mindrot:jbcrypt:0.4') { + implementation(libs.mindrot.jbcrypt) { because 'bcrypt is used in this example to ensure passwords are never stored or queried in plain text' } diff --git a/authorization-codegen/build.gradle b/authorization-codegen/build.gradle index 75ac2b2f514..5a06906fa89 100644 --- a/authorization-codegen/build.gradle +++ b/authorization-codegen/build.gradle @@ -13,5 +13,5 @@ dependencies { implementation platform(libs.grpc.bom) implementation libs.grpc.services - implementation 'com.squareup:javapoet:1.13.0' + implementation libs.squareup.javapoet } diff --git a/base-test-utils/build.gradle b/base-test-utils/build.gradle index fc266eb04dd..62d09ff511b 100644 --- a/base-test-utils/build.gradle +++ b/base-test-utils/build.gradle @@ -10,7 +10,7 @@ dependencies { compileOnlyApi libs.jetbrains.annotations implementation libs.commons.lang3 - api 'io.deephaven:hash:0.1.0' + api libs.deephaven.hash api libs.junit4 api libs.jmock.junit4 diff --git a/codegen/build.gradle b/codegen/build.gradle index 247d699b384..d3bc3a69ba3 100644 --- a/codegen/build.gradle +++ b/codegen/build.gradle @@ -7,6 +7,6 @@ plugins { description 'Codegen: Code generation utilities' dependencies { - implementation 'org.freemarker:freemarker:2.3.31' + implementation libs.freemarker testImplementation libs.junit4 } \ No newline at end of file diff --git a/engine/api/build.gradle b/engine/api/build.gradle index dc914bca940..5e39ec18ac3 100644 --- a/engine/api/build.gradle +++ b/engine/api/build.gradle @@ -20,11 +20,11 @@ dependencies { implementation libs.trove compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation libs.guava - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation project(':engine-test-utils') testImplementation TestTools.projectDependency(project, 'engine-table') diff --git a/engine/benchmark/build.gradle b/engine/benchmark/build.gradle index a05786cd526..1f782cf62c9 100644 --- a/engine/benchmark/build.gradle +++ b/engine/benchmark/build.gradle @@ -20,8 +20,8 @@ dependencies { TestTools.projectDependency(project, 'engine-rowset'), TestTools.projectDependency(project, 'engine-table') - testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.35' - testCompileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.35' + testAnnotationProcessor libs.jmh.generator.annprocess + testCompileOnly libs.jmh.generator.annprocess testRuntimeOnly project(path: ':configs') testRuntimeOnly project(path: ':test-configs') diff --git a/engine/context/build.gradle b/engine/context/build.gradle index c1dc47c7346..4d122484690 100644 --- a/engine/context/build.gradle +++ b/engine/context/build.gradle @@ -17,12 +17,12 @@ dependencies { implementation project(':table-api') implementation project(':IO') - implementation 'com.github.f4b6a3:uuid-creator:5.2.0' + implementation libs.f4b6a3.uuid.creator implementation libs.commons.text compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation project(':engine-test-utils') diff --git a/engine/processor/build.gradle b/engine/processor/build.gradle index b5ef94efab7..8f300d28401 100644 --- a/engine/processor/build.gradle +++ b/engine/processor/build.gradle @@ -9,7 +9,7 @@ dependencies { api project(':engine-chunk') compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/engine/rowset/build.gradle b/engine/rowset/build.gradle index 23ccb24fd67..ae24b9d782a 100644 --- a/engine/rowset/build.gradle +++ b/engine/rowset/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation project(':Configuration') implementation libs.commons.lang3 - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 compileOnly libs.jetbrains.annotations testImplementation libs.junit4 diff --git a/engine/table/build.gradle b/engine/table/build.gradle index 906e51f0ca1..fe9be770f49 100644 --- a/engine/table/build.gradle +++ b/engine/table/build.gradle @@ -29,12 +29,12 @@ dependencies { implementation project(':log-factory') implementation project(':Stats') - implementation 'com.github.f4b6a3:uuid-creator:5.2.0' + implementation libs.f4b6a3.uuid.creator // TODO(deephaven-core#3204): t-digest 3.3 appears to have higher errors than 3.2 - implementation 'com.tdunning:t-digest:3.2' - implementation 'com.squareup:javapoet:1.13.0' - implementation 'io.github.classgraph:classgraph:4.8.165' - implementation 'it.unimi.dsi:fastutil:8.5.13' + implementation libs.tdunning.t.digest + implementation libs.squareup.javapoet + implementation libs.classgraph + implementation libs.dsi.fastutil implementation project(':plugin') implementation libs.commons.lang3 @@ -48,9 +48,9 @@ dependencies { annotationProcessor libs.autoservice.compiler compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 runtimeOnly project(':engine-tuplesource') @@ -118,7 +118,7 @@ tasks.testOutOfBand.maxHeapSize = maxHeapSize tasks.test.maxHeapSize = maxHeapSize jmh { - jmhVersion = '1.35' + jmhVersion = libs.versions.jmh.get() } // No need to assemble the jar by default on build diff --git a/engine/test-utils/build.gradle b/engine/test-utils/build.gradle index 6c2118b715e..8447aba7f58 100644 --- a/engine/test-utils/build.gradle +++ b/engine/test-utils/build.gradle @@ -18,7 +18,7 @@ dependencies { implementation libs.commons.lang3 implementation libs.trove - implementation 'it.unimi.dsi:fastutil:8.5.13' + implementation libs.dsi.fastutil implementation libs.junit4 implementation platform(libs.junit.bom) diff --git a/engine/updategraph/build.gradle b/engine/updategraph/build.gradle index 6787b24e2e6..e9bc9e1dd0b 100644 --- a/engine/updategraph/build.gradle +++ b/engine/updategraph/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation project(':Configuration') implementation libs.commons.lang3 - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 compileOnly libs.jetbrains.annotations testImplementation project(':engine-context') diff --git a/extensions/barrage/build.gradle b/extensions/barrage/build.gradle index cdf1f4b54a2..82db148d212 100644 --- a/extensions/barrage/build.gradle +++ b/extensions/barrage/build.gradle @@ -15,8 +15,8 @@ dependencies { api project(':engine-table') implementation project(':proto:proto-backplane-grpc-flight') implementation project(':log-factory') - api 'io.deephaven.barrage:barrage-format:0.6.0' - implementation 'org.hdrhistogram:HdrHistogram:2.1.12' + api libs.deephaven.barrage.format + implementation libs.hdrhistogram implementation libs.flatbuffers.java @@ -24,7 +24,7 @@ dependencies { implementation libs.arrow.format compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation project(':engine-test-utils') diff --git a/extensions/bson-jackson/build.gradle b/extensions/bson-jackson/build.gradle index 9eda850de91..0b66ea6ca7d 100644 --- a/extensions/bson-jackson/build.gradle +++ b/extensions/bson-jackson/build.gradle @@ -6,12 +6,12 @@ plugins { dependencies { api project(':extensions-json-jackson') api project(':engine-processor') - api 'de.undercouch:bson4jackson:2.15.1' + api libs.undercouch.bson4jackson compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation platform(libs.jackson.bom) testImplementation libs.jackson.databind diff --git a/extensions/classgraph/build.gradle b/extensions/classgraph/build.gradle index 45f89d8c0e0..4f165a5d69e 100644 --- a/extensions/classgraph/build.gradle +++ b/extensions/classgraph/build.gradle @@ -7,9 +7,9 @@ dependencies { compileOnly project(':engine-table') compileOnly project(':Util') - compileOnly 'javax.inject:javax.inject:1' + compileOnly libs.javax.inject - api 'io.github.classgraph:classgraph:4.8.154' + api libs.classgraph compileOnly libs.autoservice annotationProcessor libs.autoservice.compiler diff --git a/extensions/csv/build.gradle b/extensions/csv/build.gradle index e1b6c5d1f1d..38b4b7a8f9f 100644 --- a/extensions/csv/build.gradle +++ b/extensions/csv/build.gradle @@ -7,15 +7,15 @@ description 'CSV: Support to read and write engine tables from/to CSV' dependencies { api project(':engine-api') - api 'io.deephaven:deephaven-csv:0.12.0' - runtimeOnly 'io.deephaven:deephaven-csv-fast-double-parser:0.12.0' + api libs.deephaven.csv + runtimeOnly libs.deephaven.csv.fast.double.parser implementation project(':engine-table') implementation project(':engine-base') implementation libs.trove compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation platform(libs.junit.bom) testImplementation libs.assertj diff --git a/extensions/iceberg/build.gradle b/extensions/iceberg/build.gradle index 704f3fb9cd2..2c30f242bfe 100644 --- a/extensions/iceberg/build.gradle +++ b/extensions/iceberg/build.gradle @@ -18,7 +18,7 @@ dependencies { annotationProcessor libs.autoservice.compiler compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation libs.parquet.hadoop diff --git a/extensions/jdbc/build.gradle b/extensions/jdbc/build.gradle index f9141e8038b..f2ac49ccc84 100644 --- a/extensions/jdbc/build.gradle +++ b/extensions/jdbc/build.gradle @@ -17,7 +17,7 @@ dependencies { testImplementation libs.assertj testImplementation project(':engine-test-utils') - testImplementation 'com.h2database:h2:2.1.212' + testImplementation libs.h2database.h2 testRuntimeOnly project(':log-to-slf4j') testRuntimeOnly project(':configs') diff --git a/extensions/json-jackson/build.gradle b/extensions/json-jackson/build.gradle index 5d12d000382..c46c5c96896 100644 --- a/extensions/json-jackson/build.gradle +++ b/extensions/json-jackson/build.gradle @@ -10,7 +10,7 @@ dependencies { api libs.jackson.core // https://github.com/FasterXML/jackson-core/issues/1229 - implementation 'ch.randelshofer:fastdoubleparser:1.0.0' + implementation libs.randelshofer.fastdoubleparser api project(':extensions-json') @@ -20,11 +20,11 @@ dependencies { implementation project(':engine-time') compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value compileOnly libs.autoservice annotationProcessor libs.autoservice.compiler - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/extensions/json/build.gradle b/extensions/json/build.gradle index 8e32c2bf64b..95e1a7534ad 100644 --- a/extensions/json/build.gradle +++ b/extensions/json/build.gradle @@ -5,9 +5,9 @@ plugins { dependencies { compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/extensions/kafka/build.gradle b/extensions/kafka/build.gradle index 7c381a35d08..65968c51d52 100644 --- a/extensions/kafka/build.gradle +++ b/extensions/kafka/build.gradle @@ -16,9 +16,9 @@ dependencies { // Using io.confluent dependencies requires code in the toplevel build.gradle to add their maven repository. // Note: the -ccs flavor is provided by confluent as their community edition. It is equivalent to the maven central // version, but has a different version to make it easier to keep confluent dependencies aligned. - api 'org.apache.kafka:kafka-clients:7.6.0-ccs' - api 'io.confluent:kafka-avro-serializer:7.6.0' - api 'io.confluent:kafka-protobuf-serializer:7.6.0' + api libs.confluent.kafka.clients + api libs.confluent.avro.serializer + api libs.confluent.protobuf.serializer // When updating the kafka implementation, it may be useful to test out the minimum kafka version that our code // compiles, tests, and runs with. If we want to offer more strict guarantees in these regards in the future, at @@ -36,7 +36,7 @@ dependencies { implementation libs.commons.lang3 compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation project(':engine-test-utils') testImplementation libs.junit4 diff --git a/extensions/parquet/benchmark/build.gradle b/extensions/parquet/benchmark/build.gradle index eb76219b9f3..a2a1109908c 100644 --- a/extensions/parquet/benchmark/build.gradle +++ b/extensions/parquet/benchmark/build.gradle @@ -20,8 +20,8 @@ dependencies { testImplementation TestTools.projectDependency(project, 'engine-rowset') testImplementation TestTools.projectDependency(project, 'engine-table') - testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21' - testCompileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.21' + testAnnotationProcessor libs.jmh.generator.annprocess + testCompileOnly libs.jmh.generator.annprocess testRuntimeOnly project(path: ':configs') testRuntimeOnly project(path: ':test-configs') diff --git a/extensions/parquet/compression/build.gradle b/extensions/parquet/compression/build.gradle index 3f9ab1843a2..2933c53c96d 100644 --- a/extensions/parquet/compression/build.gradle +++ b/extensions/parquet/compression/build.gradle @@ -18,16 +18,16 @@ dependencies { compileOnly libs.jetbrains.annotations - runtimeOnly('org.lz4:lz4-java:1.8.0') { + runtimeOnly(libs.lz4.java) { // also consider lz4-pure-java to avoid native code because 'hadoop-common required dependency for LZ4Codec' } // Pick up default jvm-compatible compression codecs - implementation('io.airlift:aircompressor:0.27') { + implementation(libs.airlift.aircompressor) { because 'Provides Lz4, LZO, Zstd compression support for parquet' } - implementation('org.xerial.snappy:snappy-java:1.1.10.5') { + implementation(libs.snappy.java) { because 'Provides snappy compression for parquet, with native support for all platforms deephaven works on' } } diff --git a/extensions/parquet/table/build.gradle b/extensions/parquet/table/build.gradle index b1a6c449723..caec0e66a29 100644 --- a/extensions/parquet/table/build.gradle +++ b/extensions/parquet/table/build.gradle @@ -43,9 +43,9 @@ dependencies { implementation libs.jackson.datatype.jdk8 compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation project(':base-test-utils') testImplementation project(':engine-test-utils') @@ -66,7 +66,7 @@ dependencies { runtimeOnly project(':extensions-trackedfile') brotliTestImplementation project(':extensions-parquet-table') - brotliTestImplementation('com.github.rdblue:brotli-codec:0.1.1') + brotliTestImplementation(libs.rdblue.brotli.codec) brotliTestRuntimeOnly project(':log-to-slf4j'), project(path: ':configs'), project(path: ':test-configs') diff --git a/extensions/protobuf/build.gradle b/extensions/protobuf/build.gradle index a4a30185ddb..18a7bff22df 100644 --- a/extensions/protobuf/build.gradle +++ b/extensions/protobuf/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation project(':engine-query-constants') compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value compileOnly libs.jetbrains.annotations @@ -45,6 +45,6 @@ spotless { protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.25.3' + artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}" } } diff --git a/extensions/s3/build.gradle b/extensions/s3/build.gradle index 23d687a4401..5f71a8db109 100644 --- a/extensions/s3/build.gradle +++ b/extensions/s3/build.gradle @@ -29,7 +29,7 @@ dependencies { annotationProcessor libs.autoservice.compiler compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/extensions/source-support/build.gradle b/extensions/source-support/build.gradle index 95abcd54947..8bfbe64f98a 100644 --- a/extensions/source-support/build.gradle +++ b/extensions/source-support/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation project(':log-factory') implementation project(':Configuration') - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation project(':engine-test-utils') testImplementation libs.commons.lang3 diff --git a/extensions/suanshu/build.gradle b/extensions/suanshu/build.gradle index 4fad4f06ee7..10998aed8b4 100644 --- a/extensions/suanshu/build.gradle +++ b/extensions/suanshu/build.gradle @@ -7,9 +7,9 @@ dependencies { compileOnly project(':Base') compileOnly project(':engine-table') - compileOnly 'javax.inject:javax.inject:1' + compileOnly libs.javax.inject - api 'io.deephaven:SuanShu:0.1.0' + api libs.deephaven.suan.shu compileOnly libs.autoservice annotationProcessor libs.autoservice.compiler diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7cd9dcf63f..7872413372f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,34 @@ [versions] +airlift = "0.27" arrow = "13.0.0" autoservice = "1.0.1" avro = "1.11.3" awssdk = "2.24.5" # See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty boringssl = "2.0.61.Final" +calcite = "1.36.0" +classgraph = "4.8.165" commons-compress = "1.26.0" commons-io = "2.11.0" commons-lang3 = "3.12.0" commons-math3 = "3.6.1" commons-text = "1.10.0" +# confluent and confluent-kafak-clients should be kept in-sync +confluent = "7.6.0" +confluent-kafka-clients = "7.6.0-ccs" dagger = "2.44" +deephaven-barrage = "0.6.0" +deephaven-csv = "0.12.0" +deephaven-hash = "0.1.0" +deephaven-suan-shu = "0.1.0" +dev-dirs = "26" +dsi = "8.5.13" elemental = "1.2.1" +f4b6a3 = "5.2.0" flatbuffers = "1.12.0" +freemarker = "2.3.31" +google-findbugs = "3.0.2" +google-java-allocation-instrumenter = "3.3.0" groovy = "3.0.21" # Only bump this in concert with boringssl grpc = "1.58.0" @@ -21,34 +37,61 @@ gwt = "2.11.0" # used by GwtTools gwtJetty = "9.4.44.v20210927" hadoop = "3.4.0" +hdrhistogram = "2.1.12" iceberg = "1.5.2" immutables = "2.9.2" jackson = "2.17.0" +jakarta-servlet = "5.0.0" +jakarta-websocket = "2.0.0" jama = "1.1.1" javaparser = "3.23.0" +javax-annotation = "1.3.1" +javax-inject = "1" javax-validation = "1.0.0.GA" jdom2 = "2.0.6.1" jetbrains = "24.0.0" jetty = "11.0.20" +jpy = "0.17.0" jsinterop = "2.0.2" # google is annoying, and have different versions released for the same groupId jsinterop-base = "1.0.1" logback = "1.4.14" +lz4 = "1.8.0" +mindrot = "0.4" +nidi = "0.18.1" +oshi = "5.8.3" +pac4j = "5.7.0" parquet = "1.14.0" +picocli = "4.6.1" +postgresql = "42.7.1" protobuf = "3.25.3" +randelshofer = "1.0.0" +rdblue = "0.1.1" +selenium = "4.16.1" slf4j = "2.0.11" +snappy = "1.1.10.5" +squareup = "1.13.0" sslcontext = "8.1.1" +tdunning = "3.2" trove = "3.0.3" +undercouch = "2.15.1" univocity = "2.6.0" +vertispan-nio = "1.0-alpha-1" +vertispan-ts-defs = "1.0.0-RC4" # test versions assertj = "3.19.0" +h2database = "2.1.212" jmock = "2.12.0" junit = "5.7.2" junit4 = "4.13.2" testcontainers = "1.19.4" +jmh = "1.35" +spockframework = "2.0-groovy-3.0" [libraries] +airlift-aircompressor = { module = "io.airlift:aircompressor", version.ref = "airlift"} + arrow-compression = { module = "org.apache.arrow:arrow-compression", version.ref = "arrow" } arrow-format = { module = "org.apache.arrow:arrow-format", version.ref = "arrow" } arrow-vector = { module = "org.apache.arrow:arrow-vector", version.ref = "arrow" } @@ -69,6 +112,10 @@ awssdk-sts = { module = "software.amazon.awssdk:sts" } boringssl = { module = "io.netty:netty-tcnative-boringssl-static", version.ref = "boringssl" } +calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "calcite" } + +classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } + commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" } commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" } @@ -79,13 +126,40 @@ commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "co commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" } +confluent-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version.ref = "confluent" } +confluent-protobuf-serializer = { module = "io.confluent:kafka-protobuf-serializer", version.ref = "confluent" } + +confluent-kafka-clients = { module = "org.apache.kafka:kafka-clients", version.ref = "confluent-kafka-clients" } + dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" } dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" } +deephaven-barrage-core = { module = "io.deephaven.barrage:barrage-core", version.ref = "deephaven-barrage" } +deephaven-barrage-format = { module = "io.deephaven.barrage:barrage-format", version.ref = "deephaven-barrage" } + +deephaven-csv = { module = "io.deephaven:deephaven-csv", version.ref = "deephaven-csv" } +deephaven-csv-fast-double-parser = { module = "io.deephaven:deephaven-csv-fast-double-parser", version.ref = "deephaven-csv" } + +deephaven-hash = { module = "io.deephaven:hash", version.ref = "deephaven-hash" } + +deephaven-suan-shu = { module = "io.deephaven:SuanShu", version.ref = "deephaven-suan-shu" } + +dev-dirs-directories = { module = "dev.dirs:directories", version.ref = "dev-dirs" } + +dsi-fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "dsi" } + elemental-core = { module = "com.google.elemental2:elemental2-core", version.ref = "elemental" } +f4b6a3-uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version.ref = "f4b6a3" } + flatbuffers-java = { module = "com.google.flatbuffers:flatbuffers-java", version.ref = "flatbuffers" } +freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" } + +google-findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "google-findbugs" } + +google-java-allocation-instrumenter = { module = "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter", version.ref = "google-java-allocation-instrumenter"} + groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" } groovy-json = { module = "org.codehaus.groovy:groovy-json", version.ref = "groovy" } groovy-templates = { module = "org.codehaus.groovy:groovy-templates", version.ref = "groovy" } @@ -111,13 +185,16 @@ woodstox-core = { module = "com.fasterxml.woodstox:woodstox-core", version = "6. hadoop-shaded-guava = { module = "org.apache.hadoop.thirdparty:hadoop-shaded-guava", version = "1.2.0" } commons-collections = { module = "commons-collections:commons-collections", version = "3.2.2" } +hdrhistogram = { module = "org.hdrhistogram:HdrHistogram", version.ref = "hdrhistogram" } + iceberg-api = { module = "org.apache.iceberg:iceberg-api" } iceberg-aws = { module = "org.apache.iceberg:iceberg-aws" } iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref = "iceberg" } iceberg-bundled-guava = { module = "org.apache.iceberg:iceberg-bundled-guava" } iceberg-core = { module = "org.apache.iceberg:iceberg-core" } -immutables = { module = "org.immutables:value", version.ref = "immutables" } +immutables-value = { module = "org.immutables:value", version.ref = "immutables" } +immutables-value-annotations = { module = "org.immutables:value-annotations", version.ref = "immutables" } elemental-dom = { module = "com.google.elemental2:elemental2-dom", version.ref = "elemental" } elemental-promise = { module = "com.google.elemental2:elemental2-promise", version.ref = "elemental" } @@ -129,10 +206,18 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" } jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" } jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" } +jakarata-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" } + +jakarta-websocket-api = { module = "jakarta.websocket:jakarta.websocket-api", version.ref = "jakarta-websocket" } + jama = { module = "gov.nist.math.jama:gov.nist.math.jama", version.ref = "jama" } javaparser-core = { module = "com.github.javaparser:javaparser-core", version.ref = "javaparser" } +javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation" } + +javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" } + javax-validation-api = { module = "javax.validation:validation-api", version.ref = "javax-validation" } jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" } @@ -148,30 +233,71 @@ jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets" } jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp" } jetty-websocket-jakarta-server = { module = "org.eclipse.jetty.websocket:websocket-jakarta-server" } +jpy = { module = "org.jpyconsortium:jpy", version.ref = "jpy" } + jsinterop-annotations = { module = "com.google.jsinterop:jsinterop-annotations", version.ref = "jsinterop" } jsinterop-base = { module = "com.google.jsinterop:base", version.ref = "jsinterop-base" } logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } +lz4-java = { module = "org.lz4:lz4-java", version.ref = "lz4" } + +mindrot-jbcrypt = { module = "org.mindrot:jbcrypt", version.ref = "mindrot" } + +nidi-graphviz-java = { module = "guru.nidi:graphviz-java", version.ref = "nidi" } + +oshi-core = { module = "com.github.oshi:oshi-core", version.ref = "oshi" } + +pac4j-http = { module = "org.pac4j:pac4j-http", version.ref = "pac4j" } +pac4j-oidc = { module = "org.pac4j:pac4j-oidc", version.ref = "pac4j" } + parquet-hadoop = { module = "org.apache.parquet:parquet-hadoop", version.ref = "parquet" } +picocli = { module = "info.picocli:picocli", version.ref = "picocli" } + +postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" } + protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" } +randelshofer-fastdoubleparser = { module = "ch.randelshofer:fastdoubleparser", version.ref = "randelshofer" } + +rdblue-brotli-codec = { module = "com.github.rdblue:brotli-codec", version.ref = "rdblue" } + +selenium-remote-driver = { module = "org.seleniumhq.selenium:selenium-remote-driver", version.ref = "selenium" } + slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" } slf4j-jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } +snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappy" } + +squareup-javapoet = { module = "com.squareup:javapoet", version.ref = "squareup" } + sslcontext-kickstart = { module = "io.github.hakky54:sslcontext-kickstart", version.ref = "sslcontext" } sslcontext-kickstart-jetty = { module = "io.github.hakky54:sslcontext-kickstart-for-jetty", version.ref = "sslcontext" } sslcontext-kickstart-netty = { module = "io.github.hakky54:sslcontext-kickstart-for-netty", version.ref = "sslcontext" } +tdunning-t-digest = { module = "com.tdunning:t-digest", version.ref = "tdunning" } + trove = { module = "net.sf.trove4j:trove4j", version.ref = "trove" } +undercouch-bson4jackson = { module = "de.undercouch:bson4jackson", version.ref = "undercouch" } + univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocity" } +vertispan-nio-gwt = { module = "com.vertispan.nio:gwt-nio", version.ref = "vertispan-nio" } + +vertispan-ts-defs-annotations = { module = "com.vertispan.tsdefs:jsinterop-ts-defs-annotations", version.ref = "vertispan-ts-defs" } +vertispan-ts-defs-doclet = { module = "com.vertispan.tsdefs:jsinterop-ts-defs-doclet", version.ref = "vertispan-ts-defs" } + # test libraries assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" } +h2database-h2 = { module = "com.h2database:h2", version.ref = "h2database" } + +jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" } +jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" } + jmock-imposters = { module = "org.jmock:jmock-imposters", version.ref = "jmock" } jmock-junit4 = { module = "org.jmock:jmock-junit4", version.ref = "jmock" } @@ -183,6 +309,8 @@ junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" } junit4 = { module = "junit:junit", version.ref = "junit4" } +spockframework-core = { module = "org.spockframework:spock-core", version.ref = "spockframework" } + testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" } testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" } testcontainers-localstack = { module = "org.testcontainers:localstack", version.ref = "testcontainers" } diff --git a/grpc-java/grpc-servlet-jakarta/build.gradle b/grpc-java/grpc-servlet-jakarta/build.gradle index 970233fb67a..cae116e6b18 100644 --- a/grpc-java/grpc-servlet-jakarta/build.gradle +++ b/grpc-java/grpc-servlet-jakarta/build.gradle @@ -6,8 +6,7 @@ plugins { dependencies { implementation platform(libs.grpc.bom) implementation libs.grpc.core - compileOnly 'jakarta.servlet:jakarta.servlet-api:5.0.0', - 'org.apache.tomcat:annotations-api:6.0.53' + compileOnly libs.jakarata.servlet.api implementation libs.guava } diff --git a/grpc-java/grpc-servlet-websocket-jakarta/build.gradle b/grpc-java/grpc-servlet-websocket-jakarta/build.gradle index b4b881e8d05..08fd255e100 100644 --- a/grpc-java/grpc-servlet-websocket-jakarta/build.gradle +++ b/grpc-java/grpc-servlet-websocket-jakarta/build.gradle @@ -7,10 +7,10 @@ dependencies { implementation platform(libs.grpc.bom) implementation libs.grpc.core // compileOnly 'javax.servlet:javax.servlet-api:4.0.1' - implementation 'jakarta.servlet:jakarta.servlet-api:5.0.0' + implementation libs.jakarata.servlet.api // compileOnly 'javax.websocket:javax.websocket-api:1.1' - implementation 'jakarta.websocket:jakarta.websocket-api:2.0.0' + implementation libs.jakarta.websocket.api implementation libs.guava } diff --git a/java-client/barrage/build.gradle b/java-client/barrage/build.gradle index 135471b40c8..429b139fcb2 100644 --- a/java-client/barrage/build.gradle +++ b/java-client/barrage/build.gradle @@ -10,10 +10,10 @@ dependencies { api project(':extensions-barrage') implementation project(':log-factory') - compileOnly 'javax.inject:javax.inject:1' + compileOnly libs.javax.inject compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation libs.slf4j.api testRuntimeOnly libs.slf4j.simple diff --git a/java-client/example-utilities/build.gradle b/java-client/example-utilities/build.gradle index 15abc65c4b3..4ed0a1cab8c 100644 --- a/java-client/example-utilities/build.gradle +++ b/java-client/example-utilities/build.gradle @@ -4,7 +4,7 @@ plugins { } dependencies { - api 'info.picocli:picocli:4.6.1' + api libs.picocli api project(':java-client-session') api platform(libs.grpc.bom) diff --git a/java-client/flight-examples/build.gradle b/java-client/flight-examples/build.gradle index ed9dd880546..1f1436acd80 100644 --- a/java-client/flight-examples/build.gradle +++ b/java-client/flight-examples/build.gradle @@ -7,7 +7,7 @@ dependencies { implementation project(':java-client-flight') implementation project(':java-client-example-utilities') - implementation "io.deephaven.barrage:barrage-format:0.6.0" + implementation libs.deephaven.barrage.format testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/java-client/flight/build.gradle b/java-client/flight/build.gradle index a2f0a14a7d8..e88d8d58b5f 100644 --- a/java-client/flight/build.gradle +++ b/java-client/flight/build.gradle @@ -16,7 +16,7 @@ dependencies { annotationProcessor libs.autoservice.compiler compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/java-client/session/build.gradle b/java-client/session/build.gradle index 000c8b2035d..ef210ce3c64 100644 --- a/java-client/session/build.gradle +++ b/java-client/session/build.gradle @@ -22,11 +22,11 @@ dependencies { implementation libs.sslcontext.kickstart.netty compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value compileOnly libs.autoservice annotationProcessor libs.autoservice.compiler - compileOnly 'javax.inject:javax.inject:1' + compileOnly libs.javax.inject testImplementation platform(libs.junit.bom) testImplementation libs.junit.jupiter diff --git a/java-client/uri/build.gradle b/java-client/uri/build.gradle index cbefb237167..884ec0cae4c 100644 --- a/java-client/uri/build.gradle +++ b/java-client/uri/build.gradle @@ -7,7 +7,7 @@ description = 'The Deephaven URI library' dependencies { compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation platform(libs.junit.bom) testImplementation libs.junit.jupiter diff --git a/open-api/lang-tools/lang-tools.gradle b/open-api/lang-tools/lang-tools.gradle index 07ace25f46d..4b948ea16b7 100644 --- a/open-api/lang-tools/lang-tools.gradle +++ b/open-api/lang-tools/lang-tools.gradle @@ -13,7 +13,7 @@ dependencies { implementation project(':IO') implementation project(':log-factory') - testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0' + testImplementation libs.spockframework.core testImplementation platform(libs.junit.bom) testImplementation libs.junit.jupiter diff --git a/plugin/build.gradle b/plugin/build.gradle index c067fbe73a7..8300d781252 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -7,5 +7,5 @@ description = 'The Deephaven plugin interface' dependencies { compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value } diff --git a/proto/proto-backplane-grpc/build.gradle b/proto/proto-backplane-grpc/build.gradle index 54a277a296d..7d1e68d7653 100644 --- a/proto/proto-backplane-grpc/build.gradle +++ b/proto/proto-backplane-grpc/build.gradle @@ -35,13 +35,13 @@ dependencies { // downstream classpaths compileOnly libs.arrow.flight.core - compileOnly 'javax.inject:javax.inject:1' - compileOnly "javax.annotation:javax.annotation-api:1.3.1" + compileOnly libs.javax.inject + compileOnly libs.javax.annotation.api // technically we should have a runtime dependency on barrage-core, but instead we are regenerating // the same output that it contains, and we have declared the correct dependencies as necessary // compile 'io.deephaven.barrage:barrage-core:0.5.0' - download 'io.deephaven.barrage:barrage-core:0.6.0' + download libs.deephaven.barrage.core download libs.arrow.flight.core testImplementation libs.junit4 diff --git a/py/jpy-ext/build.gradle b/py/jpy-ext/build.gradle index b72f627e6d0..a8f697b0945 100644 --- a/py/jpy-ext/build.gradle +++ b/py/jpy-ext/build.gradle @@ -16,6 +16,6 @@ plugins { } dependencies { - api 'org.jpyconsortium:jpy:0.17.0' + api libs.jpy api project(':deephaven-jpy-config') } diff --git a/qst/build.gradle b/qst/build.gradle index 27709e05351..83b2b504349 100644 --- a/qst/build.gradle +++ b/qst/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation project(':engine-query-constants') compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/qst/graphviz/build.gradle b/qst/graphviz/build.gradle index 2de5dcdaa43..8ff3d3bd868 100644 --- a/qst/graphviz/build.gradle +++ b/qst/graphviz/build.gradle @@ -8,9 +8,9 @@ description = "Converts a list of QSTs into other formats." dependencies { implementation project(':qst') - implementation 'guru.nidi:graphviz-java:0.18.1' + implementation libs.nidi.graphviz.java - implementation 'info.picocli:picocli:4.6.1' + implementation libs.picocli testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/qst/type/build.gradle b/qst/type/build.gradle index d41c479e2d7..6a31a0322c0 100644 --- a/qst/type/build.gradle +++ b/qst/type/build.gradle @@ -7,7 +7,7 @@ description = 'The Deephaven QST Types' dependencies { compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/replication/reflective/build.gradle b/replication/reflective/build.gradle index 2e85df34e49..adf1a41e815 100644 --- a/replication/reflective/build.gradle +++ b/replication/reflective/build.gradle @@ -8,7 +8,7 @@ description 'Reflective Replicators: Source code generators and replicators with dependencies { implementation project(':replication-util') implementation project(':engine-table') - implementation 'com.squareup:javapoet:1.13.0' + implementation libs.squareup.javapoet implementation libs.trove implementation libs.commons.io implementation libs.commons.lang3 diff --git a/replication/util/build.gradle b/replication/util/build.gradle index 1747b07c4e1..8375f4ff869 100644 --- a/replication/util/build.gradle +++ b/replication/util/build.gradle @@ -9,5 +9,5 @@ dependencies { implementation project(':Base'), libs.commons.io - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 } diff --git a/server/build.gradle b/server/build.gradle index 01fb7ea8c0f..cc56e562501 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -24,7 +24,7 @@ dependencies { api(project(':java-client-session-dagger')) { because 'downstream dagger compile, see deephaven-core#1722' } - implementation 'org.hdrhistogram:HdrHistogram:2.1.12' + implementation libs.hdrhistogram implementation project(':proto:proto-backplane-grpc-flight') api(project(':open-api-lang-tools')) { @@ -37,7 +37,7 @@ dependencies { api(project(':application-mode')) { because 'downstream dagger compile, see deephaven-core#1722' } - implementation 'com.github.f4b6a3:uuid-creator:5.2.0' + implementation libs.f4b6a3.uuid.creator api(project(':Configuration')) { because 'jetty/netty implementations will access the configuration in their main()s' @@ -59,7 +59,7 @@ dependencies { testAnnotationProcessor libs.autoservice.compiler compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation project(':Plot') @@ -94,7 +94,7 @@ dependencies { implementation project(':grpc-java:grpc-mtls') - implementation 'dev.dirs:directories:26' + implementation libs.dev.dirs.directories testImplementation project(':server-test-utils') diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle index 2bbd813785d..a02fb606602 100644 --- a/server/jetty/build.gradle +++ b/server/jetty/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation platform(libs.grpc.bom) implementation platform(libs.jetty.bom) - api 'jakarta.servlet:jakarta.servlet-api:5.0.0' + api libs.jakarata.servlet.api implementation libs.jetty.servlet implementation libs.jetty.servlets implementation libs.jetty.webapp @@ -38,7 +38,7 @@ dependencies { implementation libs.jetty.websocket.jakarta.server compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation project(':ssl-kickstart') implementation libs.sslcontext.kickstart.jetty diff --git a/server/netty/build.gradle b/server/netty/build.gradle index 6dd3c3ffb68..c67dec9c86b 100644 --- a/server/netty/build.gradle +++ b/server/netty/build.gradle @@ -21,7 +21,7 @@ dependencies { implementation libs.grpc.netty compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation project(':ssl-kickstart') implementation libs.sslcontext.kickstart.netty diff --git a/server/test-utils/build.gradle b/server/test-utils/build.gradle index 37884eca41c..d9b0e11bb0a 100644 --- a/server/test-utils/build.gradle +++ b/server/test-utils/build.gradle @@ -20,7 +20,7 @@ dependencies { api libs.grpc.testing compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation libs.arrow.flight.core diff --git a/sql/build.gradle b/sql/build.gradle index 84465d1b86e..a041810df00 100644 --- a/sql/build.gradle +++ b/sql/build.gradle @@ -8,7 +8,7 @@ description = 'The Deephaven SQL parser' dependencies { api project(':qst') - implementation 'org.apache.calcite:calcite-core:1.36.0' + implementation libs.calcite.core constraints { // This constraint can be removed once calcite-core has next release and we can // pick up the fixed dependency transitively. @@ -18,7 +18,7 @@ dependencies { } compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/ssl/config/build.gradle b/ssl/config/build.gradle index 812ed9210c2..eec8c4b54c7 100644 --- a/ssl/config/build.gradle +++ b/ssl/config/build.gradle @@ -7,7 +7,7 @@ description = 'The Deephaven SSL Configuration' dependencies { compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value implementation platform(libs.grpc.bom) api platform(libs.jackson.bom) diff --git a/table-api/build.gradle b/table-api/build.gradle index 25948eb6c95..53e8e1a6cff 100644 --- a/table-api/build.gradle +++ b/table-api/build.gradle @@ -10,9 +10,9 @@ dependencies { implementation libs.commons.text compileOnly project(':util-immutables') - annotationProcessor libs.immutables + annotationProcessor libs.immutables.value - compileOnly 'com.google.code.findbugs:jsr305:3.0.2' + compileOnly libs.google.findbugs.jsr305 testImplementation libs.assertj testImplementation platform(libs.junit.bom) diff --git a/web/client-api/client-api.gradle b/web/client-api/client-api.gradle index da2fd222ac7..120940bb946 100644 --- a/web/client-api/client-api.gradle +++ b/web/client-api/client-api.gradle @@ -20,15 +20,15 @@ dependencies { implementation project(':web-shared-beans') implementation project(':web-client-backplane') - implementation 'com.vertispan.tsdefs:jsinterop-ts-defs-annotations:1.0.0-RC4' - typescriptDoclet 'com.vertispan.tsdefs:jsinterop-ts-defs-doclet:1.0.0-RC4' + implementation libs.vertispan.ts.defs.annotations + typescriptDoclet libs.vertispan.ts.defs.doclet - implementation 'com.vertispan.nio:gwt-nio:1.0-alpha-1' + implementation libs.vertispan.nio.gwt js project(path: ':proto:raw-js-openapi', configuration: 'js') testImplementation libs.junit4 - testImplementation 'org.seleniumhq.selenium:selenium-remote-driver:4.16.1' + testImplementation libs.selenium.remote.driver implementation libs.elemental.core implementation libs.elemental.promise