Skip to content

Commit ea5f0d2

Browse files
kaklakariadakaklakariada
authored
#33: Upgrade dependencies (#34)
* Upgrade to project-keeper 2 * Upgrade dependencies * Fix vulnerabilitiy in jackson library
1 parent 4abc18d commit ea5f0d2

17 files changed

+538
-427
lines changed

‎.github/workflows/broken_links_checker.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Broken Links Checker
22

33
on:
44
schedule:
5-
- cron: "0 5 * * *"
5+
- cron: "0 5 * * 0"
66
push:
77
branches:
88
- main
@@ -11,12 +11,15 @@ on:
1111
jobs:
1212
linkChecker:
1313
runs-on: ubuntu-latest
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
1417
steps:
15-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1619
- name: Configure broken links checker
1720
run: |
1821
mkdir -p ./target
19-
echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json
22+
echo '{ "aliveStatusCodes": [429, 200], "ignorePatterns": [{"pattern": "^https?://(www.)?opensource.org"}] }' > ./target/broken_links_checker.json
2023
- uses: gaurav-nelson/github-action-markdown-link-check@v1
2124
with:
2225
use-quiet-mode: 'yes'

‎.github/workflows/ci-build-next-java.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@ on:
99
jobs:
1010
java-17-compatibility:
1111
runs-on: ubuntu-latest
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
1215
steps:
1316
- name: Checkout the repository
14-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1518
with:
1619
fetch-depth: 0
1720
- name: Set up JDK 17
18-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v3
1922
with:
2023
distribution: 'temurin'
2124
java-version: 17
22-
- name: Cache local Maven repository
23-
uses: actions/cache@v2
24-
with:
25-
path: ~/.m2/repository
26-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
27-
restore-keys: |
28-
${{ runner.os }}-maven-
25+
cache: 'maven'
2926
- name: Run tests and build with Maven
3027
run: |
3128
mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \
32-
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
29+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
30+
-Pscala2.13
3331
- name: Publish Test Report
3432
uses: scacap/action-surefire-report@v1
3533
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
3634
with:
3735
github_token: ${{ secrets.GITHUB_TOKEN }}
36+
fail_if_no_tests: false

‎.github/workflows/ci-build.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,22 @@ jobs:
1616
include:
1717
- { scala-version: 'scala2.12', project-keeper-skip: true }
1818
- { scala-version: 'scala2.13', project-keeper-skip: false }
19+
concurrency:
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: true
1922
steps:
2023
- name: Checkout the repository
21-
uses: actions/checkout@v2
24+
uses: actions/checkout@v3
2225
with:
2326
fetch-depth: 0
2427
- name: Set up JDK 11
25-
uses: actions/setup-java@v2
28+
uses: actions/setup-java@v3
2629
with:
2730
distribution: 'temurin'
2831
java-version: 11
29-
- name: Cache local Maven repository
30-
uses: actions/cache@v2
31-
with:
32-
path: ~/.m2/repository
33-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
34-
restore-keys: |
35-
${{ runner.os }}-maven-
32+
cache: 'maven'
3633
- name: Cache SonarCloud packages
37-
uses: actions/cache@v2
34+
uses: actions/cache@v3
3835
with:
3936
path: ~/.sonar/cache
4037
key: ${{ runner.os }}-sonar
@@ -60,9 +57,10 @@ jobs:
6057
- name: Sonar analysis
6158
if: ${{ env.SONAR_TOKEN != null && startsWith(matrix.scala-version, 'scala2.13') }}
6259
run: |
63-
mvn --batch-mode scoverage:report sonar:sonar \
60+
mvn --batch-mode scoverage:report org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
6461
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
6562
-DtrimStackTrace=false \
63+
-P${{ matrix.scala-version }} \
6664
-Dsonar.organization=exasol \
6765
-Dsonar.host.url=https://sonarcloud.io \
6866
-Dsonar.login=$SONAR_TOKEN

‎.github/workflows/dependencies_check.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v3
1313
- name: Set up JDK 11
14-
uses: actions/setup-java@v2
14+
uses: actions/setup-java@v3
1515
with:
1616
distribution: 'temurin'
1717
java-version: 11
18-
- name: Cache local Maven repository
19-
uses: actions/cache@v2
20-
with:
21-
path: ~/.m2/repository
22-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
23-
restore-keys: |
24-
${{ runner.os }}-maven-
18+
cache: 'maven'
2519
- name: Checking dependencies for vulnerabilities
26-
run: mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml
20+
run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml

‎.github/workflows/release_droid_prepare_original_checksum.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,15 @@ jobs:
1515
- { scala-version: 'scala2.13', project-keeper-skip: false }
1616
steps:
1717
- name: Checkout the repository
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121
- name: Set up JDK 11
22-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
2323
with:
2424
distribution: 'temurin'
2525
java-version: 11
26-
- name: Cache local Maven repository
27-
uses: actions/cache@v2
28-
with:
29-
path: ~/.m2/repository
30-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: |
32-
${{ runner.os }}-maven-
26+
cache: 'maven'
3327
- name: Run tests and build with Maven for ${{ matrix.scala-version }}
3428
run: |
3529
mvn --batch-mode clean verify --file pom.xml \
@@ -38,7 +32,7 @@ jobs:
3832
- name: Prepare checksum
3933
run: find target -maxdepth 1 -name *.jar -exec sha256sum "{}" + > original_checksum
4034
- name: Upload checksum to the artifactory
41-
uses: actions/upload-artifact@v2
35+
uses: actions/upload-artifact@v3
4236
with:
4337
name: original_checksum
4438
retention-days: 5

‎.github/workflows/release_droid_print_quick_checksum.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,15 @@ jobs:
1515
- { scala-version: 'scala2.13', project-keeper-skip: false }
1616
steps:
1717
- name: Checkout the repository
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121
- name: Set up JDK 11
22-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
2323
with:
2424
distribution: 'temurin'
2525
java-version: 11
26-
- name: Cache local Maven repository
27-
uses: actions/cache@v2
28-
with:
29-
path: ~/.m2/repository
30-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: |
32-
${{ runner.os }}-maven-
26+
cache: 'maven'
3327
- name: Build with Maven skipping tests for ${{ matrix.scala-version }}
3428
run: |
3529
mvn --batch-mode clean verify \

‎.github/workflows/release_droid_release_on_maven_central.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,20 @@ jobs:
1515
- { scala-version: 'scala2.13', project-keeper-skip: false }
1616
steps:
1717
- name: Checkout the repository
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121
- name: Set up Maven Central Repository
22-
uses: actions/setup-java@v2
22+
uses: actions/setup-java@v3
2323
with:
2424
distribution: 'temurin'
2525
java-version: 11
26+
cache: 'maven'
2627
server-id: ossrh
2728
server-username: MAVEN_USERNAME
2829
server-password: MAVEN_PASSWORD
29-
- name: Import GPG Key
30-
run: gpg --import --batch <(echo "${{ secrets.OSSRH_GPG_SECRET_KEY }}")
31-
- name: Cache local Maven repository
32-
uses: actions/cache@v2
33-
with:
34-
path: ~/.m2/repository
35-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
36-
restore-keys: |
37-
${{ runner.os }}-maven-
30+
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
31+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
3832
- name: Publish to Central Repository for ${{ matrix.scala-version }}
3933
run: |
4034
mvn clean deploy \
@@ -45,4 +39,4 @@ jobs:
4539
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
4640
env:
4741
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
48-
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
42+
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎.github/workflows/release_droid_upload_github_release_assets.yml‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,23 @@ jobs:
1919
- { scala-version: 'scala2.13', project-keeper-skip: false }
2020
steps:
2121
- name: Checkout the repository
22-
uses: actions/checkout@v2
22+
uses: actions/checkout@v3
2323
with:
2424
fetch-depth: 0
2525
- name: Set up JDK 11
26-
uses: actions/setup-java@v2
26+
uses: actions/setup-java@v3
2727
with:
2828
distribution: 'temurin'
2929
java-version: 11
30-
- name: Cache local Maven repository
31-
uses: actions/cache@v2
32-
with:
33-
path: ~/.m2/repository
34-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
35-
restore-keys: |
36-
${{ runner.os }}-maven-
30+
cache: 'maven'
3731
- name: Build with Maven skipping tests for ${{ matrix.scala-version }}
3832
run: |
3933
mvn --batch-mode clean verify \
4034
-P${{ matrix.scala-version }} \
4135
-DskipTests \
4236
-Dproject-keeper.skip=${{ matrix.project-keeper-skip }}
4337
- name: Generate sha256sum files
44-
run: |
45-
cd target/
46-
find -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \;
38+
run: find target -maxdepth 1 -name *.jar -exec bash -c 'sha256sum {} > {}.sha256' \;
4739
- name: Upload assets to the GitHub release draft
4840
uses: shogo82148/actions-upload-release-asset@v1
4941
with:

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ tmp
7070
# Windows
7171
Desktop.ini
7272
Thumbs.db
73+
74+
*.flattened-pom.xml

‎.project-keeper.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
sources:
2+
- type: maven
3+
path: pom.xml
4+
modules:
5+
- maven_central
6+
linkReplacements:
7+
- "LICENSE-exasol-script-api.txt|https://mit-license.org/"
8+
- "https://github.com/google/guava/guava|https://github.com/google/guava"
9+
- "http://wiki.fasterxml.com/JacksonModuleScala|https://github.com/FasterXML/jackson-module-scala"
10+
- "http://nexus.sonatype.org/oss-repository-hosting.html|https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin"
11+
- "http://nexus.sonatype.org/oss-repository-hosting.html/scalatest-maven-plugin|https://www.scalatest.org/user_guide/using_the_scalatest_maven_plugin"
12+
excludes:
13+
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
14+
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build-next-java.yml'"
15+
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'"
16+
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_print_quick_checksum.yml'"
17+
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
18+
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_release_on_maven_central.yml'"
19+
- regex: "(?s)E-PK-CORE-62: The project's README.md does not contain a valid badges block. Please add or replace the following badges:.*"

0 commit comments

Comments
 (0)