Skip to content

Commit 9612f1d

Browse files
authored
#15-upgrade-dependencies (#16)
* Upgrade to project keeper 2 * Cleanup pom, exclude vulnerabiltities
1 parent 05638ac commit 9612f1d

13 files changed

+378
-234
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'
Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,35 @@
11
name: CI Build next Java
22

33
on:
4-
- push
4+
push:
5+
branches:
6+
- main
7+
pull_request:
58

69
jobs:
710
java-17-compatibility:
811
runs-on: ubuntu-latest
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
915
steps:
1016
- name: Checkout the repository
11-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1218
with:
1319
fetch-depth: 0
1420
- name: Set up JDK 17
15-
uses: actions/setup-java@v2
21+
uses: actions/setup-java@v3
1622
with:
1723
distribution: 'temurin'
1824
java-version: 17
19-
- name: Cache local Maven repository
20-
uses: actions/cache@v2
21-
with:
22-
path: ~/.m2/repository
23-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
24-
restore-keys: |
25-
${{ runner.os }}-maven-
25+
cache: 'maven'
2626
- name: Run tests and build with Maven
27-
run: mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false
27+
run: |
28+
mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \
29+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
30+
- name: Publish Test Report
31+
uses: scacap/action-surefire-report@v1
32+
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
33+
with:
34+
github_token: ${{ secrets.GITHUB_TOKEN }}
35+
fail_if_no_tests: false

.github/workflows/ci-build.yml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
name: CI Build
22

33
on:
4-
- push
4+
push:
5+
branches:
6+
- main
7+
pull_request:
58

69
jobs:
710
check-cdk:
@@ -10,9 +13,9 @@ jobs:
1013
- name: Install CDK
1114
run: npm install -g aws-cdk
1215
- name: Checkout the repository
13-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1417
with:
15-
fetch-depth: 0
18+
fetch-depth: 1
1619
- name: Test synthesize
1720
run: cdk synthesize --json > exasolCloudwatchDashboard.json
1821
- name: Upload cloudformation template
@@ -22,26 +25,41 @@ jobs:
2225
path: exasolCloudwatchDashboard.json
2326
build:
2427
runs-on: ubuntu-latest
28+
concurrency:
29+
group: ${{ github.workflow }}-${{ github.ref }}
30+
cancel-in-progress: true
2531
steps:
2632
- name: Checkout the repository
27-
uses: actions/checkout@v2
33+
uses: actions/checkout@v3
2834
with:
2935
fetch-depth: 0
3036
- name: Set up JDK 11
31-
uses: actions/setup-java@v2
37+
uses: actions/setup-java@v3
3238
with:
3339
distribution: 'temurin'
3440
java-version: 11
35-
- name: Cache local Maven repository
36-
uses: actions/cache@v2
41+
cache: 'maven'
42+
- name: Cache SonarCloud packages
43+
uses: actions/cache@v3
3744
with:
38-
path: ~/.m2/repository
39-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40-
restore-keys: |
41-
${{ runner.os }}-maven-
45+
path: ~/.sonar/cache
46+
key: ${{ runner.os }}-sonar
47+
restore-keys: ${{ runner.os }}-sonar
4248
- name: Run tests and build with Maven
4349
run: |
44-
mvn --batch-mode --update-snapshots clean verify sonar:sonar \
50+
mvn --batch-mode clean verify \
51+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
52+
-DtrimStackTrace=false
53+
- name: Publish Test Report
54+
uses: scacap/action-surefire-report@v1
55+
if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
56+
with:
57+
github_token: ${{ secrets.GITHUB_TOKEN }}
58+
- name: Sonar analysis
59+
if: ${{ env.SONAR_TOKEN != null }}
60+
run: |
61+
mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
62+
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
4563
-DtrimStackTrace=false \
4664
-Dsonar.organization=exasol \
4765
-Dsonar.host.url=https://sonarcloud.io \

.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_upload_github_release_assets.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout the repository
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
with:
1717
fetch-depth: 0
1818
- name: Set up JDK 11
19-
uses: actions/setup-java@v2
19+
uses: actions/setup-java@v3
2020
with:
2121
distribution: 'temurin'
2222
java-version: 11
23+
cache: 'maven'
2324
- name: Run tests and build with Maven
2425
run: |
25-
mvn --batch-mode --update-snapshots clean verify \
26-
-DtrimStackTrace=false
26+
mvn --batch-mode clean verify -DtrimStackTrace=false
2727
- name: Install CDK
2828
run: npm install -g aws-cdk
2929
- name: Synthesize

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ pom.xml.versionsBackup
2828
*.orig
2929
*.old
3030
*.md.html
31+
*.flattened-pom.xml

