diff --git a/changelog/unreleased/PR#3130-update-jakarta-ws-rs-jakarta-ws-rs-api.yml b/changelog/unreleased/PR#3130-update-jakarta-ws-rs-jakarta-ws-rs-api.yml new file mode 100644 index 000000000000..6133f38e9308 --- /dev/null +++ b/changelog/unreleased/PR#3130-update-jakarta-ws-rs-jakarta-ws-rs-api.yml @@ -0,0 +1,7 @@ +title: Update jakarta.ws.rs:jakarta.ws.rs-api to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3130 + url: https://github.com/apache/solr/pull/3130 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e6c402e8d9b9..00d90796aff1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -124,7 +124,7 @@ j256-simplemagic = "1.17" jakarta-annotation = "3.0.0" jakarta-inject = "2.0.1" jakarta-servlet = "6.1.0" -jakarta-ws = "3.1.0" +jakarta-ws = "4.0.0" # @keep This is the minimum required Java version for the project. java-min = "21" # @keep This is the minimum required Java version for SolrJ. diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfile index 874ea4343754..29f95719a729 100644 --- a/solr/api/gradle.lockfile +++ b/solr/api/gradle.lockfile @@ -84,7 +84,7 @@ jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=swaggerBuild jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,swaggerBuild,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=swaggerBuild jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor diff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfile index b3efa59c203d..d2cc9c0ea845 100644 --- a/solr/core/gradle.lockfile +++ b/solr/core/gradle.lockfile @@ -80,8 +80,7 @@ jakarta.annotation:jakarta.annotation-api:3.0.0=compileClasspath,jarValidation,r jakarta.inject:jakarta.inject-api:2.0.1=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/licenses/jakarta.ws.rs-api-3.1.0.jar.sha1 b/solr/licenses/jakarta.ws.rs-api-3.1.0.jar.sha1 deleted file mode 100644 index e6e150b95cee..000000000000 --- a/solr/licenses/jakarta.ws.rs-api-3.1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -15ce10d249a38865b58fc39521f10f29ab0e3363 diff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfile index 8f531bef3f88..983e767a839d 100644 --- a/solr/solrj-jetty/gradle.lockfile +++ b/solr/solrj-jetty/gradle.lockfile @@ -74,8 +74,7 @@ jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspa jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfile index 6a6c1f2a4ceb..bc86a489c1cd 100644 --- a/solr/solrj-streaming/gradle.lockfile +++ b/solr/solrj-streaming/gradle.lockfile @@ -74,8 +74,7 @@ jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspa jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfile index c74b90d857f9..7b60f8e3577d 100644 --- a/solr/solrj-zookeeper/gradle.lockfile +++ b/solr/solrj-zookeeper/gradle.lockfile @@ -90,8 +90,7 @@ jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspa jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfile index 180be6254699..276f8cb02c8f 100644 --- a/solr/solrj/gradle.lockfile +++ b/solr/solrj/gradle.lockfile @@ -80,8 +80,7 @@ jakarta.annotation:jakarta.annotation-api:3.0.0=jarValidation,testRuntimeClasspa jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:6.1.0=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.1.0=jarValidation,testRuntimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath -jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=testRuntimeClasspath +jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,testRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath