Skip to content

Commit

Permalink
build: Migrate remaining library dependencies to gradle version catal…
Browse files Browse the repository at this point in the history
…og (#5738)

Follow-up to #5683
  • Loading branch information
devinrsmith committed Jul 9, 2024
1 parent 928718b commit e302c5a
Show file tree
Hide file tree
Showing 62 changed files with 239 additions and 112 deletions.
2 changes: 1 addition & 1 deletion Base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BenchmarkSupport/BenchmarkSupport.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions DHProcess/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Expand Down
2 changes: 1 addition & 1 deletion Plot/Plot.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Stats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion Util/immutables/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ plugins {
}

dependencies {
compileOnlyApi 'org.immutables:value-annotations:2.9.2'
compileOnlyApi libs.immutables.value.annotations
}
2 changes: 1 addition & 1 deletion application-mode/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions authentication/example-providers/oidc/build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down
2 changes: 1 addition & 1 deletion authorization-codegen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion base-test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion codegen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ plugins {
description 'Codegen: Code generation utilities'

dependencies {
implementation 'org.freemarker:freemarker:2.3.31'
implementation libs.freemarker
testImplementation libs.junit4
}
4 changes: 2 additions & 2 deletions engine/api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions engine/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions engine/context/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion engine/processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion engine/rowset/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions engine/table/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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')

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion engine/updategraph/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions extensions/barrage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ 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

implementation libs.arrow.vector
implementation libs.arrow.format

compileOnly project(':util-immutables')
annotationProcessor libs.immutables
annotationProcessor libs.immutables.value

testImplementation project(':engine-test-utils')

Expand Down
6 changes: 3 additions & 3 deletions extensions/bson-jackson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions extensions/classgraph/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions extensions/csv/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extensions/iceberg/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
annotationProcessor libs.autoservice.compiler

compileOnly project(':util-immutables')
annotationProcessor libs.immutables
annotationProcessor libs.immutables.value

implementation libs.parquet.hadoop

Expand Down
2 changes: 1 addition & 1 deletion extensions/jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions extensions/json-jackson/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions extensions/json/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions extensions/kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions extensions/parquet/benchmark/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions extensions/parquet/compression/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
Loading

0 comments on commit e302c5a

Please sign in to comment.