[
https://issues.apache.org/jira/browse/HDDS-5137?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17335683#comment-17335683
]
Marton Elek commented on HDDS-5137:
-----------------------------------
Thanks the analyses [~markgui]. Yes, I think you are right.
The javaxws jars were visible only because the nonrolling-upgrade branch is not
merged to the latest master.
I did the comparison again but now against the merge base (git merge-base
origin/HDDS-3698-nonrolling-upgrade origin/master).
Compared to the merge base we have three new jars files which should be added
to the LICENSE:
{code}
--- /dev/fd/63 2021-04-29 18:52:04.038356311 +0200
+++ /dev/fd/62 2021-04-29 18:52:04.038356311 +0200
@@ -6,6 +6,8 @@
share/ozone/lib/aopalliance.jar
share/ozone/lib/aopalliance-repackaged.jar
share/ozone/lib/asm.jar
+share/ozone/lib/aspectjrt.jar
+share/ozone/lib/aspectjweaver.jar
share/ozone/lib/aws-java-sdk-core.jar
share/ozone/lib/aws-java-sdk-kms.jar
share/ozone/lib/aws-java-sdk-s3.jar
@@ -106,7 +108,7 @@
share/ozone/lib/jakarta.annotation-api.jar
share/ozone/lib/jakarta.inject.jar
share/ozone/lib/jakarta.xml.bind-api.jar
-share/ozone/lib/javassist-CR2.jar
+share/ozone/lib/javassist-GA.jar
share/ozone/lib/javax.activation-api.jar
share/ozone/lib/javax.annotation-api.jar
share/ozone/lib/javax.el-api.jar
@@ -212,6 +214,7 @@
share/ozone/lib/ratis-thirdparty-misc.jar
share/ozone/lib/ratis-tools.jar
share/ozone/lib/re2j.jar
+share/ozone/lib/reflections.jar
share/ozone/lib/rocksdbjni.jar
share/ozone/lib/simpleclient_common.jar
share/ozone/lib/simpleclient_dropwizard.jar
{code}
1. We need to update hadoop-ozone/dist/src/main/license/bin/LICENSE.txt with
mentioned licenses (for the 3 new artifacts(
2. And copy the licenses to hadoop-ozone/dist/src/main/license/bin/licenses
As far as I see the aspectj LICENSE itself includes information about 3rd
party, included binaries (Unfortunately I found it only in HTML form:
https://github.com/eclipse/org.aspectj/blob/master/docs/dist/LICENSE-AspectJ.html)
I checked, and it's included in the aspectjweaver.jar (unzip -l
~/.m2/repository/org/aspectj/aspectjweaver/1.8.9/aspectjweaver-1.8.9.jar | grep
obj), so it's better to copy the original aspectj license file (which contains
this warning) instead of a generic EPL license.
> Adjust LICENSE and NOTICE files for the non-rolling upgrade branch
> ------------------------------------------------------------------
>
> Key: HDDS-5137
> URL: https://issues.apache.org/jira/browse/HDDS-5137
> Project: Apache Ozone
> Issue Type: Sub-task
> Reporter: Marton Elek
> Assignee: Mark Gui
> Priority: Blocker
>
> The branch introduced new dependencies:
> {code}
> > ./share/ozone/lib/aspectjrt.jar
> > ./share/ozone/lib/aspectjweaver.jar
> 87c89
> < ./share/ozone/lib/hk2-locator.jar
> ---
> > ./share/ozone/lib/hk2-locator-b42.jar
> 108,109d109
> < ./share/ozone/lib/jakarta.validation-api.jar
> < ./share/ozone/lib/jakarta.ws.rs-api.jar
> 114a115
> > ./share/ozone/lib/javax.inject-b42.jar
> 117a119
> > ./share/ozone/lib/javax.ws.rs-api.jar
> 214a217
> > ./share/ozone/lib/reflections.jar
> 229a233
> > ./share/ozone/lib/validation-api.Final.jar
> {code}
> As far as I see the LICENCE and NOTICE files are not changed under
> hadoop-ozone/dist/src/main/license/bin
> We should update the LICENSE file with new / modified maven artifact names.
> Related LICENSE files should be included in
> hadoop-ozone/dist/src/main/license/bin/licenses (except pure Apache license)
> In case of dependency is licensed under Apache, and IF there is a NOTICE file
> in the repository of the dependency, it should be copied to the NOTICE.txt
> (or referenced from NOTICE.txt)
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]