Skip to content

Commit 0f36e62

Browse files
garydgregorygarydgregory
committed
Merge branch 'master' into release
2 parents 4990187 + e17fee4 commit 0f36e62

45 files changed

Lines changed: 1445 additions & 978 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,29 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
github:
217
description: Apache Commons CLI
3-
homepage: http://commons.apache.org/proper/commons-cli/
18+
homepage: http://commons.apache.org/cli/
19+
20+
notifications:
21+
commits: commits@commons.apache.org
22+
issues: issues@commons.apache.org
23+
pullrequests: issues@commons.apache.org
24+
jira_options: link label
25+
jobs: notifications@commons.apache.org
26+
issues_bot_dependabot: notifications@commons.apache.org
27+
pullrequests_bot_dependabot: notifications@commons.apache.org
28+
issues_bot_codecov-commenter: notifications@commons.apache.org
29+
pullrequests_bot_codecov-commenter: notifications@commons.apache.org

.travis.yml renamed to .github/GH-ROBOTS.txt

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more
2-
# contributor license agreements. See the NOTICE file distributed with
3-
# this work for additional information regarding copyright ownership.
4-
# The ASF licenses this file to You under the Apache License, Version 2.0
5-
# (the "License"); you may not use this file except in compliance with
6-
# the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
16-
language: java
17-
18-
jdk:
19-
- openjdk8
20-
- openjdk11
21-
- openjdk16
22-
- openjdk-ea
23-
24-
script:
25-
- mvn -V --no-transfer-progress
26-
27-
after_success:
28-
- mvn clean test jacoco:report coveralls:report -Ptravis-jacoco --no-transfer-progress
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
# Keeps on creating FUD PRs in test code
17+
# Does not follow Apache disclosure policies
18+
User-agent: JLLeitschuh/security-research
19+
Disallow: *

‎.github/dependabot.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ updates:
1818
- package-ecosystem: "maven"
1919
directory: "/"
2020
schedule:
21-
interval: "daily"
21+
interval: "weekly"
22+
day: "friday"
2223
- package-ecosystem: "github-actions"
2324
directory: "/"
2425
schedule:
25-
interval: "daily"
26+
interval: "weekly"
27+
day: "friday"

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: "CodeQL"
17+
18+
on:
19+
push:
20+
branches: [ master ]
21+
pull_request:
22+
# The branches below must be a subset of the branches above
23+
branches: [ master ]
24+
schedule:
25+
- cron: '33 9 * * 4'
26+
27+
permissions:
28+
contents: read
29+
30+
jobs:
31+
analyze:
32+
name: Analyze
33+
runs-on: ubuntu-latest
34+
permissions:
35+
actions: read
36+
contents: read
37+
security-events: write
38+
39+
strategy:
40+
fail-fast: false
41+
matrix:
42+
language: [ 'java' ]
43+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
44+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
45+
46+
steps:
47+
- name: Checkout repository
48+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
49+
with:
50+
persist-credentials: false
51+
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
52+
with:
53+
path: ~/.m2/repository
54+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
55+
restore-keys: |
56+
${{ runner.os }}-maven-
57+
58+
# Initializes the CodeQL tools for scanning.
59+
- name: Initialize CodeQL
60+
uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
61+
with:
62+
languages: ${{ matrix.language }}
63+
# If you wish to specify custom queries, you can do so here or in a config file.
64+
# By default, queries listed here will override any specified in a config file.
65+
# Prefix the list here with "+" to use these queries and those in the config file.
66+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
67+
68+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
69+
# If this step fails, then you should remove it and run the build manually (see below)
70+
- name: Autobuild
71+
uses: github/codeql-action/autobuild@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
72+
73+
# ℹ️ Command-line programs to run using the OS shell.
74+
# 📚 https://git.io/JvXDl
75+
76+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
77+
# and modify them (or add more) to build your code if your project
78+
# uses a compiled language
79+
80+
#- run: |
81+
# make bootstrap
82+
# make release
83+
84+
- name: Perform CodeQL Analysis
85+
uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3

‎.github/workflows/coverage.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: Coverage
17+
18+
on: [push, pull_request]
19+
20+
permissions:
21+
contents: read
22+
23+
jobs:
24+
build:
25+
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
java: [ 8 ]
30+
31+
steps:
32+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
33+
with:
34+
persist-credentials: false
35+
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
36+
with:
37+
path: ~/.m2/repository
38+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
39+
restore-keys: |
40+
${{ runner.os }}-maven-
41+
- name: Set up JDK ${{ matrix.java }}
42+
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
43+
with:
44+
distribution: 'temurin'
45+
java-version: ${{ matrix.java }}
46+
- name: Build with Maven
47+
run: mvn --show-version --batch-mode --no-transfer-progress test jacoco:report
48+
49+
- name: Upload coverage to Codecov
50+
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
51+
with:
52+
files: ./target/site/jacoco/jacoco.xml

