Skip to content

Commit 3ccd2cf

Browse files
denis-yuendenis-yuen
authored
java 21 updates and license inventory (#181)
* upgrades * add build * codeql upgrades * add cache, fix test for compliant new wdl * upgrade spotbugs and exclude generated * add licensing information
1 parent 019100f commit 3ccd2cf

9 files changed

Lines changed: 397 additions & 49 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,44 @@ jobs:
1515
contents: read
1616
security-events: write
1717

18-
strategy:
19-
fail-fast: false
20-
matrix:
21-
language: [ javascript ]
22-
2318
steps:
2419
- name: Checkout
25-
uses: actions/checkout@v3
20+
uses: actions/checkout@v6
2621

2722
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@v2
23+
uses: github/codeql-action/init@v4
2924
with:
30-
languages: ${{ matrix.language }}
25+
languages: javascript
3126
queries: +security-and-quality
3227

3328
- name: Autobuild
34-
uses: github/codeql-action/autobuild@v2
29+
uses: github/codeql-action/autobuild@v4
30+
31+
- name: Perform CodeQL Analysis
32+
uses: github/codeql-action/analyze@v4
33+
with:
34+
category: javascript
35+
36+
- name: Initialize CodeQL
37+
uses: github/codeql-action/init@v4
38+
with:
39+
languages: java
40+
queries: +security-and-quality
41+
42+
- uses: actions/cache@v5
43+
with:
44+
path: ~/.m2/repository
45+
key: ${{ runner.os }}-maven-${{ hashFiles('./wdl-parsing/WDLParsingFunction/pom.xml') }}
46+
restore-keys: |
47+
${{ runner.os }}-maven-
48+
49+
- name: Autobuild
50+
uses: github/codeql-action/autobuild@v4
51+
with:
52+
working-directory: ./wdl-parsing/WDLParsingFunction
3553

3654
- name: Perform CodeQL Analysis
37-
uses: github/codeql-action/analyze@v2
55+
uses: github/codeql-action/analyze@v4
3856
with:
39-
category: "/language:${{ matrix.language }}"
57+
category: java
58+
working-directory: ./wdl-parsing/WDLParsingFunction

‎.github/workflows/maven.yml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
testWithSAMCLI:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v6
2222
- name: Set up Python
2323
uses: actions/setup-python@v2
2424
with:
@@ -27,6 +27,23 @@ jobs:
2727
run: |
2828
python -m pip install --upgrade pip
2929
pip install aws-sam-cli
30+
- name: Set up JDK
31+
uses: actions/setup-java@v5
32+
with:
33+
java-version: '21.0.10+7.0.LTS'
34+
distribution: 'temurin'
35+
36+
- uses: actions/cache@v5
37+
with:
38+
path: ~/.m2/repository
39+
key: ${{ runner.os }}-maven-${{ hashFiles('./wdl-parsing/WDLParsingFunction/pom.xml') }}
40+
restore-keys: |
41+
${{ runner.os }}-maven-
42+
43+
- name: Test Java build
44+
working-directory: ./wdl-parsing/WDLParsingFunction
45+
run: mvn -B -ntp clean install
46+
3047
- name: Test wdl parsing with SAM CLI build and invoke
3148
working-directory: ./wdl-parsing
3249
run: |

‎wdl-parsing/WDLParsingFunction/THIRD-PARTY-LICENSES.dev.txt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
Lists of 6 third-party dependencies.
3+
(Eclipse Public License v2.0) JUnit Jupiter API (org.junit.jupiter:junit-jupiter-api:5.7.2 - https://junit.org/junit5/)
4+
(Eclipse Public License v2.0) JUnit Jupiter Engine (org.junit.jupiter:junit-jupiter-engine:5.7.2 - https://junit.org/junit5/)
5+
(Eclipse Public License v2.0) JUnit Platform Commons (org.junit.platform:junit-platform-commons:1.7.2 - https://junit.org/junit5/)
6+
(Eclipse Public License v2.0) JUnit Platform Engine API (org.junit.platform:junit-platform-engine:1.7.2 - https://junit.org/junit5/)
7+
(The Apache License, Version 2.0) org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.0 - https://github.com/apiguardian-team/apiguardian)
8+
(The Apache License, Version 2.0) org.opentest4j:opentest4j (org.opentest4j:opentest4j:1.2.0 - https://github.com/ota4j-team/opentest4j)

‎wdl-parsing/WDLParsingFunction/THIRD-PARTY-LICENSES.properties‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
2+
#-------------------------------------------------------------------------------
3+
# Already used licenses in project :
4+
# - Apache 2
5+
# - Apache 2.0
6+
# - Apache 2.0 License
7+
# - Apache License 2.0
8+
# - Apache License, Version 2.0
9+
# - Apache License, version 2.0
10+
# - Apache Software License - Version 2.0
11+
# - Apache Software Licenses
12+
# - Apache-2.0
13+
# - BSD 3-clause
14+
# - BSD New
15+
# - BSD New license
16+
# - BSD-2-Clause
17+
# - CC0
18+
# - CDDL + GPLv2 with classpath exception
19+
# - CDDL 1.1
20+
# - CDDL+GPL License
21+
# - CDDL/GPLv2+CE
22+
# - Common Public License Version 1.0
23+
# - EDL 1.0
24+
# - Eclipse Distribution License - v 1.0
25+
# - Eclipse Public License - Version 1.0
26+
# - Eclipse Public License - v 1.0
27+
# - Eclipse Public License 1.0
28+
# - GNU Lesser General Public License
29+
# - GPL2 w/ CPE
30+
# - LGPL 2.1
31+
# - MIT
32+
# - MIT License
33+
# - MIT license
34+
# - MPL 1.1
35+
# - New BSD License
36+
# - The Apache License, Version 2.0
37+
# - The Apache Software License, Version 2.0
38+
# - The MIT License
39+
# - Three-clause BSD-style
40+
#-------------------------------------------------------------------------------
41+
# If there is a missing license file the command 'mvn clean install' will fail
42+
# (if the pom.xml license-maven-plugin tag failOnMissing is true) and a warning
43+
# message will list the artifact with the missing license. The artifact and the
44+
# appropriate license string can be added to this file (THIRD-PARTY-LICENSE.properties)
45+
# which should then allow 'mvn clean install' to proceed
46+
# When supplying the artifact name, replace colons with two hyphens
47+
#
48+
# Please fill the missing licenses for dependencies :
49+
#
50+
#Fri Apr 03 14:05:39 PDT 2020
51+
org.broadinstitute--wdl-draft2_2.13--85=WDL License https://github.com/openwdl/wdl/blob/master/LICENSE
52+
org.broadinstitute--cromwell-wdl-model-draft2_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
53+
org.broadinstitute--cromwell-wdl-transforms-new-base_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
54+
org.broadinstitute--wdl-biscayne_2.13--85=WDL License https://github.com/openwdl/wdl/blob/master/LICENSE
55+
org.broadinstitute--cromwell-wdl-model-draft3_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
56+
org.broadinstitute--cromwell-wdl-transforms-draft2_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
57+
org.broadinstitute--cromwell-wdl-transforms-shared_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
58+
org.broadinstitute--cromwell-wdl-model-core_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
59+
org.broadinstitute--cromwell-wdl-model-biscayne_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
60+
com.readytalk--metrics3-statsd--4.2.0=The Apache Software License, Version 2.0
61+
org.broadinstitute--cromwell-common_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
62+
org.broadinstitute--cromwell-wdl-transforms-draft3_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
63+
org.broadinstitute--cromwell-wdl-transforms-biscayne_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
64+
org.broadinstitute--language-factory-core_2.13--85=WDL License https://github.com/openwdl/wdl/blob/master/LICENSE
65+
org.broadinstitute--wdl-draft3_2.13--85=WDL License https://github.com/openwdl/wdl/blob/master/LICENSE
66+
org.broadinstitute--cromwell-core_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
67+
org.broadinstitute--cromwell-wom_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
68+
com.readytalk--metrics-statsd-common--4.2.0=WDL License https://github.com/openwdl/wdl/blob/master/LICENSE
69+
org.antlr--antlr-runtime--3.4=The BSD License (https://www.antlr.org/license.html)
70+
dom4j--dom4j--1.6.1=https://github.com/dom4j/dom4j/blob/master/LICENSE
71+
io.netty--netty-tcnative-classes--2.0.46.Final=https://github.com/netty/netty-tcnative/blob/main/LICENSE.txt
72+
org.w3id.cwl.sdk--cwljava--1.0.0=Apache License, Version 2.0
73+
org.broadinstitute--womtool_2.13--85=Cromwell License https://github.com/broadinstitute/cromwell/blob/develop/LICENSE.txt
74+

0 commit comments

Comments
 (0)