diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index eeadea1d25c..3b502fe35ef 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -130,7 +130,7 @@ java-min = "21" java-solrj = "17" javacc = "7.0.12" # @keep for version alignment -jaxb = "2.3.8" +jaxb = "4.0.5" jayway-jsonpath = "2.9.0" jctools = "4.0.5" jersey = "3.1.9" diff --git a/solr/licenses/angus-activation-2.0.2.jar.sha1 b/solr/licenses/angus-activation-2.0.2.jar.sha1 new file mode 100644 index 00000000000..d2e47dc7ce3 --- /dev/null +++ b/solr/licenses/angus-activation-2.0.2.jar.sha1 @@ -0,0 +1 @@ +41f1e0ddd157c856926ed149ab837d110955a9fc diff --git a/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 b/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 deleted file mode 100644 index 88cf88a7745..00000000000 --- a/solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cbbe1a62b0cc6c85972e99d52aaee350153dc530 diff --git a/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 b/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 new file mode 100644 index 00000000000..4596f427101 --- /dev/null +++ b/solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 @@ -0,0 +1 @@ +18ec117c85f3ba0ac65409136afa8e42bc74e739 diff --git a/solr/licenses/jakarta.activation-1.2.2.jar.sha1 b/solr/licenses/jakarta.activation-1.2.2.jar.sha1 deleted file mode 100644 index 2f2e16cb6e3..00000000000 --- a/solr/licenses/jakarta.activation-1.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74548703f9851017ce2f556066659438019e7eb5 diff --git a/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 b/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 deleted file mode 100644 index f243d2ef492..00000000000 --- a/solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -99f53adba383cb1bf7c3862844488574b559621f diff --git a/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 b/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 new file mode 100644 index 00000000000..5032acdf671 --- /dev/null +++ b/solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 @@ -0,0 +1 @@ +fa165bd70cda600368eee31555222776a46b881f diff --git a/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 deleted file mode 100644 index 96d326808f9..00000000000 --- a/solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -48e3b9cfc10752fba3521d6511f4165bea951801 diff --git a/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 b/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 new file mode 100644 index 00000000000..61f85242f25 --- /dev/null +++ b/solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 @@ -0,0 +1 @@ +6cd5a999b834b63238005b7144136379dc36cad2 diff --git a/solr/licenses/jaxb-core-4.0.5.jar.sha1 b/solr/licenses/jaxb-core-4.0.5.jar.sha1 new file mode 100644 index 00000000000..b5f9133ca54 --- /dev/null +++ b/solr/licenses/jaxb-core-4.0.5.jar.sha1 @@ -0,0 +1 @@ +007b4b11ea5542eea4ad55e1080b23be436795b3 diff --git a/solr/licenses/jaxb-runtime-2.3.8.jar.sha1 b/solr/licenses/jaxb-runtime-2.3.8.jar.sha1 deleted file mode 100644 index 267e3473e4c..00000000000 --- a/solr/licenses/jaxb-runtime-2.3.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c90a335a07c60db986f29d35b0f8ac0a18f0f989 diff --git a/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 b/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 new file mode 100644 index 00000000000..92f90301861 --- /dev/null +++ b/solr/licenses/jaxb-runtime-4.0.5.jar.sha1 @@ -0,0 +1 @@ +ca84c2a7169b5293e232b9d00d1e4e36d4c3914a diff --git a/solr/licenses/txw2-2.3.8.jar.sha1 b/solr/licenses/txw2-2.3.8.jar.sha1 deleted file mode 100644 index f79d9d025ae..00000000000 --- a/solr/licenses/txw2-2.3.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -66e0297f1196f0d15a776e699de1b8e6ac5d44dd diff --git a/solr/licenses/txw2-4.0.5.jar.sha1 b/solr/licenses/txw2-4.0.5.jar.sha1 new file mode 100644 index 00000000000..8855e1d4b21 --- /dev/null +++ b/solr/licenses/txw2-4.0.5.jar.sha1 @@ -0,0 +1 @@ +f36a4ef12120a9bb06d766d6a0e54b144fd7ed98 diff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfile index 2dfa894d781..66bba8745fa 100644 --- a/solr/modules/extraction/gradle.lockfile +++ b/solr/modules/extraction/gradle.lockfile @@ -49,8 +49,7 @@ com.mchange:mchange-commons-java:0.2.19=compileClasspath,jarValidation,runtimeCl com.pff:java-libpst:0.9.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome-utils:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.rometools:rome:1.18.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.zaxxer:SparseBitSet:1.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath commons-cli:commons-cli:1.9.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath @@ -88,12 +87,12 @@ io.prometheus:prometheus-metrics-exposition-formats:1.1.0=jarValidation,runtimeC io.prometheus:prometheus-metrics-model:1.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.sgr:s2-geometry-library-java:1.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor javax.measure:unit-api:1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.13.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath @@ -176,6 +175,7 @@ org.ccil.cowan.tagsoup:tagsoup:1.2.1=compileClasspath,jarValidation,runtimeClass org.checkerframework:checker-qual:3.44.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.codelibs:jhighlight:1.1.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath org.eclipse.jetty.http2:http2-client:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-common:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-hpack:10.0.22=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -201,8 +201,9 @@ org.glassfish.hk2:hk2-api:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrP org.glassfish.hk2:hk2-locator:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-utils:3.1.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:2.3.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.8=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.5=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath org.glassfish.jersey.containers:jersey-container-jetty-http:2.39.1=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-common:3.1.9=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath diff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfile index c0c9688cba5..8f053e0f742 100644 --- a/solr/modules/s3-repository/gradle.lockfile +++ b/solr/modules/s3-repository/gradle.lockfile @@ -42,8 +42,7 @@ com.google.protobuf:protobuf-java:3.25.3=annotationProcessor,errorprone,testAnno com.j256.simplemagic:simplemagic:1.17=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.jayway.jsonpath:json-path:2.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath com.lmax:disruptor:3.4.4=solrPlatformLibs -com.sun.activation:jakarta.activation:1.2.2=jarValidation,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=jarValidation,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath com.tdunning:t-digest:3.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-cli:commons-cli:1.9.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath commons-codec:commons-codec:1.17.1=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -74,13 +73,14 @@ 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=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.annotation:jakarta.annotation-api:2.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.servlet:jakarta.servlet-api:4.0.4=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.validation:jakarta.validation-api:3.0.2=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath jakarta.websocket:jakarta.websocket-api:1.1.2=jarValidation,testCompileClasspath,testRuntimeClasspath jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=jarValidation,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=jarValidation,testCompileClasspath,testRuntimeClasspath javax.inject:javax.inject:1=annotationProcessor,errorprone,testAnnotationProcessor joda-time:joda-time:2.13.0=jarValidation,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=jarValidation,testCompileClasspath,testRuntimeClasspath @@ -129,6 +129,7 @@ org.apache.zookeeper:zookeeper:3.9.2=apiHelper,compileClasspath,jarValidation,ru org.apiguardian:apiguardian-api:1.1.2=jarValidation,testRuntimeClasspath org.checkerframework:checker-qual:3.44.0=annotationProcessor,apiHelper,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,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.jetty.http2:http2-client:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-common:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath org.eclipse.jetty.http2:http2-hpack:10.0.22=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath @@ -154,8 +155,9 @@ org.glassfish.hk2:hk2-api:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtime org.glassfish.hk2:hk2-locator:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:hk2-utils:3.1.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.hk2:osgi-resource-locator:1.0.3=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:2.3.8=jarValidation,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.8=jarValidation,testCompileClasspath,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.jersey.containers:jersey-container-jetty-http:2.39.1=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-client:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath org.glassfish.jersey.core:jersey-common:3.1.9=apiHelper,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath