#15-upgrade-dependencies (#16)

* Upgrade to project keeper 2 * Cleanup pom, exclude vulnerabiltities
exasol · Jun 24, 2022 · 9612f1d · 9612f1d
1 parent 05638ac
commit 9612f1d
Show file tree

Hide file tree

Showing 13 changed files with 378 additions and 234 deletions.
diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml
@@ -2,7 +2,7 @@ name: Broken Links Checker
 
 on:
   schedule:
-    - cron: "0 5 * * *"
+    - cron: "0 5 * * 0"
   push:
     branches:
       - main
@@ -11,12 +11,15 @@ on:
 jobs:
   linkChecker:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Configure broken links checker
         run: |
           mkdir -p ./target
-          echo '{ "aliveStatusCodes": [429, 200] }' > ./target/broken_links_checker.json
+          echo '{ "aliveStatusCodes": [429, 200], "ignorePatterns": [{"pattern": "^https?://(www.)?opensource.org"}] }' > ./target/broken_links_checker.json
       - uses: gaurav-nelson/github-action-markdown-link-check@v1
         with:
           use-quiet-mode: 'yes'

diff --git a/.github/workflows/ci-build-next-java.yml b/.github/workflows/ci-build-next-java.yml
@@ -1,27 +1,35 @@
 name: CI Build next Java
 
 on:
-  - push
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   java-17-compatibility:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          cache: 'maven'
       - name: Run tests and build with Maven
-        run: mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false
+        run: |
+          mvn --batch-mode --update-snapshots clean package -DtrimStackTrace=false \
+              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - name: Publish Test Report
+        uses: scacap/action-surefire-report@v1
+        if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          fail_if_no_tests: false
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -1,7 +1,10 @@
 name: CI Build
 
 on:
-  - push
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   check-cdk:
@@ -10,9 +13,9 @@ jobs:
       - name: Install CDK
         run: npm install -g aws-cdk
       - name: Checkout the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
-          fetch-depth: 0
+          fetch-depth: 1
       - name: Test synthesize
         run: cdk synthesize --json > exasolCloudwatchDashboard.json
       - name: Upload cloudformation template
@@ -22,26 +25,41 @@ jobs:
           path: exasolCloudwatchDashboard.json
   build:
     runs-on: ubuntu-latest
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
+          cache: 'maven'
+      - name: Cache SonarCloud packages
+        uses: actions/cache@v3
         with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          path: ~/.sonar/cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
       - name: Run tests and build with Maven
         run: |
-          mvn --batch-mode --update-snapshots clean verify sonar:sonar \
+          mvn --batch-mode clean verify \
+              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+              -DtrimStackTrace=false
+      - name: Publish Test Report
+        uses: scacap/action-surefire-report@v1
+        if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Sonar analysis
+        if: ${{ env.SONAR_TOKEN != null }}
+        run: |
+          mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
+              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
               -DtrimStackTrace=false \
               -Dsonar.organization=exasol \
               -Dsonar.host.url=https://sonarcloud.io \

diff --git a/.github/workflows/dependencies_check.yml b/.github/workflows/dependencies_check.yml
@@ -9,18 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-
+          cache: 'maven'
       - name: Checking dependencies for vulnerabilities
-        run: mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml
+        run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml
diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml
@@ -12,18 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 11
+          cache: 'maven'
       - name: Run tests and build with Maven
         run: |
-          mvn --batch-mode --update-snapshots clean verify \
-              -DtrimStackTrace=false
+          mvn --batch-mode clean verify -DtrimStackTrace=false
       - name: Install CDK
         run: npm install -g aws-cdk
       - name: Synthesize

diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ pom.xml.versionsBackup
 *.orig
 *.old
 *.md.html
+*.flattened-pom.xml
diff --git a/.project-keeper.yml b/.project-keeper.yml
@@ -0,0 +1,11 @@
+sources:
+  - type: maven
+    path: pom.xml
+    modules:
+linkReplacements:
+excludes:
+  - "E-PK-CORE-17: Missing required file: 'src/test/resources/logging.properties'"
+  - "E-PK-CORE-17: Missing required file: '.github/workflows/release_droid_prepare_original_checksum.yml'"
+  - "E-PK-CORE-17: Missing required file: '.github/workflows/release_droid_print_quick_checksum.yml'"
+  - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_upload_github_release_assets.yml'"
+  - "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'"
diff --git a/dependencies.md b/dependencies.md
@@ -16,46 +16,52 @@
 
 ## Plugin Dependencies
 
-| Dependency                                              | License                                       |
-| ------------------------------------------------------- | --------------------------------------------- |
-| [Apache Maven Compiler Plugin][6]                       | [Apache License, Version 2.0][7]              |
-| [Exec Maven Plugin][8]                                  | [Apache License 2][9]                         |
-| [Project keeper maven plugin][10]                       | [MIT][11]                                     |
-| [Versions Maven Plugin][12]                             | [Apache License, Version 2.0][7]              |
-| [org.sonatype.ossindex.maven:ossindex-maven-plugin][14] | [ASL2][9]                                     |
-| [Apache Maven Enforcer Plugin][16]                      | [Apache License, Version 2.0][7]              |
-| [Maven Surefire Plugin][18]                             | [Apache License, Version 2.0][7]              |
-| [JaCoCo :: Maven Plugin][20]                            | [Eclipse Public License 2.0][21]              |
-| [error-code-crawler-maven-plugin][22]                   | [MIT][11]                                     |
-| [Reproducible Build Maven Plugin][24]                   | [Apache 2.0][9]                               |
-| [Maven Clean Plugin][26]                                | [The Apache Software License, Version 2.0][9] |
-| [Maven Resources Plugin][28]                            | [The Apache Software License, Version 2.0][9] |
-| [Maven JAR Plugin][30]                                  | [The Apache Software License, Version 2.0][9] |
-| [Maven Install Plugin][32]                              | [The Apache Software License, Version 2.0][9] |
-| [Maven Deploy Plugin][34]                               | [The Apache Software License, Version 2.0][9] |
-| [Maven Site Plugin 3][36]                               | [The Apache Software License, Version 2.0][9] |
+| Dependency                                              | License                                        |
+| ------------------------------------------------------- | ---------------------------------------------- |
+| [SonarQube Scanner for Maven][6]                        | [GNU LGPL 3][7]                                |
+| [Apache Maven Compiler Plugin][8]                       | [Apache License, Version 2.0][9]               |
+| [Apache Maven Enforcer Plugin][10]                      | [Apache License, Version 2.0][9]               |
+| [Maven Flatten Plugin][12]                              | [Apache Software Licenese][13]                 |
+| [Exec Maven Plugin][14]                                 | [Apache License 2][13]                         |
+| [Project keeper maven plugin][16]                       | [The MIT License][17]                          |
+| [org.sonatype.ossindex.maven:ossindex-maven-plugin][18] | [ASL2][13]                                     |
+| [Reproducible Build Maven Plugin][20]                   | [Apache 2.0][13]                               |
+| [Maven Surefire Plugin][22]                             | [Apache License, Version 2.0][9]               |
+| [Versions Maven Plugin][24]                             | [Apache License, Version 2.0][9]               |
+| [JaCoCo :: Maven Plugin][26]                            | [Eclipse Public License 2.0][27]               |
+| [error-code-crawler-maven-plugin][28]                   | [MIT][29]                                      |
+| [Maven Clean Plugin][30]                                | [The Apache Software License, Version 2.0][13] |
+| [Maven Resources Plugin][32]                            | [The Apache Software License, Version 2.0][13] |
+| [Maven JAR Plugin][34]                                  | [The Apache Software License, Version 2.0][13] |
+| [Maven Install Plugin][36]                              | [The Apache Software License, Version 2.0][13] |
+| [Maven Deploy Plugin][38]                               | [The Apache Software License, Version 2.0][13] |
+| [Maven Site Plugin 3][40]                               | [The Apache Software License, Version 2.0][13] |
 
