This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ac597ad059 HDDS-10191. Fix some mismatches in LICENSE (#6076)
ac597ad059 is described below
commit ac597ad05985641faa51500a80fa46a6b5608723
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jan 25 22:46:04 2024 +0100
HDDS-10191. Fix some mismatches in LICENSE (#6076)
---
hadoop-ozone/dist/src/main/license/bin/LICENSE.txt | 56 ++++++++--------------
1 file changed, 20 insertions(+), 36 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
index f5f6644efe..36f1d6c4c7 100644
--- a/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
@@ -222,6 +222,26 @@ 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
+ 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
CDDL 1.1 + GPLv2 with classpath exception
@@ -239,26 +259,8 @@ 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
- 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
@@ -456,24 +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
-=====================
-
- javax.annotation:javax.annotation-api
- javax.el:javax.el-api
- javax.interceptor:javax.interceptor-api
- javax.servlet:javax.servlet-api
-
-
Public Domain
=====================
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
