From 107d6fc780b93499b2243094c0e22fb3a69ab094 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Jan 2024 12:26:49 +0100 Subject: [PATCH 1/4] merge duplicate EPL 2.0 --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index f5f6644efeb9..06ca783af2cd 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -222,6 +222,8 @@ EPL 2.0 jakarta.ws.rs:jakarta.ws.rs-api org.aspectj:aspectjrt org.aspectj:aspectjweaver + org.jgrapht:jgrapht-core + org.jgrapht:jgrapht-ext CDDL 1.1 + GPLv2 with classpath exception @@ -456,15 +458,6 @@ MIT org.slf4j:slf4j-reload4j -EPL 2.0 -===================== - - jakarta.annotation:jakarta.annotation-api - jakarta.ws.rs:jakarta.ws.rs-api - org.jgrapht:jgrapht-core - org.jgrapht:jgrapht-ext - - CDDL + GPLv2 with classpath exception ===================== From 43eb9a207f3eca767f9f47a80467869ceaed6cde Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Jan 2024 12:27:20 +0100 Subject: [PATCH 2/4] remove duplicate CDDL + GPLv2 w/ CPE --- hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index 06ca783af2cd..a24c00559b15 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -458,15 +458,6 @@ MIT org.slf4j:slf4j-reload4j -CDDL + GPLv2 with classpath exception -===================== - - javax.annotation:javax.annotation-api - javax.el:javax.el-api - javax.interceptor:javax.interceptor-api - javax.servlet:javax.servlet-api - - Public Domain ===================== From 70a08b9d4ed276fe301e93531e17f429a7bdc710 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Jan 2024 12:46:52 +0100 Subject: [PATCH 3/4] move Jersey to EPL 2.0 --- .../dist/src/main/license/bin/LICENSE.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index a24c00559b15..fc0385f58f90 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -222,6 +222,16 @@ EPL 2.0 jakarta.ws.rs:jakarta.ws.rs-api org.aspectj:aspectjrt org.aspectj:aspectjweaver + org.glassfish.jersey.containers:jersey-container-servlet + org.glassfish.jersey.containers:jersey-container-servlet-core + org.glassfish.jersey.core:jersey-client + org.glassfish.jersey.core:jersey-common + org.glassfish.jersey.core:jersey-server + org.glassfish.jersey.ext.cdi:jersey-cdi1x + org.glassfish.jersey.ext:jersey-entity-filtering + org.glassfish.jersey.inject:jersey-hk2 + org.glassfish.jersey.media:jersey-media-jaxb + org.glassfish.jersey.media:jersey-media-json-jackson org.jgrapht:jgrapht-core org.jgrapht:jgrapht-ext @@ -251,16 +261,6 @@ CDDL 1.1 + GPLv2 with classpath exception org.glassfish.hk2:osgi-resource-locator org.glassfish.jaxb:jaxb-runtime org.glassfish.jaxb:txw2 - org.glassfish.jersey.containers:jersey-container-servlet - org.glassfish.jersey.containers:jersey-container-servlet-core - org.glassfish.jersey.core:jersey-client - org.glassfish.jersey.core:jersey-common - org.glassfish.jersey.core:jersey-server - org.glassfish.jersey.ext.cdi:jersey-cdi1x - org.glassfish.jersey.ext:jersey-entity-filtering - org.glassfish.jersey.inject:jersey-hk2 - org.glassfish.jersey.media:jersey-media-jaxb - org.glassfish.jersey.media:jersey-media-json-jackson Apache License 2.0 From 8c21e6603594240543994a25f269c4c6a7f04aa6 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Tue, 23 Jan 2024 12:47:44 +0100 Subject: [PATCH 4/4] move HK2 to EPL 2.0 --- .../dist/src/main/license/bin/LICENSE.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt index fc0385f58f90..36f1d6c4c71b 100644 --- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt +++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt @@ -222,6 +222,14 @@ EPL 2.0 jakarta.ws.rs:jakarta.ws.rs-api org.aspectj:aspectjrt org.aspectj:aspectjweaver + org.glassfish.hk2.external:aopalliance-repackaged + org.glassfish.hk2.external:jakarta.inject + org.glassfish.hk2.external:javax.inject + org.glassfish.hk2:guice-bridge + org.glassfish.hk2:hk2-api + org.glassfish.hk2:hk2-locator + org.glassfish.hk2:hk2-utils + org.glassfish.hk2:osgi-resource-locator org.glassfish.jersey.containers:jersey-container-servlet org.glassfish.jersey.containers:jersey-container-servlet-core org.glassfish.jersey.core:jersey-client @@ -251,14 +259,6 @@ CDDL 1.1 + GPLv2 with classpath exception javax.servlet:javax.servlet-api javax.servlet.jsp:jsp-api javax.ws.rs:jsr311-api - org.glassfish.hk2.external:aopalliance-repackaged - org.glassfish.hk2.external:jakarta.inject - org.glassfish.hk2.external:javax.inject - org.glassfish.hk2:guice-bridge - org.glassfish.hk2:hk2-api - org.glassfish.hk2:hk2-locator - org.glassfish.hk2:hk2-utils - org.glassfish.hk2:osgi-resource-locator org.glassfish.jaxb:jaxb-runtime org.glassfish.jaxb:txw2