-[10]: https://github.com/exasol/project-keeper-maven-plugin
-[24]: http://zlika.github.io/reproducible-build-maven-plugin
-[30]: http://maven.apache.org/plugins/maven-jar-plugin/
-[1]: http://www.apache.org/licenses/LICENSE-2.0
-[7]: https://www.apache.org/licenses/LICENSE-2.0.txt
-[16]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
-[9]: http://www.apache.org/licenses/LICENSE-2.0.txt
-[18]: https://maven.apache.org/surefire/maven-surefire-plugin/
-[26]: http://maven.apache.org/plugins/maven-clean-plugin/
+[13]: http://www.apache.org/licenses/LICENSE-2.0.txt
+[22]: https://maven.apache.org/surefire/maven-surefire-plugin/
+[30]: http://maven.apache.org/plugins/maven-clean-plugin/
+[29]: https://opensource.org/licenses/MIT
+[12]: https://www.mojohaus.org/flatten-maven-plugin/
+[14]: http://www.mojohaus.org/exec-maven-plugin
+[16]: https://github.com/exasol/project-keeper/
+[24]: http://www.mojohaus.org/versions-maven-plugin/
+[8]: https://maven.apache.org/plugins/maven-compiler-plugin/
+[27]: https://www.eclipse.org/legal/epl-2.0/
+[7]: http://www.gnu.org/licenses/lgpl.txt
+[1]: https://www.apache.org/licenses/LICENSE-2.0
+[26]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
+[17]: https://github.com/exasol/project-keeper/blob/main/LICENSE
+[20]: http://zlika.github.io/reproducible-build-maven-plugin
+[34]: http://maven.apache.org/plugins/maven-jar-plugin/
+[6]: http://sonarsource.github.io/sonar-scanner-maven/
+[9]: https://www.apache.org/licenses/LICENSE-2.0.txt
+[10]: https://maven.apache.org/enforcer/maven-enforcer-plugin/
 [5]: https://www.eclipse.org/legal/epl-v20.html
-[11]: https://opensource.org/licenses/MIT
-[32]: http://maven.apache.org/plugins/maven-install-plugin/
+[36]: http://maven.apache.org/plugins/maven-install-plugin/
 [4]: https://junit.org/junit5/
-[14]: https://sonatype.github.io/ossindex-maven/maven-plugin/
-[8]: http://www.mojohaus.org/exec-maven-plugin
-[12]: http://www.mojohaus.org/versions-maven-plugin/
-[6]: https://maven.apache.org/plugins/maven-compiler-plugin/
-[21]: https://www.eclipse.org/legal/epl-2.0/
-[34]: http://maven.apache.org/plugins/maven-deploy-plugin/
-[36]: http://maven.apache.org/plugins/maven-site-plugin/
-[28]: http://maven.apache.org/plugins/maven-resources-plugin/
+[18]: https://sonatype.github.io/ossindex-maven/maven-plugin/
+[38]: http://maven.apache.org/plugins/maven-deploy-plugin/
+[40]: http://maven.apache.org/plugins/maven-site-plugin/
+[32]: http://maven.apache.org/plugins/maven-resources-plugin/
 [0]: https://github.com/aws/aws-cdk
-[22]: https://github.com/exasol/error-code-crawler-maven-plugin
-[20]: https://www.jacoco.org/jacoco/trunk/doc/maven.html
+[28]: https://github.com/exasol/error-code-crawler-maven-plugin
diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md
@@ -1,5 +1,6 @@
 # Changes
 
+* [0.2.2](changes_0.2.2.md)
 * [0.2.1](changes_0.2.1.md)
 * [0.2.0](changes_0.2.0.md)
 * [0.1.1](changes_0.1.1.md)

diff --git a/doc/changes/changes_0.2.2.md b/doc/changes/changes_0.2.2.md
@@ -0,0 +1,25 @@
+# cloudwatch-dashboard-examples 0.2.2, released 2022-06-24
+
+Code name: Upgrade dependencies
+
+## Bugfixes
+
+* #15 Upgraded dependencies
+
+## Dependency Updates
+
+### Compile Dependency Updates
+
+* Updated `software.amazon.awscdk:cloudwatch:1.145.0` to `1.161.0`
+* Updated `software.amazon.awscdk:core:1.145.0` to `1.161.0`
+
+### Plugin Dependency Updates
+
+* Updated `com.exasol:error-code-crawler-maven-plugin:1.0.0` to `1.1.1`
+* Updated `com.exasol:project-keeper-maven-plugin:1.3.4` to `2.4.6`
+* Updated `org.apache.maven.plugins:maven-compiler-plugin:3.10.0` to `3.10.1`
+* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.0.0-M3` to `3.0.0-M5`
+* Added `org.codehaus.mojo:flatten-maven-plugin:1.2.7`
+* Updated `org.codehaus.mojo:versions-maven-plugin:2.9.0` to `2.10.0`
+* Updated `org.jacoco:jacoco-maven-plugin:0.8.7` to `0.8.8`
+* Added `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184`