‎.github/workflows/maven.yml‎

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,52 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one or more
2-
# contributor license agreements. See the NOTICE file distributed with
3-
# this work for additional information regarding copyright ownership.
4-
# The ASF licenses this file to You under the Apache License, Version 2.0
5-
# (the "License"); you may not use this file except in compliance with
6-
# the License. You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
16-
name: Java CI
17-
18-
on: [push, pull_request]
19-
20-
jobs:
21-
build:
22-
23-
runs-on: ubuntu-latest
24-
continue-on-error: ${{ matrix.experimental }}
25-
strategy:
26-
matrix:
27-
java: [ 8, 11, 17 ]
28-
experimental: [false]
29-
# include:
30-
# - java: 18-ea
31-
# experimental: true
32-
33-
steps:
34-
- uses: actions/checkout@v2.3.5
35-
- uses: actions/cache@v2.1.6
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: Java CI
17+
18+
on: [push, pull_request]
19+
20+
permissions:
21+
contents: read
22+
23+
jobs:
24+
build:
25+
26+
runs-on: ubuntu-latest
27+
continue-on-error: ${{ matrix.experimental }}
28+
strategy:
29+
matrix:
30+
java: [ 8, 11, 17, 21 ]
31+
experimental: [false]
32+
# include:
33+
# - java: 22-ea
34+
# experimental: true
35+
36+
steps:
37+
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
3638
with:
37-
path: ~/.m2/repository
38-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
39-
restore-keys: |
40-
${{ runner.os }}-maven-
41-
- name: Set up JDK ${{ matrix.java }}
42-
uses: actions/setup-java@v2
43-
with:
44-
distribution: 'temurin'
45-
java-version: ${{ matrix.java }}
46-
- name: Build with Maven
47-
run: mvn -V --file pom.xml --no-transfer-progress
39+
persist-credentials: false
40+
- uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
41+
with:
42+
path: ~/.m2/repository
43+
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
44+
restore-keys: |
45+
${{ runner.os }}-maven-
46+
- name: Set up JDK ${{ matrix.java }}
47+
uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
48+
with:
49+
distribution: 'temurin'
50+
java-version: ${{ matrix.java }}
51+
- name: Build with Maven
52+
run: mvn --show-version --batch-mode --no-transfer-progress

‎.github/workflows/scorecards-analysis.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache license, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the license for the specific language governing permissions and
14+
# limitations under the license.
15+
16+
name: "Scorecards supply-chain security"
17+
18+
on:
19+
branch_protection_rule:
20+
schedule:
21+
- cron: "30 1 * * 6" # Weekly on Saturdays
22+
push:
23+
branches: [ "master" ]
24+
25+
permissions: read-all
26+
27+
jobs:
28+
29+
analysis:
30+
31+
name: "Scorecards analysis"
32+
runs-on: ubuntu-latest
33+
permissions:
34+
# Needed to upload the results to the code-scanning dashboard.
35+
security-events: write
36+
actions: read
37+
id-token: write # This is required for requesting the JWT
38+
contents: read # This is required for actions/checkout
39+
40+
steps:
41+
42+
- name: "Checkout code"
43+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # 4.1.1
44+
with:
45+
persist-credentials: false
46+
47+
- name: "Run analysis"
48+
uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # 2.3.0
49+
with:
50+
results_file: results.sarif
51+
results_format: sarif
52+
# A read-only PAT token, which is sufficient for the action to function.
53+
# The relevant discussion: https://github.com/ossf/scorecard-action/issues/188
54+
repo_token: ${{ secrets.GITHUB_TOKEN }}
55+
# Publish the results for public repositories to enable scorecard badges.
56+
# For more details: https://github.com/ossf/scorecard-action#publishing-results
57+
publish_results: true
58+
59+
- name: "Upload artifact"
60+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.0
61+
with:
62+
name: SARIF file
63+
path: results.sarif
64+
retention-days: 5
65+
66+
- name: "Upload to code-scanning"
67+
uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # 2.22.3
68+
with:
69+
sarif_file: results.sarif

0 commit comments

Comments
 (0)