Skip to content

Commit 9c03e9f

Browse files
tobiasstamanntobiasstamann
authored
Merge branch 'develop' into dependabot/maven/org.testng-testng-7.4.0
2 parents 33c9d35 + c905e51 commit 9c03e9f

File tree

123 files changed

+6095
-2957
lines changed

Some content is hidden

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

123 files changed

+6095
-2957
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ develop ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ develop ]
20+
schedule:
21+
- cron: '33 22 * * 5'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'java' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37+
# Learn more:
38+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
39+
40+
steps:
41+
- name: Checkout repository
42+
uses: actions/checkout@v2
43+
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v1
47+
with:
48+
languages: ${{ matrix.language }}
49+
# If you wish to specify custom queries, you can do so here or in a config file.
50+
# By default, queries listed here will override any specified in a config file.
51+
# Prefix the list here with "+" to use these queries and those in the config file.
52+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
53+
54+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55+
# If this step fails, then you should remove it and run the build manually (see below)
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v1
58+
59+
# ℹ️ Command-line programs to run using the OS shell.
60+
# 📚 https://git.io/JvXDl
61+
62+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63+
# and modify them (or add more) to build your code if your project
64+
# uses a compiled language
65+
66+
#- run: |
67+
# make bootstrap
68+
# make release
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v1

‎.github/workflows/default.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,19 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest,macos-latest,windows-latest]
16-
java: [ 7, 7.0.181, 8, 8.0.192, 9.0.x, 10, 11.0.x, 11.0.3, 12 ]
15+
os: [ ubuntu-latest,macos-latest,windows-latest ]
16+
java: [ 8.0.x, 9.0.x, 10.0.x, 11.0.x, 12.0.x, 13.0.x, 14.0.x, 15.0.x, 16.0.x, 17.0.x, 18.0.x, 19.0.x, 20.0.x, 21.0.x, 22.0.x ]
1717

1818
steps:
19-
- uses: actions/checkout@v1
19+
- uses: actions/checkout@v4
2020

2121
- name: Set up JDK ${{ matrix.java }}
22-
uses: actions/setup-java@v1
22+
uses: actions/setup-java@v4
2323
with:
24+
distribution: 'zulu'
2425
java-version: ${{ matrix.java }}
26+
cache: 'maven'
2527

26-
- name: Cache .m2
27-
uses: actions/cache@v1
28-
with:
29-
path: ~/.m2/repository
30-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: |
32-
${{ runner.os }}-maven-
3328
- name: Prepare mvnw
3429
run: chmod +x ./mvnw
3530

‎.github/workflows/jacoco.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v1
15+
- name: Checkout code
16+
uses: actions/checkout@v4
1617

17-
- name: Set up JDK 1.8
18-
uses: actions/setup-java@v1
18+
- name: Set up JDK 9
19+
uses: actions/setup-java@v4
1920
with:
20-
java-version: 1.8
21+
distribution: 'zulu'
22+
java-version: 9
2123

2224
- name: Cache .m2
23-
uses: actions/cache@v1
25+
uses: actions/cache@v4
2426
with:
2527
path: ~/.m2/repository
2628
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2729
restore-keys: |
28-
${{ runner.os }}-maven-
30+
${{ runner.os }}-maven
31+
2932
- name: Prepare mvnw
3033
run: chmod +x ./mvnw
3134

3235
- name: Build
33-
run: ./mvnw clean install
34-
35-
- name: Verify
3636
run: ./mvnw verify jacoco:report-aggregate -B -q
3737

3838
- name: Upload coverage to Codecov
39-
uses: codecov/codecov-action@v1.0.2
39+
uses: codecov/codecov-action@v3.1.5
4040
with:
4141
token: ${{secrets.CODECOV_TOKEN}}
42-
file: coverage/target/site/jacoco-aggregate/jacoco.xml
42+
file: target/site/jacoco-aggregate/jacoco.xml

‎.github/workflows/release.yml

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,46 +10,41 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v1
14-
15-
- name: Set up JDK 9
16-
uses: actions/setup-java@v1
17-
with:
18-
java-version: 9
13+
- name: Checkout Code
14+
uses: actions/checkout@v4
1915

2016
- name: Cache .m2
21-
uses: actions/cache@v1
17+
uses: actions/cache@v4
2218
with:
2319
path: ~/.m2/repository
2420
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2521
restore-keys: |
26-
${{ runner.os }}-maven-
22+
${{ runner.os }}-maven
23+
24+
# Get GPG private key into GPG
25+
- name: Import GPG Owner Trust
26+
run: echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --import-ownertrust
27+
- name: Import GPG key
28+
run: echo ${{ secrets.GPG_SECRET_KEYS }} | base64 --decode | gpg --import --no-tty --batch --yes
29+
30+
# Setup JDK and Maven
31+
- name: Set up JDK 9
32+
uses: actions/setup-java@v4
33+
with:
34+
distribution: 'zulu'
35+
java-version: 9
36+
server-id: sonatype-nexus-staging
37+
server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central
38+
server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central
2739

2840
- name: Prepare mvnw
2941
run: chmod +x ./mvnw
3042

3143
- name: Build
3244
run: ./mvnw clean package
3345

34-
- name: Upload coverage to Codecov
35-
uses: codecov/codecov-action@v1.0.2
36-
with:
37-
token: ${{secrets.CODECOV_TOKEN}}
38-
file: target/site/jacoco-aggregate/jacoco.xml
39-
40-
- name: Import GPG Owner Trust
41-
run: echo ${{secrets.GPG_OWNERTRUST}} | base64 --decode | gpg --import-ownertrust
42-
43-
- name: Import GPG key
44-
run: echo ${{secrets.GPG_SECRET_KEYS}} | base64 --decode | gpg --import --no-tty --batch --yes
45-
46-
- name: Clean settings.xml
47-
run: rm -rf ~/.m2/settings.xml
48-
49-
- name: Create settings.xml
50-
uses: s4u/maven-settings-action@v1
51-
with:
52-
servers: '[{"id": "sonatype-nexus-staging", "username": "${{secrets.SONATYPE_USERNAME}}", "password": "${{secrets.SONATYPE_PASSWORD}}"}]'
53-
5446
- name: Deploy a new version to central
55-
run: ./mvnw clean javadoc:jar source:jar deploy -B -DskipTests -Prelease -Dgpg.passphrase=${{secrets.GPG_PASSPHRASE}}
47+
run: ./mvnw javadoc:jar source:jar deploy -B -DskipTests -Prelease -Dgpg.keyname=${{secrets.GPG_KEYNAME}} -Dgpg.passphrase="${{secrets.GPG_PASSPHRASE}}"
48+
env:
49+
OSS_CENTRAL_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
50+
OSS_CENTRAL_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

0 commit comments

Comments
 (0)