diff --git a/clients/client-testextension/build.gradle.kts b/clients/client-testextension/build.gradle.kts index c83b076ca5e..6442535e4b2 100644 --- a/clients/client-testextension/build.gradle.kts +++ b/clients/client-testextension/build.gradle.kts @@ -31,5 +31,8 @@ dependencies { implementation(project(":nessie-client")) implementation(project(":nessie-multi-env-test-engine")) compileOnly(libs.junit.jupiter.engine) - implementation(libs.findbugs.jsr305) + + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) } diff --git a/clients/client/build.gradle.kts b/clients/client/build.gradle.kts index cbb7125c503..c2e01498da1 100644 --- a/clients/client/build.gradle.kts +++ b/clients/client/build.gradle.kts @@ -32,10 +32,16 @@ dependencies { implementation(libs.jackson.databind) implementation(libs.jackson.annotations) implementation(libs.microprofile.openapi) + + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs) + implementation(libs.slf4j.api) - implementation(libs.javax.ws.rs) - implementation(libs.findbugs.jsr305) compileOnly(libs.errorprone.annotations) compileOnly(libs.immutables.builder) @@ -58,6 +64,9 @@ dependencies { compileOnly(platform(libs.awssdk.bom)) compileOnly(libs.awssdk.auth) + // javax/jakarta + testCompileOnly(libs.jakarta.annotation.api) + testImplementation(platform(libs.opentelemetry.bom)) testImplementation(libs.opentelemetry.api) testImplementation(libs.opentelemetry.sdk) diff --git a/clients/spark-extensions-basetests/build.gradle.kts b/clients/spark-extensions-basetests/build.gradle.kts index bd2ea61a189..f4829272a22 100644 --- a/clients/spark-extensions-basetests/build.gradle.kts +++ b/clients/spark-extensions-basetests/build.gradle.kts @@ -27,6 +27,10 @@ dependencies { // picks the right dependencies for scala compilation forScala(sparkScala.scalaVersion) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + implementation(nessieProject("nessie-spark-extensions-grammar")) compileOnly("org.apache.spark:spark-hive_${sparkScala.scalaMajorVersion}") { forSpark(sparkScala.sparkVersion) diff --git a/compatibility/common/build.gradle.kts b/compatibility/common/build.gradle.kts index 73cf817b31f..6d6d417c64a 100644 --- a/compatibility/common/build.gradle.kts +++ b/compatibility/common/build.gradle.kts @@ -30,6 +30,7 @@ dependencies { api(project(":nessie-multi-env-test-engine")) implementation(project(":nessie-services")) implementation(project(":nessie-versioned-persist-adapter")) + compileOnly(project(":nessie-versioned-persist-mongodb-test")) implementation(platform(libs.jersey.bom)) api(libs.slf4j.api) @@ -39,8 +40,12 @@ dependencies { implementation(libs.maven.resolver.transport.file) implementation(libs.maven.resolver.transport.http) implementation(libs.guava) - implementation(libs.jakarta.enterprise.cdi.api) - implementation(libs.microprofile.openapi) + + // javax/jakarta + compileOnly(libs.jakarta.enterprise.cdi.api) + compileOnly(libs.javax.enterprise.cdi.api) + + compileOnly(libs.microprofile.openapi) implementation(platform(libs.jackson.bom)) implementation(libs.jackson.annotations) @@ -56,7 +61,8 @@ dependencies { implementation(project(":nessie-versioned-persist-in-memory-test")) implementation(project(":nessie-versioned-persist-rocks")) implementation(project(":nessie-versioned-persist-rocks-test")) - compileOnly(project(":nessie-versioned-persist-mongodb-test")) + + testCompileOnly(libs.microprofile.openapi) testImplementation(libs.junit.platform.testkit) testImplementation(libs.junit.jupiter.params) diff --git a/compatibility/jersey/build.gradle.kts b/compatibility/jersey/build.gradle.kts index 1758508283e..47db79be3c6 100644 --- a/compatibility/jersey/build.gradle.kts +++ b/compatibility/jersey/build.gradle.kts @@ -33,11 +33,17 @@ dependencies { implementation(project(":nessie-versioned-persist-store")) implementation(project(":nessie-versioned-persist-testextension")) implementation(project(":nessie-versioned-spi")) - implementation(libs.javax.ws.rs21) - implementation(libs.jakarta.enterprise.cdi.api) - implementation(libs.jakarta.annotation.api) - implementation(libs.jakarta.validation.api) - implementation(libs.javax.ws.rs) + + // javax/jakarta + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs) + compileOnly(libs.javax.ws.rs21) + compileOnly(libs.jakarta.enterprise.cdi.api) + compileOnly(libs.javax.enterprise.cdi.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) implementation(platform(libs.jackson.bom)) implementation(libs.jackson.databind) diff --git a/gc/gc-base-tests/build.gradle.kts b/gc/gc-base-tests/build.gradle.kts index de54418c326..88d983477ff 100644 --- a/gc/gc-base-tests/build.gradle.kts +++ b/gc/gc-base-tests/build.gradle.kts @@ -28,7 +28,11 @@ dependencies { implementation(nessieProject("nessie-gc-base")) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) compileOnly(platform(libs.jackson.bom)) diff --git a/gc/gc-base/build.gradle.kts b/gc/gc-base/build.gradle.kts index 6f5ee2df612..da8aca083e1 100644 --- a/gc/gc-base/build.gradle.kts +++ b/gc/gc-base/build.gradle.kts @@ -38,7 +38,11 @@ dependencies { implementation(libs.agrona) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) compileOnly(platform(libs.jackson.bom)) @@ -53,7 +57,11 @@ dependencies { testRuntimeOnly(libs.logback.classic) testCompileOnly(libs.microprofile.openapi) + + // javax/jakarta testCompileOnly(libs.jakarta.validation.api) + testCompileOnly(libs.javax.validation.api) + testCompileOnly(libs.immutables.value.annotations) testAnnotationProcessor(libs.immutables.value.processor) diff --git a/gc/gc-iceberg-inttest/build.gradle.kts b/gc/gc-iceberg-inttest/build.gradle.kts index 7179d1c60b5..fdf8dec1a70 100644 --- a/gc/gc-iceberg-inttest/build.gradle.kts +++ b/gc/gc-iceberg-inttest/build.gradle.kts @@ -92,6 +92,11 @@ dependencies { testAnnotationProcessor(libs.immutables.value.processor) testRuntimeOnly(libs.logback.classic) + + // javax/jakarta + testCompileOnly(libs.jakarta.validation.api) + testCompileOnly(libs.jakarta.annotation.api) + testCompileOnly(libs.microprofile.openapi) testImplementation(platform(libs.junit.bom)) diff --git a/gc/gc-iceberg-mock/build.gradle.kts b/gc/gc-iceberg-mock/build.gradle.kts index 11e6b237456..4bc9fc2fb2f 100644 --- a/gc/gc-iceberg-mock/build.gradle.kts +++ b/gc/gc-iceberg-mock/build.gradle.kts @@ -39,8 +39,12 @@ dependencies { implementation(libs.slf4j.api) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) compileOnly(libs.jackson.annotations) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) testRuntimeOnly(libs.logback.classic) diff --git a/gc/gc-iceberg/build.gradle.kts b/gc/gc-iceberg/build.gradle.kts index e5327785042..0c82092cbb5 100644 --- a/gc/gc-iceberg/build.gradle.kts +++ b/gc/gc-iceberg/build.gradle.kts @@ -40,7 +40,11 @@ dependencies { compileOnly(platform(libs.jackson.bom)) compileOnly(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) testImplementation(nessieProject("nessie-gc-iceberg-mock")) diff --git a/gc/gc-repository-jdbc/build.gradle.kts b/gc/gc-repository-jdbc/build.gradle.kts index ded03e0368a..2d270491148 100644 --- a/gc/gc-repository-jdbc/build.gradle.kts +++ b/gc/gc-repository-jdbc/build.gradle.kts @@ -42,7 +42,11 @@ dependencies { implementation(libs.slf4j.api) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) compileOnly(platform(libs.jackson.bom)) diff --git a/gc/gc-tool/build.gradle.kts b/gc/gc-tool/build.gradle.kts index 8f0bddc5d59..b2d112dfd7c 100644 --- a/gc/gc-tool/build.gradle.kts +++ b/gc/gc-tool/build.gradle.kts @@ -69,8 +69,12 @@ dependencies { runtimeOnly(libs.logback.classic) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) compileOnly(libs.jackson.annotations) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) runtimeOnly(libs.h2) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1aeecf781d5..cf380f970d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -141,11 +141,16 @@ jackson-jaxrs-xml-provider = { module = "com.fasterxml.jackson.jaxrs:jackson-jax jacoco-ant = { module = "org.jacoco:org.jacoco.ant", version.ref = "jacoco" } jacoco-report = { module = "org.jacoco:org.jacoco.report", version.ref = "jacoco" } jacoco-maven-plugin = { module = "org.jacoco:jacoco-maven-plugin", version.ref = "jacoco" } -jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version = "1.3.5" } -jakarta-enterprise-cdi-api = { module = "jakarta.enterprise:jakarta.enterprise.cdi-api", version = "2.0.2" } -jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version = "2.0.2" } +jakarta-annotation-api = { module = "jakarta.annotation:jakarta.annotation-api", version = "2.1.1" } +jakarta-enterprise-cdi-api = { module = "jakarta.enterprise:jakarta.enterprise.cdi-api", version = "4.0.1" } +jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" } +jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.0" } +jakarta-validation-api = { module = "jakarta.validation:jakarta.validation-api", version = "3.0.2" } +jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version = "3.1.0" } jandex = { module = "org.jboss:jandex", version.ref = "jandex" } +javax-enterprise-cdi-api = { module = "javax.enterprise:cdi-api", version = "2.0.SP1" } javax-servlet = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" } +javax-validation-api = { module = "javax.validation:validation-api", version = "2.0.1.Final"} javax-ws-rs = { module = "javax.ws.rs:javax.ws.rs-api", version = "2.1.1" } javax-ws-rs21 = { module = "org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec", version = "2.0.2.Final" } jersey-bom = { module = "org.glassfish.jersey:jersey-bom", version = "2.38" } diff --git a/model/build.gradle.kts b/model/build.gradle.kts index 3d9dc63cd6a..9e58cab024a 100644 --- a/model/build.gradle.kts +++ b/model/build.gradle.kts @@ -37,10 +37,15 @@ dependencies { implementation(libs.jackson.databind) implementation(libs.jackson.annotations) - implementation(libs.javax.ws.rs) - compileOnly(libs.microprofile.openapi) + // javax/jakarta + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs) compileOnly(libs.jakarta.validation.api) - implementation(libs.findbugs.jsr305) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + + compileOnly(libs.microprofile.openapi) compileOnly(libs.immutables.builder) compileOnly(libs.immutables.value.annotations) diff --git a/model/src/test/java/org/projectnessie/error/TestNessieError.java b/model/src/test/java/org/projectnessie/error/TestNessieError.java index 3f5d50dfdda..027984b6374 100644 --- a/model/src/test/java/org/projectnessie/error/TestNessieError.java +++ b/model/src/test/java/org/projectnessie/error/TestNessieError.java @@ -20,7 +20,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.regex.Pattern; -import javax.ws.rs.core.Response; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; @@ -29,6 +28,8 @@ class TestNessieError { private static final ObjectMapper mapper = new ObjectMapper(); + public static final int HTTP_500_CODE = 500; + public static final String HTTP_500_MESSAGE = "Internal Server Error"; @Test void fullMessage() { @@ -36,15 +37,15 @@ void fullMessage() { ImmutableNessieError.builder() .message("message") .errorCode(ErrorCode.UNKNOWN) - .status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()) - .reason(Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase()) + .status(HTTP_500_CODE) + .reason(HTTP_500_MESSAGE) .serverStackTrace("foo.bar.InternalServerError\n" + "\tat some.other.Class") .build(); assertThat(e.getFullMessage()) .matches( - Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase() + HTTP_500_MESSAGE + " [(]HTTP/" - + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() + + HTTP_500_CODE + "[)]: message\\R" + "foo.bar.InternalServerError\\R" + "\tat some.other.Class"); @@ -59,9 +60,9 @@ void fullMessage() { // Using a regex here, because the stack trace looks different with // junit-platform-maven-plugin Pattern.compile( - Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase() + HTTP_500_MESSAGE + " [(]HTTP/" - + Response.Status.INTERNAL_SERVER_ERROR.getStatusCode() + + HTTP_500_CODE + "[)]: message\\R" + "foo.bar.InternalServerError\\R" + "\tat some.other.Class\\R" @@ -77,8 +78,8 @@ void jsonRoundTrip() throws JsonProcessingException { ImmutableNessieError.builder() .message("message") .errorCode(ErrorCode.UNKNOWN) - .status(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()) - .reason(Response.Status.INTERNAL_SERVER_ERROR.getReasonPhrase()) + .status(HTTP_500_CODE) + .reason(HTTP_500_MESSAGE) .serverStackTrace("foo.bar.InternalServerError\n" + "\tat some.other.Class") .clientProcessingException(new Exception("processingException")) .build(); diff --git a/servers/jax-rs-tests/build.gradle.kts b/servers/jax-rs-tests/build.gradle.kts index 74a7138120d..aee866437da 100644 --- a/servers/jax-rs-tests/build.gradle.kts +++ b/servers/jax-rs-tests/build.gradle.kts @@ -30,16 +30,20 @@ dependencies { implementation(project(":nessie-client-testextension")) implementation(libs.guava) api(libs.rest.assured) - implementation(libs.findbugs.jsr305) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + + compileOnly(libs.microprofile.openapi) api(libs.assertj.core) api(platform(libs.junit.bom)) api(libs.junit.jupiter.api) api(libs.junit.jupiter.params) - compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) - implementation(platform(libs.jackson.bom)) implementation(libs.jackson.databind) compileOnly(libs.jackson.annotations) diff --git a/servers/jax-rs/build.gradle.kts b/servers/jax-rs/build.gradle.kts index 19a9c2d65a2..b1c3d801970 100644 --- a/servers/jax-rs/build.gradle.kts +++ b/servers/jax-rs/build.gradle.kts @@ -38,16 +38,22 @@ dependencies { api(project(":nessie-versioned-persist-adapter")) api(project(":nessie-versioned-persist-serialize")) implementation(libs.slf4j.api) - implementation(libs.javax.ws.rs21) - api(libs.jakarta.enterprise.cdi.api) - api(libs.jakarta.annotation.api) - api(libs.jakarta.validation.api) - api(libs.hibernate.validator.cdi) + + // javax/jakarta + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs21) + compileOnly(libs.jakarta.enterprise.cdi.api) + compileOnly(libs.javax.enterprise.cdi.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + + compileOnly(libs.microprofile.openapi) + + compileOnly(libs.hibernate.validator.cdi) api(platform(libs.jackson.bom)) api(libs.jackson.databind) compileOnly(libs.jackson.annotations) - - compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) } diff --git a/servers/quarkus-cli/build.gradle.kts b/servers/quarkus-cli/build.gradle.kts index 8cfe98abb38..30dafb8b8e1 100644 --- a/servers/quarkus-cli/build.gradle.kts +++ b/servers/quarkus-cli/build.gradle.kts @@ -51,7 +51,10 @@ dependencies { implementation(libs.protobuf.java) - implementation(libs.findbugs.jsr305) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.errorprone.annotations) compileOnly(libs.microprofile.openapi) diff --git a/servers/quarkus-common/build.gradle.kts b/servers/quarkus-common/build.gradle.kts index ab7e81418fc..e3e0c576a3d 100644 --- a/servers/quarkus-common/build.gradle.kts +++ b/servers/quarkus-common/build.gradle.kts @@ -48,7 +48,10 @@ dependencies { implementation("io.quarkus:quarkus-mongodb-client") implementation("org.jboss.slf4j:slf4j-jboss-logmanager") - implementation(libs.jakarta.validation.api) + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + implementation(libs.protobuf.java) compileOnly(libs.graalvm.nativeimage.svm) diff --git a/servers/rest-services/build.gradle.kts b/servers/rest-services/build.gradle.kts index 7d188a1bcb4..36aa74446e2 100644 --- a/servers/rest-services/build.gradle.kts +++ b/servers/rest-services/build.gradle.kts @@ -29,19 +29,32 @@ dependencies { implementation(project(":nessie-services")) implementation(project(":nessie-versioned-spi")) implementation(libs.slf4j.api) - implementation(libs.jakarta.enterprise.cdi.api) - implementation(libs.jakarta.annotation.api) - implementation(libs.jakarta.validation.api) - implementation(libs.javax.ws.rs21) - implementation(libs.javax.servlet) implementation(libs.guava) - compileOnly(libs.microprofile.openapi) + + // javax/jakarta + compileOnly(libs.jakarta.enterprise.cdi.api) + compileOnly(libs.javax.enterprise.cdi.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs21) + compileOnly(libs.jakarta.servlet.api) + compileOnly(libs.javax.servlet) + + compileOnly(libs.microprofile.openapi) implementation(platform(libs.jackson.bom)) implementation(libs.jackson.databind) compileOnly(libs.jackson.annotations) + // javax/jakarta + testImplementation(libs.jakarta.validation.api) + testImplementation(libs.javax.validation.api) + testImplementation(libs.jakarta.ws.rs.api) + testImplementation(libs.javax.ws.rs21) + testCompileOnly(libs.microprofile.openapi) testImplementation(platform(libs.junit.bom)) diff --git a/servers/services/build.gradle.kts b/servers/services/build.gradle.kts index 1398c31b297..1bbceca2fad 100644 --- a/servers/services/build.gradle.kts +++ b/servers/services/build.gradle.kts @@ -37,13 +37,17 @@ dependencies { compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) implementation(libs.guava) - implementation(libs.findbugs.jsr305) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) compileOnly(platform(libs.jackson.bom)) compileOnly(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) testRuntimeOnly(project(":nessie-server-store")) @@ -71,6 +75,9 @@ dependencies { testRuntimeOnly(libs.testcontainers.postgresql) testRuntimeOnly(libs.testcontainers.cockroachdb) + // javax/jakarta + testCompileOnly(libs.jakarta.annotation.api) + testCompileOnly(libs.microprofile.openapi) testCompileOnly(platform(libs.jackson.bom)) diff --git a/servers/store/build.gradle.kts b/servers/store/build.gradle.kts index 9aa5ae01f80..4b09cc2fd9d 100644 --- a/servers/store/build.gradle.kts +++ b/servers/store/build.gradle.kts @@ -35,7 +35,10 @@ dependencies { compileOnly(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) testImplementation(libs.guava) testCompileOnly(libs.microprofile.openapi) diff --git a/testing/s3mock/build.gradle.kts b/testing/s3mock/build.gradle.kts index bbeff2d6183..16f76a9635f 100644 --- a/testing/s3mock/build.gradle.kts +++ b/testing/s3mock/build.gradle.kts @@ -26,8 +26,18 @@ extra["maven.name"] = "Nessie - GC - S3 mock" description = "Rudimentary S3 endpoint delegating to functions to serve content." dependencies { - implementation(libs.javax.ws.rs21) - implementation(libs.javax.ws.rs) + + // javax/jakarta + compileOnly(libs.jakarta.ws.rs.api) + compileOnly(libs.javax.ws.rs21) + compileOnly(libs.javax.ws.rs) + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.jakarta.inject.api) + + compileOnly(libs.microprofile.openapi) implementation(platform(libs.jersey.bom)) implementation("org.glassfish.jersey.core:jersey-server") @@ -53,10 +63,6 @@ dependencies { implementation(libs.slf4j.api) - compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) - compileOnly(libs.findbugs.jsr305) - testRuntimeOnly(libs.logback.classic) testImplementation(platform(libs.awssdk.bom)) diff --git a/tools/content-generator/build.gradle.kts b/tools/content-generator/build.gradle.kts index 4a77d2e5ba2..dde7dc14ccb 100644 --- a/tools/content-generator/build.gradle.kts +++ b/tools/content-generator/build.gradle.kts @@ -30,12 +30,17 @@ applyShadowJar() dependencies { implementation(project(":nessie-client")) - implementation(libs.jakarta.validation.api) implementation(libs.picocli) // TODO help picocli to make their annotation-processor incremental annotationProcessor(libs.picocli.codegen) implementation(libs.guava) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) compileOnly(libs.findbugs.jsr305) + compileOnly(libs.microprofile.openapi) runtimeOnly(libs.slf4j.api) diff --git a/versioned/persist/adapter/build.gradle.kts b/versioned/persist/adapter/build.gradle.kts index d7b02955444..bd82563e8d6 100644 --- a/versioned/persist/adapter/build.gradle.kts +++ b/versioned/persist/adapter/build.gradle.kts @@ -34,8 +34,11 @@ dependencies { compileOnly(libs.immutables.value.fixture) annotationProcessor(libs.immutables.value.processor) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + implementation(libs.protobuf.java) - implementation(libs.findbugs.jsr305) implementation(libs.guava) implementation(libs.slf4j.api) implementation(libs.agrona) diff --git a/versioned/persist/dynamodb/build.gradle.kts b/versioned/persist/dynamodb/build.gradle.kts index 0aca0374d4a..385653c23ed 100644 --- a/versioned/persist/dynamodb/build.gradle.kts +++ b/versioned/persist/dynamodb/build.gradle.kts @@ -33,9 +33,12 @@ dependencies { implementation(project(":nessie-versioned-spi")) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) - implementation(libs.findbugs.jsr305) implementation(libs.guava) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + implementation(platform(libs.awssdk.bom)) implementation(libs.awssdk.dynamodb) { exclude("software.amazon.awssdk", "apache-client") } implementation(libs.awssdk.netty.nio.client) diff --git a/versioned/persist/inmem/build.gradle.kts b/versioned/persist/inmem/build.gradle.kts index 77906c7f368..6bba4b202a5 100644 --- a/versioned/persist/inmem/build.gradle.kts +++ b/versioned/persist/inmem/build.gradle.kts @@ -32,7 +32,10 @@ dependencies { implementation(libs.guava) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) - implementation(libs.findbugs.jsr305) + + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) diff --git a/versioned/persist/mongodb/build.gradle.kts b/versioned/persist/mongodb/build.gradle.kts index 18a6b15a015..7753a23ecf6 100644 --- a/versioned/persist/mongodb/build.gradle.kts +++ b/versioned/persist/mongodb/build.gradle.kts @@ -34,9 +34,12 @@ dependencies { implementation(libs.guava) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) - implementation(libs.findbugs.jsr305) implementation(libs.mongodb.driver.sync) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) testImplementation(project(":nessie-versioned-persist-tests")) diff --git a/versioned/persist/rocks/build.gradle.kts b/versioned/persist/rocks/build.gradle.kts index 89a9ac1ed7f..1b10969e743 100644 --- a/versioned/persist/rocks/build.gradle.kts +++ b/versioned/persist/rocks/build.gradle.kts @@ -32,9 +32,12 @@ dependencies { implementation(libs.guava) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) - implementation(libs.findbugs.jsr305) implementation(libs.rocksdb.jni) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + testImplementation(project(":nessie-versioned-tests")) testImplementation(project(":nessie-versioned-persist-testextension")) testImplementation(project(":nessie-versioned-persist-tests")) diff --git a/versioned/persist/store/build.gradle.kts b/versioned/persist/store/build.gradle.kts index 9fb08159ddb..fdd3338e6f9 100644 --- a/versioned/persist/store/build.gradle.kts +++ b/versioned/persist/store/build.gradle.kts @@ -29,12 +29,16 @@ dependencies { implementation(project(":nessie-versioned-persist-adapter")) implementation(project(":nessie-versioned-spi")) implementation(libs.protobuf.java) - implementation(libs.findbugs.jsr305) implementation(libs.guava) + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(platform(libs.jackson.bom)) compileOnly(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) } diff --git a/versioned/persist/tx-test/build.gradle.kts b/versioned/persist/tx-test/build.gradle.kts index d991438393a..d14d947bf40 100644 --- a/versioned/persist/tx-test/build.gradle.kts +++ b/versioned/persist/tx-test/build.gradle.kts @@ -32,11 +32,14 @@ dependencies { implementation(project(":nessie-versioned-tests")) implementation(libs.guava) - implementation(libs.findbugs.jsr305) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) implementation(libs.slf4j.api) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + implementation(libs.agroal.pool) compileOnly(libs.h2) compileOnly(libs.postgresql) diff --git a/versioned/persist/tx/build.gradle.kts b/versioned/persist/tx/build.gradle.kts index 74495191a99..e79692e7dc3 100644 --- a/versioned/persist/tx/build.gradle.kts +++ b/versioned/persist/tx/build.gradle.kts @@ -31,11 +31,14 @@ dependencies { implementation(project(":nessie-versioned-persist-serialize")) implementation(project(":nessie-versioned-spi")) implementation(libs.guava) - implementation(libs.findbugs.jsr305) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) implementation(libs.slf4j.api) + // javax/jakarta + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.agroal.pool) compileOnly(libs.h2) compileOnly(libs.postgresql) diff --git a/versioned/spi/build.gradle.kts b/versioned/spi/build.gradle.kts index 6a7c9f51238..8711bfed3b4 100644 --- a/versioned/spi/build.gradle.kts +++ b/versioned/spi/build.gradle.kts @@ -32,13 +32,17 @@ dependencies { compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) implementation(platform(libs.jackson.bom)) compileOnly(libs.jackson.annotations) implementation(libs.guava) - implementation(libs.findbugs.jsr305) + + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) testImplementation(platform(libs.junit.bom)) testImplementation(libs.bundles.junit.testing) diff --git a/versioned/tests/build.gradle.kts b/versioned/tests/build.gradle.kts index 614a53fa0b4..56a89c373bf 100644 --- a/versioned/tests/build.gradle.kts +++ b/versioned/tests/build.gradle.kts @@ -36,7 +36,12 @@ dependencies { compileOnly(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) + + // javax/jakarta compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) implementation(platform(libs.junit.bom)) implementation(libs.bundles.junit.testing) diff --git a/versioned/transfer/build.gradle.kts b/versioned/transfer/build.gradle.kts index 39065145725..a7d206981fb 100644 --- a/versioned/transfer/build.gradle.kts +++ b/versioned/transfer/build.gradle.kts @@ -37,11 +37,15 @@ dependencies { implementation(libs.jackson.annotations) compileOnly(libs.microprofile.openapi) - compileOnly(libs.jakarta.validation.api) - implementation(libs.findbugs.jsr305) compileOnly(libs.errorprone.annotations) implementation(libs.guava) + // javax/jakarta + compileOnly(libs.jakarta.validation.api) + compileOnly(libs.javax.validation.api) + compileOnly(libs.jakarta.annotation.api) + compileOnly(libs.findbugs.jsr305) + compileOnly(libs.immutables.builder) compileOnly(libs.immutables.value.annotations) annotationProcessor(libs.immutables.value.processor) @@ -63,6 +67,9 @@ dependencies { testRuntimeOnly(libs.h2) + // javax/jakarta + testCompileOnly(libs.jakarta.annotation.api) + testCompileOnly(libs.microprofile.openapi) testImplementation(platform(libs.junit.bom))