.project-keeper.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
sources:
2+
- type: maven
3+
path: pom.xml
4+
modules:
5+
linkReplacements:
6+
excludes:
7+
- "E-PK-CORE-17: Missing required file: 'src/test/resources/logging.properties'"
8+
- "E-PK-CORE-17: Missing required file: '.github/workflows/release_droid_prepare_original_checksum.yml'"
9+
- "E-PK-CORE-17: Missing required file: '.github/workflows/release_droid_print_quick_checksum.yml'"
10+
- "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
11+
- "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"

dependencies.md

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,46 +16,52 @@
1616

1717
## Plugin Dependencies
1818

19-
| Dependency | License |
20-
| ------------------------------------------------------- | --------------------------------------------- |
21-
| [Apache Maven Compiler Plugin][6] | [Apache License, Version 2.0][7] |
22-
| [Exec Maven Plugin][8] | [Apache License 2][9] |
23-
| [Project keeper maven plugin][10] | [MIT][11] |
24-
| [Versions Maven Plugin][12] | [Apache License, Version 2.0][7] |
25-
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][14] | [ASL2][9] |
26-
| [Apache Maven Enforcer Plugin][16] | [Apache License, Version 2.0][7] |
27-
| [Maven Surefire Plugin][18] | [Apache License, Version 2.0][7] |
28-
| [JaCoCo :: Maven Plugin][20] | [Eclipse Public License 2.0][21] |
29-
| [error-code-crawler-maven-plugin][22] | [MIT][11] |
30-
| [Reproducible Build Maven Plugin][24] | [Apache 2.0][9] |
31-
| [Maven Clean Plugin][26] | [The Apache Software License, Version 2.0][9] |
32-
| [Maven Resources Plugin][28] | [The Apache Software License, Version 2.0][9] |
33-
| [Maven JAR Plugin][30] | [The Apache Software License, Version 2.0][9] |
34-
| [Maven Install Plugin][32] | [The Apache Software License, Version 2.0][9] |
35-
| [Maven Deploy Plugin][34] | [The Apache Software License, Version 2.0][9] |
36-
| [Maven Site Plugin 3][36] | [The Apache Software License, Version 2.0][9] |
19+
| Dependency | License |
20+
| ------------------------------------------------------- | ---------------------------------------------- |
21+
| [SonarQube Scanner for Maven][6] | [GNU LGPL 3][7] |
22+
| [Apache Maven Compiler Plugin][8] | [Apache License, Version 2.0][9] |
23+
| [Apache Maven Enforcer Plugin][10] | [Apache License, Version 2.0][9] |
24+
| [Maven Flatten Plugin][12] | [Apache Software Licenese][13] |
25+
| [Exec Maven Plugin][14] | [Apache License 2][13] |
26+
| [Project keeper maven plugin][16] | [The MIT License][17] |
27+
| [org.sonatype.ossindex.maven:ossindex-maven-plugin][18] | [ASL2][13] |
28+
| [Reproducible Build Maven Plugin][20] | [Apache 2.0][13] |
29+
| [Maven Surefire Plugin][22] | [Apache License, Version 2.0][9] |
30+
| [Versions Maven Plugin][24] | [Apache License, Version 2.0][9] |
31+
| [JaCoCo :: Maven Plugin][26] | [Eclipse Public License 2.0][27] |
32+
| [error-code-crawler-maven-plugin][28] | [MIT][29] |
33+
| [Maven Clean Plugin][30] | [The Apache Software License, Version 2.0][13] |
34+
| [Maven Resources Plugin][32] | [The Apache Software License, Version 2.0][13] |
35+
| [Maven JAR Plugin][34] | [The Apache Software License, Version 2.0][13] |
36+
| [Maven Install Plugin][36] | [The Apache Software License, Version 2.0][13] |
37+
| [Maven Deploy Plugin][38] | [The Apache Software License, Version 2.0][13] |
38+
| [Maven Site Plugin 3][40] | [The Apache Software License, Version 2.0][13] |
3739

38-
[10]: https://github.com/exasol/project-keeper-maven-plugin
39-
[24]: http://zlika.github.io/reproducible-build-maven-plugin
40-
[30]: http://maven.apache.org/plugins/maven-jar-plugin/
41-
[1]: http://www.apache.org/licenses/LICENSE-2.0
42-
[7]: https://www.apache.org/licenses/LICENSE-2.0.txt
43-
[16]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
44-
[9]: http://www.apache.org/licenses/LICENSE-2.0.txt
45-
[18]: https://maven.apache.org/surefire/maven-surefire-plugin/
46-
[26]: http://maven.apache.org/plugins/maven-clean-plugin/
40+
[13]: http://www.apache.org/licenses/LICENSE-2.0.txt
41+
[22]: https://maven.apache.org/surefire/maven-surefire-plugin/
42+
[30]: http://maven.apache.org/plugins/maven-clean-plugin/
43+
[29]: https://opensource.org/licenses/MIT
44+
[12]: https://www.mojohaus.org/flatten-maven-plugin/
45+
[14]: http://www.mojohaus.org/exec-maven-plugin
46+
[16]: https://github.com/exasol/project-keeper/
47+
[24]: http://www.mojohaus.org/versions-maven-plugin/
48+
[8]: https://maven.apache.org/plugins/maven-compiler-plugin/
49+
[27]: https://www.eclipse.org/legal/epl-2.0/
50+
[7]: http://www.gnu.org/licenses/lgpl.txt
51+
[1]: https://www.apache.org/licenses/LICENSE-2.0
52+
[26]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
53+
[17]: https://github.com/exasol/project-keeper/blob/main/LICENSE
54+
[20]: http://zlika.github.io/reproducible-build-maven-plugin
55+
[34]: http://maven.apache.org/plugins/maven-jar-plugin/
56+
[6]: http://sonarsource.github.io/sonar-scanner-maven/
57+
[9]: https://www.apache.org/licenses/LICENSE-2.0.txt
58+
[10]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
4759
[5]: https://www.eclipse.org/legal/epl-v20.html
48-
[11]: https://opensource.org/licenses/MIT
49-
[32]: http://maven.apache.org/plugins/maven-install-plugin/
60+
[36]: http://maven.apache.org/plugins/maven-install-plugin/
5061
[4]: https://junit.org/junit5/
51-
[14]: https://sonatype.github.io/ossindex-maven/maven-plugin/
52-
[8]: http://www.mojohaus.org/exec-maven-plugin
53-
[12]: http://www.mojohaus.org/versions-maven-plugin/
54-
[6]: https://maven.apache.org/plugins/maven-compiler-plugin/
55-
[21]: https://www.eclipse.org/legal/epl-2.0/
56-
[34]: http://maven.apache.org/plugins/maven-deploy-plugin/
57-
[36]: http://maven.apache.org/plugins/maven-site-plugin/
58-
[28]: http://maven.apache.org/plugins/maven-resources-plugin/
62+
[18]: https://sonatype.github.io/ossindex-maven/maven-plugin/
63+
[38]: http://maven.apache.org/plugins/maven-deploy-plugin/
64+
[40]: http://maven.apache.org/plugins/maven-site-plugin/
65+
[32]: http://maven.apache.org/plugins/maven-resources-plugin/
5966
[0]: https://github.com/aws/aws-cdk
60-
[22]: https://github.com/exasol/error-code-crawler-maven-plugin
61-
[20]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
67+
[28]: https://github.com/exasol/error-code-crawler-maven-plugin

doc/changes/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changes
22

3+
* [0.2.2](changes_0.2.2.md)
34
* [0.2.1](changes_0.2.1.md)
45
* [0.2.0](changes_0.2.0.md)
56
* [0.1.1](changes_0.1.1.md)

doc/changes/changes_0.2.2.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# cloudwatch-dashboard-examples 0.2.2, released 2022-06-24
2+
3+
Code name: Upgrade dependencies
4+
5+
## Bugfixes
6+
7+
* #15 Upgraded dependencies
8+
9+
## Dependency Updates
10+
11+
### Compile Dependency Updates
12+
13+
* Updated `software.amazon.awscdk:cloudwatch:1.145.0` to `1.161.0`
14+
* Updated `software.amazon.awscdk:core:1.145.0` to `1.161.0`
15+
16+
### Plugin Dependency Updates
17+
18+
* Updated `com.exasol:error-code-crawler-maven-plugin:1.0.0` to `1.1.1`
19+
* Updated `com.exasol:project-keeper-maven-plugin:1.3.4` to `2.4.6`
20+
* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.10.0` to `3.10.1`
21+
* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3` to `3.0.0-M5`
22+
* Added `org.codehaus.mojo:flatten-maven-plugin:1.2.7`
23+
* Updated `org.codehaus.mojo:versions-maven-plugin:2.9.0` to `2.10.0`
24+
* Updated `org.jacoco:jacoco-maven-plugin:0.8.7` to `0.8.8`
25+
* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`

0 commit comments

Comments
 (0)