Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions adapters/adapters-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ dependencies {
api(project(":server-common"))

api("com.google.guava:guava:${project.rootProject.guavaVersion}")
compileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('com.datastax.cassandra:cassandra-driver-core:3.11.3')
compileOnly('org.jetbrains:annotations:26.0.2-1')
compileOnly('com.datastax.cassandra:cassandra-driver-core:4.0.0')
implementation("org.slf4j:slf4j-api:${project.slf4jVersion}")

testImplementation('com.datastax.cassandra:cassandra-driver-core:3.11.3')
testImplementation('com.datastax.cassandra:cassandra-driver-core:4.0.0')
testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junitVersion}"
testImplementation "org.assertj:assertj-core:3.24.2"
testImplementation "org.assertj:assertj-core:3.27.6"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}"

testImplementation('org.mockito:mockito-core:4.10.0')
testImplementation('org.mockito:mockito-inline:4.10.0')
testImplementation('org.mockito:mockito-core:5.2.0')
testImplementation('org.mockito:mockito-inline:5.2.0')
}

spotbugsTest.enabled = false
4 changes: 2 additions & 2 deletions adapters/adapters-cassandra41/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ dependencies {
api(project(":server-common"))
api(project(":adapters:adapters-base"))

compileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('com.datastax.cassandra:cassandra-driver-core:3.11.3')
compileOnly('org.jetbrains:annotations:26.0.2-1')
compileOnly('com.datastax.cassandra:cassandra-driver-core:4.0.0')
implementation("org.slf4j:slf4j-api:${project.slf4jVersion}")
}

Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ buildscript {
dependencies {
// findBugs needs a newer version of Guava in the buildscript.
// otherwise it throws an exception
classpath "com.google.guava:guava:28.2-jre"
classpath "com.google.guava:guava:33.5.0-jre"
}
}

