From 9c8528f098efeb08ca39b7f5069c4c5dda12281b Mon Sep 17 00:00:00 2001 From: Suraj Goel Date: Thu, 17 Oct 2024 12:04:50 +0530 Subject: [PATCH 1/4] Migrate jaxb bind dependency to jakarta --- extensions-core/orc-extensions/pom.xml | 8 ++++---- pom.xml | 8 ++++---- processing/pom.xml | 4 ++-- services/pom.xml | 12 ++---------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml index ae67d8f4dd4f..a94cdf41ae3a 100644 --- a/extensions-core/orc-extensions/pom.xml +++ b/extensions-core/orc-extensions/pom.xml @@ -96,8 +96,8 @@ jsr311-api - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.apache.hadoop @@ -131,8 +131,8 @@ commons-lang - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.apache.hadoop diff --git a/pom.xml b/pom.xml index e70542cdea64..d3466a6ef7ec 100644 --- a/pom.xml +++ b/pom.xml @@ -644,9 +644,9 @@ provided - javax.xml.bind - jaxb-api - 2.3.1 + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 org.glassfish @@ -661,7 +661,7 @@ org.glassfish.jaxb jaxb-runtime - 2.3.1 + 2.3.3 org.jdbi diff --git a/processing/pom.xml b/processing/pom.xml index 910302c0b818..8fb67ccaebc8 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -157,8 +157,8 @@ runtime - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api runtime diff --git a/services/pom.xml b/services/pom.xml index f6137db90849..b6c552d451ac 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -234,8 +234,8 @@ 3.6.0 - javax.xml.bind - jaxb-api + jakarta.xml.bind + jakarta.xml.bind-api org.jdbi @@ -341,15 +341,7 @@ org.apache.maven.plugins maven-dependency-plugin - - - javax.xml.bind:jaxb-api - - jakarta.xml.bind:jakarta.xml.bind-api jakarta.inject:jakarta.inject-api From ef1581a6071f0a9e741a15952497235b8db41197 Mon Sep 17 00:00:00 2001 From: Suraj Goel Date: Thu, 17 Oct 2024 13:35:31 +0530 Subject: [PATCH 2/4] Add licenses for dependencies --- licenses.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/licenses.yaml b/licenses.yaml index 91e3109c8c75..86328fa55c76 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5006,6 +5006,23 @@ libraries: - com.sun.activation: jakarta.activation --- +name: jakarta.activation-api +license_category: binary +module: core +license_name: Eclipse Distribution License 1.0 +version: 1.2.2 +libraries: + - jakarta.activation:jakarta.activation-api + +--- +name: jakarta.xml.bind-api +license_category: binary +module: core +license_name: Eclipse Distribution License 1.0 +version: 2.3.3 +libraries: + - jakarta.xml.bind:jakarta.xml.bind-api +--- # Web console modules start name: "@babel/code-frame" From 14735b15a6fb8158ab133858bba1c6d9d743c96a Mon Sep 17 00:00:00 2001 From: Suraj Goel Date: Thu, 17 Oct 2024 19:21:02 +0530 Subject: [PATCH 3/4] Fix License key value pair indentation --- licenses.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 86328fa55c76..c4966fc6abe3 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5012,7 +5012,7 @@ module: core license_name: Eclipse Distribution License 1.0 version: 1.2.2 libraries: - - jakarta.activation:jakarta.activation-api + - jakarta.activation: jakarta.activation-api --- name: jakarta.xml.bind-api @@ -5021,7 +5021,7 @@ module: core license_name: Eclipse Distribution License 1.0 version: 2.3.3 libraries: - - jakarta.xml.bind:jakarta.xml.bind-api + - jakarta.xml.bind: jakarta.xml.bind-api --- # Web console modules start From 56a36678413d26fe2f2573e64b2f6a2d532659ff Mon Sep 17 00:00:00 2001 From: Suraj Goel Date: Sat, 26 Oct 2024 12:51:13 +0530 Subject: [PATCH 4/4] Remove stale references of deprecated library --- LABELS | 5 ----- licenses.yaml | 24 ------------------------ 2 files changed, 29 deletions(-) diff --git a/LABELS b/LABELS index f989cee812f6..e2dc4405c09e 100644 --- a/LABELS +++ b/LABELS @@ -55,11 +55,6 @@ This product bundles Java Servlet API version 2.5, copyright Oracle and/or its a * https://github.com/javaee/servlet-spec * javax.servlet:javax.servlet-api -This product bundles JAXB version 2.2.2, copyright Oracle and/or its affiliates., - which is available under the CDDL 1.1. For details, see licenses/bin/javax.CDDL11 - * https://github.com/javaee/jaxb-v2 - * javax.xml.bind:jaxb-api - This product bundles stax-api version 1.0-2, copyright Oracle and/or its affiliates., which is available under the CDDL 1.1. For details, see licenses/bin/javax.CDDL11 * https://github.com/javaee/ diff --git a/licenses.yaml b/licenses.yaml index c4966fc6abe3..d34b8cd658b9 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -3724,30 +3724,6 @@ libraries: --- -name: JAXB -license_category: binary -module: hadoop-client -license_name: CDDL 1.1 -version: 2.2.2 -copyright: Oracle and/or its affiliates. -license_file_path: licenses/bin/javax.CDDL11 -libraries: - - javax.xml.bind: jaxb-api - ---- - -name: JAXB -license_category: binary -module: java-core -license_name: CDDL 1.1 -version: 2.3.1 -copyright: Oracle and/or its affiliates. -license_file_path: licenses/bin/javax.CDDL11 -libraries: - - javax.xml.bind: jaxb-api - ---- - name: jsp-api license_category: binary module: hadoop-client