From f1575fbacff05a214352fa703fe0b03a0be09b32 Mon Sep 17 00:00:00 2001 From: SolrBot Date: Thu, 9 Jan 2025 20:41:34 +0000 Subject: [PATCH] Update dependency org.glassfish.jaxb:jaxb-runtime to v4 --- gradle/libs.versions.toml | 2 +- solr/licenses/angus-activation-2.0.2.jar.sha1 | 1 + solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 | 1 - solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 | 1 + solr/licenses/jakarta.activation-1.2.2.jar.sha1 | 1 - solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 | 1 - solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 | 1 + solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 | 1 - solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 | 1 + solr/licenses/jaxb-core-4.0.5.jar.sha1 | 1 + solr/licenses/jaxb-runtime-2.3.8.jar.sha1 | 1 - solr/licenses/jaxb-runtime-4.0.5.jar.sha1 | 1 + solr/licenses/txw2-2.3.8.jar.sha1 | 1 - solr/licenses/txw2-4.0.5.jar.sha1 | 1 + 14 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 solr/licenses/angus-activation-2.0.2.jar.sha1 delete mode 100644 solr/licenses/istack-commons-runtime-3.0.12.jar.sha1 create mode 100644 solr/licenses/istack-commons-runtime-4.1.2.jar.sha1 delete mode 100644 solr/licenses/jakarta.activation-1.2.2.jar.sha1 delete mode 100644 solr/licenses/jakarta.activation-api-1.2.2.jar.sha1 create mode 100644 solr/licenses/jakarta.activation-api-2.1.3.jar.sha1 delete mode 100644 solr/licenses/jakarta.xml.bind-api-2.3.3.jar.sha1 create mode 100644 solr/licenses/jakarta.xml.bind-api-4.0.2.jar.sha1 create mode 100644 solr/licenses/jaxb-core-4.0.5.jar.sha1 delete mode 100644 solr/licenses/jaxb-runtime-2.3.8.jar.sha1 create mode 100644 solr/licenses/jaxb-runtime-4.0.5.jar.sha1 delete mode 100644 solr/licenses/txw2-2.3.8.jar.sha1 create mode 100644 solr/licenses/txw2-4.0.5.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 685fe012216..4f71ee7fe23 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -132,7 +132,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