Expand All @@ -40,19 +40,19 @@ plugins {
id 'signing'

// since we're using a specific version here, we delay applying the plugin till the all projects
id "com.github.spotbugs" version "6.0.20" apply false
id "com.github.spotbugs" version "6.4.5" apply false

// Help resolve dependency conflicts between jib and ospackage
// See: https://github.com/GoogleContainerTools/jib/issues/4235#issuecomment-2088829367
id('com.google.cloud.tools.jib') version '3.4.4' apply false
id('com.google.cloud.tools.jib') version '3.4.5' apply false

// https://github.com/nebula-plugins/gradle-ospackage-plugin/wiki
id "com.netflix.nebula.ospackage" version "11.10.0"
id 'com.netflix.nebula.ospackage-application' version "11.10.0"
id 'org.asciidoctor.jvm.convert' version '3.3.2'
id "com.netflix.nebula.ospackage" version "12.1.1"
id 'com.netflix.nebula.ospackage-application' version "12.1.1"
id 'org.asciidoctor.jvm.convert' version '4.0.5'

// Release Audit Tool (RAT) plugin for checking project licenses
id("org.nosphere.apache.rat") version "0.8.0"
id("org.nosphere.apache.rat") version "0.8.1"

id 'jacoco'
}
Expand Down
6 changes: 3 additions & 3 deletions client-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ test {
dependencies {
compileOnly(group: 'org.slf4j', name: 'slf4j-api', version: "${project.slf4jVersion}")
compileOnly(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${project.jacksonVersion}")
compileOnly(group: 'org.jetbrains', name: 'annotations', version: '23.0.0')
compileOnly(group: 'org.jetbrains', name: 'annotations', version: '26.0.2-1')
compileOnly(group: 'io.netty', name: 'netty-codec-http', version: "${project.nettyVersion}")
compileOnly(group: 'com.google.guava', name: 'guava', version: "${project.guavaVersion}")

testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${project.jacksonVersion}")
testImplementation("com.google.guava:guava:${project.guavaVersion}")
testImplementation('org.mockito:mockito-inline:4.10.0')
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation('org.mockito:mockito-inline:5.2.0')
testImplementation("org.assertj:assertj-core:3.27.6")
testImplementation("org.junit.jupiter:junit-jupiter-api:${project.junitVersion}")
testImplementation("org.junit.jupiter:junit-jupiter-params:${project.junitVersion}")
testImplementation(group: 'io.netty', name: 'netty-codec-http', version: "${project.nettyVersion}")
Expand Down
18 changes: 9 additions & 9 deletions client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,22 @@ dependencies {
implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${project.jacksonVersion}")
implementation("org.slf4j:slf4j-api:${project.slf4jVersion}")

compileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('org.jetbrains:annotations:26.0.2-1')
compileOnly(group: 'io.netty', name: 'netty-codec-http', version: "${project.nettyVersion}")

testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation(platform('org.junit:junit-bom:6.0.1'))
testImplementation('org.junit.jupiter:junit-jupiter')
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation('org.mockito:mockito-core:4.10.0')
testImplementation('com.squareup.okhttp3:mockwebserver:4.10.0')
testImplementation("org.assertj:assertj-core:3.27.6")
testImplementation('org.mockito:mockito-core:5.20.0')
testImplementation('com.squareup.okhttp3:mockwebserver:5.3.0')
testImplementation(group: 'io.netty', name: 'netty-codec-http', version: "${project.nettyVersion}")

testFixturesImplementation(testFixtures(project(":client-common")))
testFixturesImplementation(platform('org.junit:junit-bom:5.9.2'))
testFixturesImplementation(platform('org.junit:junit-bom:6.0.1'))
testFixturesImplementation('org.junit.jupiter:junit-jupiter')
testFixturesImplementation("org.assertj:assertj-core:3.24.2")
testFixturesImplementation('org.mockito:mockito-core:4.10.0')
testFixturesImplementation('com.squareup.okhttp3:mockwebserver:4.10.0')
testFixturesImplementation("org.assertj:assertj-core:3.27.6")
testFixturesImplementation('org.mockito:mockito-core:5.20.0')
testFixturesImplementation('com.squareup.okhttp3:mockwebserver:5.3.0')
testFixturesImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${project.jacksonVersion}")
testFixturesCompileOnly(group: 'io.netty', name: 'netty-codec-http', version: "${project.nettyVersion}")
}
Expand Down
8 changes: 4 additions & 4 deletions integration-framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ dependencies {
api("org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}")

api("org.junit.vintage:junit-vintage-engine:${junitVersion}")
api('org.mockito:mockito-inline:4.10.0')
api('org.mockito:mockito-inline:5.2.0')
api("org.assertj:assertj-core:${assertjCoreVersion}")

api('com.datastax.cassandra:cassandra-driver-core:3.11.5')
api('com.datastax.cassandra:cassandra-driver-core:4.0.0')
implementation("com.google.inject:guice:${guiceVersion}")

implementation("com.google.guava:guava:27.0.1-jre")
implementation("com.google.guava:guava:33.5.0-jre")
api("io.vertx:vertx-web:${project.vertxVersion}") {
exclude group: 'junit', module: 'junit'
}
implementation("io.vertx:vertx-web-client:${project.vertxVersion}")
implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.14.3')
implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.20')

api(testFixtures(project(path: ":test-common")))

Expand Down
4 changes: 2 additions & 2 deletions integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ dependencies {
integrationTestImplementation("com.github.ben-manes.caffeine:caffeine:${project.caffeineVersion}")
integrationTestImplementation("io.vertx:vertx-web-client:${project.vertxVersion}")

integrationTestImplementation(group: 'net.java.dev.jna', name: 'jna', version: '5.9.0')
integrationTestImplementation(group: 'net.java.dev.jna', name: 'jna', version: '5.18.1')
integrationTestImplementation(project(path: ":integration-framework"))
integrationTestImplementation("com.google.inject:guice:${guiceVersion}")
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-annotations:2.14.2'
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-annotations:2.20'

integrationTestCompileOnly(group: 'com.intellij', name: 'annotations', version: '12.0')
}
Expand Down
14 changes: 7 additions & 7 deletions server-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ test {
dependencies {
api(project(":client-common"))

compileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('com.datastax.cassandra:cassandra-driver-core:3.11.3')
compileOnly('org.jetbrains:annotations:26.0.2-1')
compileOnly('com.datastax.cassandra:cassandra-driver-core:4.0.0')
implementation("org.slf4j:slf4j-api:${project.slf4jVersion}")

testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junitVersion}"
testImplementation "org.assertj:assertj-core:3.24.2"
testImplementation "org.mockito:mockito-core:4.10.0"
testImplementation "org.mockito:mockito-inline:4.10.0"
testImplementation "com.datastax.cassandra:cassandra-driver-core:3.11.3"
testImplementation "org.assertj:assertj-core:3.27.6"
testImplementation "org.mockito:mockito-core:5.2.0"
testImplementation "org.mockito:mockito-inline:5.2.0"
testImplementation "com.datastax.cassandra:cassandra-driver-core:4.0.0"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}"

testFixturesImplementation("org.assertj:assertj-core:3.24.2")
testFixturesImplementation("org.assertj:assertj-core:3.27.6")
}

compileTestJava {
Expand Down
32 changes: 16 additions & 16 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ plugins {
// and is published
id('maven-publish')
// and produces a docker image
id('com.google.cloud.tools.jib') version '3.4.4'
id('com.google.cloud.tools.jib') version '3.4.5'
// and generates an openAPI specification
id('io.smallrye.openapi') version "${smallryeOpenApiVersion}"
}
Expand Down Expand Up @@ -81,9 +81,9 @@ configurations {
}

dependencies {
compileOnly('org.jetbrains:annotations:23.0.0')
testCompileOnly('org.jetbrains:annotations:23.0.0')
integrationTestCompileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('org.jetbrains:annotations:26.0.2-1')
testCompileOnly('org.jetbrains:annotations:26.0.2-1')
integrationTestCompileOnly('org.jetbrains:annotations:26.0.2-1')

implementation("io.vertx:vertx-web:${project.vertxVersion}") {
exclude group: 'junit', module: 'junit'
Expand All @@ -93,7 +93,7 @@ dependencies {
implementation("io.vertx:vertx-auth-jwt:$vertxVersion")
implementation("io.vertx:vertx-auth-oauth2:$vertxVersion")

implementation('com.datastax.cassandra:cassandra-driver-core:3.11.3')
implementation('com.datastax.cassandra:cassandra-driver-core:4.0.0')
implementation("com.google.inject:guice:${guiceVersion}")
implementation("com.github.ben-manes.caffeine:caffeine:${caffeineVersion}")

Expand All @@ -102,7 +102,7 @@ dependencies {
implementation("ch.qos.logback:logback-classic:${project.logbackVersion}")


implementation(group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0')
implementation(group: 'org.apache.commons', name: 'commons-lang3', version: '3.19.0')
implementation(group: 'commons-codec', name: 'commons-codec', version: "${project.commonsCodecVersion}")

// Jackson for yaml-based configuration parsing
Expand Down Expand Up @@ -137,7 +137,7 @@ dependencies {
implementation(group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "${project.boringSslVersion}", classifier: 'osx-x86_64')

// DataHub client is used to convert and report Cassandra schema on a periodic basis
implementation(group: 'io.acryl', name: 'datahub-client', version: '0.15.0-3')
implementation(group: 'io.acryl', name: 'datahub-client', version: '15.0.4')

// OpenAPI support
implementation("org.eclipse.microprofile.openapi:microprofile-openapi-api:${project.microprofileOpenApiVersion}")
Expand All @@ -149,19 +149,19 @@ dependencies {

testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${project.junitVersion}"
testImplementation "org.assertj:assertj-core:3.24.2"
testImplementation "org.assertj:assertj-core:3.27.6"
testImplementation "org.quicktheories:quicktheories:0.26"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junitVersion}"

testImplementation('com.google.guava:guava-testlib:32.0.0-jre') {
testImplementation('com.google.guava:guava-testlib:33.5.0-jre') {
exclude group: 'junit', module: 'junit'
}

testImplementation('com.datastax.cassandra:cassandra-driver-core:3.11.3:tests')
testImplementation('org.mockito:mockito-core:4.10.0')
testImplementation('org.mockito:mockito-inline:4.10.0')
testImplementation('com.datastax.cassandra:cassandra-driver-core:4.0.0:tests')
testImplementation('org.mockito:mockito-core:5.2.0')
testImplementation('org.mockito:mockito-inline:5.2.0')
testImplementation("io.vertx:vertx-junit5:${project.vertxVersion}")
testImplementation("com.auth0:java-jwt:4.4.0")
testImplementation("com.auth0:java-jwt:4.5.0")
testImplementation(testFixtures(project(":client-common")))
testImplementation(testFixtures(project(":server-common")))
testImplementation(testFixtures(project(":test-common")))
Expand All @@ -176,10 +176,10 @@ dependencies {
testFixturesApi(testFixtures(project(":vertx-auth-mtls")))
testFixturesImplementation("io.vertx:vertx-junit5:${project.vertxVersion}")
testFixturesImplementation("com.google.inject:guice:${guiceVersion}")
testFixturesImplementation('org.mockito:mockito-core:4.10.0')
testFixturesImplementation('org.mockito:mockito-core:5.2.0')
testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:${project.junitVersion}")
testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:${project.junitVersion}")
testFixturesImplementation("org.assertj:assertj-core:3.24.2")
testFixturesImplementation("org.assertj:assertj-core:3.27.6")
testFixturesImplementation("io.vertx:vertx-web:${project.vertxVersion}") {
exclude group: 'junit', module: 'junit'
}
Expand All @@ -190,7 +190,7 @@ dependencies {
// Needed for snapshot manifest validation
integrationTestImplementation(group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "${project.jacksonVersion}")

containerTestImplementation('com.adobe.testing:s3mock-testcontainers:2.17.0') // 3.x version do not support java 11
containerTestImplementation('com.adobe.testing:s3mock-testcontainers:4.10.0') // 3.x version do not support java 11
}

test {
Expand Down
10 changes: 5 additions & 5 deletions test-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ dependencies {
testFixturesCompileOnly(group: 'io.vertx', name: 'vertx-core', version: "${project.vertxVersion}")
testFixturesCompileOnly(group: 'com.google.guava', name: 'guava', version: "${project.guavaVersion}")

testFixturesCompileOnly('com.datastax.cassandra:cassandra-driver-core:3.11.3')
testFixturesCompileOnly('com.datastax.cassandra:cassandra-driver-core:4.0.0')
testFixturesCompileOnly(group: 'com.intellij', name: 'annotations', version: '12.0')
testFixturesApi("org.assertj:assertj-core:${assertjCoreVersion}")

// The dtest jar must be a compile only dependency. We want to avoid having this jar in the
// classpath while running integration tests. Instead, a dedicated classloader will load the
// dtest jar while provisioning the in-jvm dtest Cassandra cluster
testFixturesCompileOnly(files("${dtestJarFullPath}"))
testFixturesApi("org.apache.cassandra:dtest-api:0.0.16")
testFixturesApi("org.apache.cassandra:dtest-api:0.0.18")
// required by in-jvm-dtest class loader, specifically for dtest-4.0.*
testFixturesImplementation('org.javassist:javassist:3.28.0-GA')
testFixturesImplementation('org.javassist:javassist:3.30.2-GA')

// Bouncycastle dependencies for test certificate provisioning
testFixturesImplementation(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78')
testFixturesImplementation(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: '1.78')
testFixturesImplementation(group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.82')
testFixturesImplementation(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: '1.82')
}
6 changes: 3 additions & 3 deletions vertx-auth-mtls/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ dependencies {
implementation(group: 'io.vertx', name: 'vertx-auth-common', version: "$vertxVersion")
implementation(group: 'io.vertx', name: 'vertx-junit5', version: "$vertxVersion")
implementation(group: 'io.vertx', name: 'vertx-codegen', version: "$vertxVersion")
testImplementation(group: 'org.assertj', name: 'assertj-core', version: '3.26.3')
testImplementation(group: 'org.mockito', name: 'mockito-core', version: '4.11.0')
testFixturesApi(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: '1.78.1')
testImplementation(group: 'org.assertj', name: 'assertj-core', version: '3.27.6')
testImplementation(group: 'org.mockito', name: 'mockito-core', version: '5.20.0')
testFixturesApi(group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: '1.82')
testImplementation(testFixtures(project(path: ":test-common")))
}

Expand Down
4 changes: 2 additions & 2 deletions vertx-client-shaded/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import java.nio.file.Paths
plugins {
id('java-library')
id('maven-publish')
id('com.gradleup.shadow') version '8.3.0'
id('com.gradleup.shadow') version '9.2.2'
}

version project.version
Expand All @@ -47,7 +47,7 @@ dependencies {
shadow(group: 'org.slf4j', name: 'slf4j-api', version: "${project.slf4jVersion}")
api(project(':vertx-client'))

testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
testImplementation 'org.junit.jupiter:junit-jupiter:6.0.1'
testImplementation(project(path: ':vertx-client-shaded', configuration: 'shadow'))
}

Expand Down
14 changes: 7 additions & 7 deletions vertx-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,21 @@ dependencies {
implementation(group: 'io.netty', name: 'netty-tcnative-boringssl-static', version: "${project.boringSslVersion}", classifier: 'osx-x86_64')
implementation("org.slf4j:slf4j-api:${project.slf4jVersion}")

compileOnly('org.jetbrains:annotations:23.0.0')
compileOnly('org.jetbrains:annotations:26.0.2-1')

testImplementation(testFixtures(project(':client')))

testImplementation("io.vertx:vertx-junit5:${project.vertxVersion}")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("org.assertj:assertj-core:3.27.6")
testImplementation("org.junit.jupiter:junit-jupiter-api:${project.junitVersion}")
testImplementation("org.junit.jupiter:junit-jupiter-params:${project.junitVersion}")
testImplementation("com.squareup.okhttp3:mockwebserver:4.10.0")
testImplementation('org.mockito:mockito-core:4.10.0')
testImplementation("com.squareup.okhttp3:mockwebserver:5.3.0")
testImplementation('org.mockito:mockito-core:5.20.0')

// logging dependencies for tests
testImplementation("org.apache.logging.log4j:log4j-api:2.20.0")
testImplementation("org.apache.logging.log4j:log4j-core:2.20.0")
testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.20.0")
testImplementation("org.apache.logging.log4j:log4j-api:2.25.2")
testImplementation("org.apache.logging.log4j:log4j-core:2.25.2")
testImplementation("org.apache.logging.log4j:log4j-slf4j-impl:2.25.2")
}

spotbugsTest.enabled = false
Expand Down
Loading