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.

Sign up for GitHub

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

Jump to bottom

Add missing license for jakarta.activation against module druid-avro-extensions #13845

Merged
merged 5 commits into from
Feb 26, 2023
Merged

Add missing license for jakarta.activation against module druid-avro-extensions #13845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d349a02
Test
kfaraz Feb 24, 2023
36198d3
Add missing license
kfaraz Feb 24, 2023
bfe47ef
Fix license_name
kfaraz Feb 24, 2023
ea3909b
Revert extra change
kfaraz Feb 24, 2023
04600fb
Remove profile bundle-contrib-exts from packaging check
kfaraz Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/static-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: packaging check
run: |
./.github/scripts/setup_generate_license.sh
${MVN} clean install -Prat -Pbundle-contrib-exts --fail-at-end \
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this change needed?

Copy link
Member

Choose a reason for hiding this comment

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

im not sure we should remove it, the packaging check was added to make sure that everything builds correctly, including contrib extensions (at least that is how i remember it)

Copy link
Contributor Author

@kfaraz kfaraz Feb 26, 2023 •
edited

Choose a reason for hiding this comment

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

Keeping this profile in the command leads to misleading warning messages such as this one:
https://github.com/apache/druid/actions/runs/4261844965/jobs/7416643271#step:5:22535

Warning:  The requested profile "bundle-contrib-exts" could not be activated because it does not exist.

This is because the profile bundle-contrib-exts is present only in the distribution module and that module has been excluded in the first command here.

druid/.github/workflows/static-checks.yml

Lines 56 to 62 in 6bb5eff

- name: packaging check
run: |
./.github/scripts/setup_generate_license.sh
${MVN} clean install -Prat -Pbundle-contrib-exts --fail-at-end \
-pl '!benchmarks, !distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C
${MVN} install -Prat -Pdist -Pbundle-contrib-exts --fail-at-end \
-pl 'distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C

I have retained the -Pbundle-contrib-exts for the second command, where the distribution module has been targeted.

Copy link
Member

Choose a reason for hiding this comment

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

ah, thanks I was confused, as long as it is still building them for the distribution 👍

${MVN} clean install -Prat --fail-at-end \
-pl '!benchmarks, !distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C
${MVN} install -Prat -Pdist -Pbundle-contrib-exts --fail-at-end \
-pl 'distribution' ${MAVEN_SKIP} ${MAVEN_SKIP_TESTS} -Dweb.console.skip=false -T1C
Expand Down
9 changes: 9 additions & 0 deletions licenses.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5064,6 +5064,15 @@ libraries:

---

name: jakarta.activation
license_category: binary
module: extensions/druid-avro-extensions
license_name: Eclipse Distribution License 1.0
version: 1.2.1
libraries:
- com.sun.activation: jakarta.activation

---

# Web console modules start
name: "@babel/code-frame"
Expand Down