diff --git a/changelog/unreleased/PR#3136-update-org-glassfish-jaxb-jaxb-runtime.yml b/changelog/unreleased/PR#3136-update-org-glassfish-jaxb-jaxb-runtime.yml new file mode 100644 index 000000000000..b9dac7f86d31 --- /dev/null +++ b/changelog/unreleased/PR#3136-update-org-glassfish-jaxb-jaxb-runtime.yml @@ -0,0 +1,7 @@ +title: Update org.glassfish.jaxb:jaxb-runtime to v4 +type: dependency_update +authors: +- name: solrbot +links: +- name: PR#3136 + url: https://github.com/apache/solr/pull/3136 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7018c17a31ec..ab9e526eedb0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -134,7 +134,7 @@ java-min = "21" java-solrj = "17" javacc = "7.0.13" # @keep for version alignment -jaxb = "2.3.9" +jaxb = "4.0.8" jayway-jsonpath = "2.9.0" jctools = "4.0.5" jersey = "4.0.2" diff --git a/solr/licenses/angus-activation-2.0.2.jar.sha1 b/solr/licenses/angus-activation-2.0.2.jar.sha1 deleted file mode 100644 index d2e47dc7ce38..000000000000 --- a/solr/licenses/angus-activation-2.0.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -41f1e0ddd157c856926ed149ab837d110955a9fc diff --git a/solr/licenses/angus-activation-2.0.3.jar.sha1 b/solr/licenses/angus-activation-2.0.3.jar.sha1 new file mode 100644 index 000000000000..0eff897a0f55 --- /dev/null +++ b/solr/licenses/angus-activation-2.0.3.jar.sha1 @@ -0,0 +1 @@ +7f80607ea5014fef0b1779e6c33d63a88a45a563 diff --git a/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 b/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 new file mode 100644 index 000000000000..041b05337efd --- /dev/null +++ b/solr/licenses/jakarta.activation-api-2.1.4.jar.sha1 @@ -0,0 +1 @@ +9e5c2a0d75dde71a0bedc4dbdbe47b78a5dc50f8 diff --git a/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 new file mode 100644 index 000000000000..25520554e95c --- /dev/null +++ b/solr/licenses/jakarta.xml.bind-api-4.0.5.jar.sha1 @@ -0,0 +1 @@ +161811f36cad3c65991502e80317f2f6703361df diff --git a/solr/licenses/jaxb-core-4.0.5.jar.sha1 b/solr/licenses/jaxb-core-4.0.5.jar.sha1 deleted file mode 100644 index b5f9133ca546..000000000000 --- a/solr/licenses/jaxb-core-4.0.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -007b4b11ea5542eea4ad55e1080b23be436795b3 diff --git a/solr/licenses/jaxb-core-4.0.8.jar.sha1 b/solr/licenses/jaxb-core-4.0.8.jar.sha1 new file mode 100644 index 000000000000..7f7e50696770 --- /dev/null +++ b/solr/licenses/jaxb-core-4.0.8.jar.sha1 @@ -0,0 +1 @@ +3e2da1254d6aee7337b5901f878a16b17c903d4a diff --git a/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 deleted file mode 100644 index 92f903018614..000000000000 --- a/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ca84c2a7169b5293e232b9d00d1e4e36d4c3914a diff --git a/solr/licenses/jaxb-runtime-4.0.8.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.8.jar.sha1 new file mode 100644 index 000000000000..abc6693cbf4e --- /dev/null +++ b/solr/licenses/jaxb-runtime-4.0.8.jar.sha1 @@ -0,0 +1 @@ +0eab27c9e6a139056470f2f3555e71543c9d567d diff --git a/solr/licenses/txw2-4.0.5.jar.sha1 b/solr/licenses/txw2-4.0.5.jar.sha1 deleted file mode 100644 index 8855e1d4b214..000000000000 --- a/solr/licenses/txw2-4.0.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -f36a4ef12120a9bb06d766d6a0e54b144fd7ed98 diff --git a/solr/licenses/txw2-4.0.8.jar.sha1 b/solr/licenses/txw2-4.0.8.jar.sha1 new file mode 100644 index 000000000000..801c0ad152bb --- /dev/null +++ b/solr/licenses/txw2-4.0.8.jar.sha1 @@ -0,0 +1 @@ +e91269d39deed0395d4938c60e8981a56ab9bdcb diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index 42c7fd4b4bfb..3767f6b8371a 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -86,7 +86,8 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=apiHelper,jarValidatio io.prometheus:prometheus-metrics-model:1.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:2.1.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs +jakarta.activation:jakarta.activation-api:2.1.4=testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.enterprise:jakarta.enterprise.lang-model:4.0.1=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -98,7 +99,8 @@ jakarta.validation:jakarta.validation-api:3.1.0=apiHelper,jarValidation,runtimeC jakarta.websocket:jakarta.websocket-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.websocket:jakarta.websocket-client-api:2.1.1=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor joda-time:joda-time:2.14.0=jarValidation,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -146,7 +148,7 @@ org.apache.zookeeper:zookeeper-jute:3.9.4=apiHelper,compileClasspath,jarValidati org.apache.zookeeper:zookeeper:3.9.4=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.eclipse.angus:angus-activation:2.0.2=jarValidation,testRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.3=jarValidation,testRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.0.12=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.0.12=jarValidation,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.0.12=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -186,9 +188,9 @@ org.glassfish.hk2:hk2-api:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runt org.glassfish.hk2:hk2-locator:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-utils:4.0.0-M3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:3.0.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.5=jarValidation,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.8=jarValidation,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.8=jarValidation,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.8=jarValidation,testCompileClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-common:4.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath