Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust NOTICE files #7945

Merged
merged 5 commits into from Jun 25, 2019
Merged

Adjust NOTICE files #7945

merged 5 commits into from Jun 25, 2019

Conversation

jihoonson
Copy link
Contributor

@jihoonson jihoonson added the Apache Items related to being a part of the ASF label Jun 21, 2019
Copy link
Contributor

@jon-wei jon-wei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the commons-logging-1.1.1.jar entry could be removed, the three jars it mentions don't appear in our lib/ dependencies and from their pom.xml those jars are optional:

https://github.com/apache/commons-logging/blob/master/pom.xml#L452

@@ -502,216 +293,9 @@ including, but not limited to:
- Apache Commons
- Apache Xerces

ICU4J, (under analysis/icu) is licensed under an MIT styles license
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the Derby section above, I think we can remove the section pertaining to Lucene jars, I don't think we have those in the project

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, removed.

@jihoonson
Copy link
Contributor Author

@jon-wei thanks, removed commons-logging.

Software Foundation and is distributed under the apache 2.0
license.

The UnixCrypt.java code implements the one way cryptography used by
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we have to keep this UnixCrypt part for jetty 6.1.26, these jars are bundled along with the hadoop-client 2.8.3 dependency

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

correction, the jar that has UnixCrypt class is from druid-kerberos

druid-kerberos/jetty-6.1.26.jar

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, added. Also removed "Xerces2 Java Parser 2.9.1".

Copy link
Contributor

@jon-wei jon-wei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@fjy fjy merged commit 9d925f5 into apache:master Jun 25, 2019
clintropolis pushed a commit to clintropolis/druid that referenced this pull request Aug 1, 2019
* Adjust NOTICE files

* remove commons-logging

* Remove lucene from derby

* more adjustment
clintropolis added a commit that referenced this pull request Aug 1, 2019
* Adjust NOTICE files

* remove commons-logging

* Remove lucene from derby

* more adjustment
@clintropolis clintropolis added this to the 0.15.1 milestone Aug 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Apache Items related to being a part of the ASF
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants