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

[10.0.x] Backport NOTICE and LISENSE refactoring and rat-excludes to 10.0.x #6167

Merged
merged 9 commits into from
Nov 25, 2024

Conversation

tkobayas and others added 5 commits November 21, 2024 11:41
…apache#6149)

* [incubator-kie-issues-1613] Add .rat-excludes file to each repository

* removing apache-rat-plugin as we can check it with command line
…ache#6153)

* [incubator-kie-issues-1616] notice file for drools is not correct

* fix .rat-excludes

* consolidate LICENSE files to single LICENSE file

* fixed missing license header

* fix CsvLineParser license

* exclude drools-docs related licenses, because they will not be included in source distoribution
* [NO-ISSUE] mvel.jj license

* - adjust words

* - fixed a period
* adding OMG XSD files License info

* fixing rat-excludes and adjusting file list of OMG files

* adjusted trisotech related license and copyright info

------------------------------------------------------------------------------------
for drools-model/drools-mvel-parser/src/main/javacc/mvel.jj
JavaParser is dual licensed under LGPL license and Apache License Version 2.0 license. We choose the Apache License Version 2.0.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

LICENSE is a little different from main --- JavaParser.g4 and JavaLexer.g4 don't exist in 10.0.x.

@tkobayas
Copy link
Contributor Author

tkobayas commented Nov 21, 2024

@porcelli you wrote:

apache/incubator-kie-kogito-images#1811 (comment)

and for 10.0.0. release the individual repos content like .rat-exclude, DISCLAIMER, LEGAL, etc... will be removed for source anyway.

Backport of NOTICE etc. may not be required, but still license headers fixes are required (not sure if it's a blocker). Is it fine to merge this PR?

If this PR is not actually needed to get 10.0.0 released, feel free to close.

Copy link
Contributor

@jomarko jomarko left a comment

Choose a reason for hiding this comment

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

Thank you for the PR. Some comments inline.

Comment on lines -11 to -23
This product also includes the following third-party components:

* lunr 2.3.9
Downloaded from: https://lunrjs.com/
License: MIT

* search-ui
Downloaded from: https://gitlab.com/antora/antora-lunr-extension
License: Mozilla Public License 2.0

* antora ui-bundle
Downloaded from: https://github.com/stephengold/antora-ui-bundle
License: Mozilla Public License 2.0
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 need to add corresponding entries into LICENSE file, as the files are still delivered as part of apache-kie-10.0.0-incubating-sources.zip.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jomarko Thank you for reviewing! These 3 components are placed under drools-docs, which will be excluded by the release CI starting with the next RC build, so we will not need to address them in LICENSE.

Copy link
Contributor

Choose a reason for hiding this comment

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

ok

.rat-excludes Outdated
\.rat-excludes
\.gitignore
DISCLAIMER-WIP
LICENSE-.*\.txt
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 do not have such file LICENSE-.*\.txt

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, I'll fix.

.rat-excludes Outdated
Comment on lines 14 to 15
JavaLexer\.g4
JavaParser\.g4
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 do not have files with g4 extension

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, I'll fix.

.rat-excludes Outdated Show resolved Hide resolved
.rat-excludes Outdated Show resolved Hide resolved
@@ -0,0 +1,338 @@
# .git-blame-ignore-revs
.git-blame-ignore-revs
Copy link
Contributor Author

@tkobayas tkobayas Nov 22, 2024

Choose a reason for hiding this comment

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

Applied "list every single file" style to align with other repos. It's easier to review.

For main, filed #6169

# DISCLAIMER-WIP
DISCLAIMER-WIP
# drools-decisiontables/src/main/java/org/drools/decisiontable/parser/csv/CsvLineParser.java
CsvLineParser.java
Copy link
Contributor Author

Choose a reason for hiding this comment

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

CsvLineParser.java is listed in LICENSE

Comment on lines +29 to +34
# drools-docs/supplemental-ui/css/search.css
search.css
# drools-docs/supplemental-ui/js/search-ui.js
search-ui.js
# drools-docs/supplemental-ui/js/vendor/lunr-2.3.9.min.js
lunr-2.3.9.min.js
Copy link
Contributor Author

Choose a reason for hiding this comment

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

drools-docs is excluded from the source distribution, so no need to check.

Comment on lines +51 to +52
# drools-model/drools-mvel-parser/src/main/javacc/mvel.jj
mvel.jj
Copy link
Contributor Author

Choose a reason for hiding this comment

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

mvel.jj is listed in LICENSE

Comment on lines +119 to +138
# kie-dmn/kie-dmn-backend/src/test/resources/DC.xsd
DC.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DI.xsd
DI.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMN11.xsd
DMN11.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMN12.xsd
DMN12.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMN13.xsd
DMN13.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMN14.xsd
DMN14.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMN15.xsd
DMN15.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI12.xsd
DMNDI12.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI13.xsd
DMNDI13.xsd
# kie-dmn/kie-dmn-backend/src/test/resources/DMNDI15.xsd
DMNDI15.xsd
Copy link
Contributor Author

Choose a reason for hiding this comment

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

xsd files from OMG are listed in LICENSE

Copy link
Contributor

@jomarko jomarko left a comment

Choose a reason for hiding this comment

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

@tkobayas thank you, I think last two comments/questions inline. I was focused for files, that ore not test files.

.rat-excludes Outdated
Comment on lines 47 to 48
# drools-examples/src/main/resources/org/drools/examples/troubleticketWithDSL/TroubleTicketWithDSL.dslr
TroubleTicketWithDSL.dslr
Copy link
Contributor

Choose a reason for hiding this comment

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

It seems this file support comments, are we sure we can not add license? Does added license break the build?

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! Adding the headers and removing them from .rat-excludes

.rat-excludes Outdated
Comment on lines 297 to 298
# kie-pmml-trusty/kie-pmml-compiler/kie-pmml-compiler-core/PMMLCompiler.uml
PMMLCompiler.uml
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 it is just xml, would adding license as comment break the build?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @gitgabrio , Could you confirm what license is applied to the PMMLCompiler.uml file? (e.g. what tool was used to export it. IntelliJ IDEA built-in tools?). Thanks!

Copy link
Contributor Author

@tkobayas tkobayas Nov 22, 2024

Choose a reason for hiding this comment

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

At the moment, I assume that it's an usual output of IDE, I'm adding the apache license header.

@tkobayas
Copy link
Contributor Author

Thank you @jomarko , I'll do the same fix to the main PR.

@gitgabrio
Copy link
Contributor

Thanks @tkobayas
FYI, the PMMLCompiler.uml file already has the license header, in main.

Copy link
Contributor

@jomarko jomarko left a comment

Choose a reason for hiding this comment

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

Thank you @tkobayas

@tkobayas tkobayas merged commit ff1fd93 into apache:10.0.x Nov 25, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants