[
https://issues.apache.org/jira/browse/BEAM-11067?focusedWorklogId=501193&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-501193
]
ASF GitHub Bot logged work on BEAM-11067:
-----------------------------------------
Author: ASF GitHub Bot
Created on: 15/Oct/20 17:18
Start Date: 15/Oct/20 17:18
Worklog Time Spent: 10m
Work Description: alanmyrvold commented on a change in pull request
#13117:
URL: https://github.com/apache/beam/pull/13117#discussion_r505710543
##########
File path: sdks/java/container/license_scripts/pull_licenses_java.py
##########
@@ -140,17 +149,22 @@ def execute(dep):
}
'''
- name = dep['moduleName'].split(':')[1].lower()
+ name = dep['moduleName'].split(':')[1]
version = dep['moduleVersion']
name_version = name + '-' + version
+ # javac is not a runtime dependency
+ if name == 'javac':
+ logging.debug('Skipping', name_version)
+ return
+ # skip self dependencies
+ if name.startswith('beam'):
Review comment:
Good catch. Changed it to be:
if dep['moduleName'].lower().startswith('beam'):
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 501193)
Time Spent: 1h (was: 50m)
> Source not included on Java SDK docker image for some GPL/LGPL/MPL
> dependencies, like saxon-he and jformatstring
> ----------------------------------------------------------------------------------------------------------------
>
> Key: BEAM-11067
> URL: https://issues.apache.org/jira/browse/BEAM-11067
> Project: Beam
> Issue Type: Bug
> Components: build-system
> Affects Versions: 2.25.0
> Reporter: Alan Myrvold
> Assignee: Alan Myrvold
> Priority: P1
> Time Spent: 1h
> Remaining Estimate: 0h
>
> The java sdk docker image attempts to include source for GPL/LGPL/MPL/CDDL
> dependencies, but misses several.
> ./gradlew -Pdocker-pull-licenses :sdks:java:container:docker --info
> the problem seems to be in the check for the license type:
> [https://github.com/alanmyrvold/beam/blob/c921b0c8384809dbcab3edcd5007e92da25067c6/sdks/java/container/license_scripts/pull_licenses_java.py#L41]
> SOURCE_CODE_REQUIRED_LICENSES = ['lgpl', 'glp', 'cddl', 'mpl']
> Some of the license types in the beam_java_dependency_list.csv.gz spell out
> the license name, like "GNU Lesser" and don't match.
> spotbugs-4.0.6,https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html,"GNU
> LESSER GENERAL PUBLIC LICENSE, Version 2.1",False
> jformatstring-3.0.0,http://www.gnu.org/licenses/lgpl.html,GNU Lesser Public
> License,False
> spotbugs-annotations-4.0.6,https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html,"GNU
> LESSER GENERAL PUBLIC LICENSE, Version 2.1",False
> saxon-he-9.9.1-2,http://www.mozilla.org/MPL/2.0/,Mozilla Public License
> Version 2.0,False
> saxon-he-9.9.1-4,http://www.mozilla.org/MPL/2.0/,Mozilla Public License
> Version 2.0,False
> checkstyle-8.23,http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt,LGPL-2.1+,True
> javassist-3.24.0-GA,http://www.mozilla.org/MPL/MPL-1.1.html,MPL 1.1,True
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
