diff --git a/.github/workflows/broken_links_checker.yml b/.github/workflows/broken_links_checker.yml index c268e21..29071df 100644 --- 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 index 5516f34..6a1006c 100644 --- 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 index 81ef120..9f571a2 100644 --- 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 index d28c0b4..b2ab231 100644 --- 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 \ No newline at end of file + run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml \ No newline at end of file diff --git a/.github/workflows/release_droid_upload_github_release_assets.yml b/.github/workflows/release_droid_upload_github_release_assets.yml index d575169..7964c7f 100644 --- 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 index 559b49b..7b7fe2c 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ pom.xml.versionsBackup *.orig *.old *.md.html +*.flattened-pom.xml \ No newline at end of file diff --git a/.project-keeper.yml b/.project-keeper.yml new file mode 100644 index 0000000..604fd9f --- /dev/null +++ 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 index d2801c5..dfaf3d7 100644 --- 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 index 171e3d8..4742eab 100644 --- 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 new file mode 100644 index 0000000..0d97cb4 --- /dev/null +++ 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` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom new file mode 100644 index 0000000..43214a3 --- /dev/null +++ b/pk_generated_parent.pom @@ -0,0 +1,209 @@ + + + 4.0.0 + com.exasol + cloudwatch-dashboard-examples-generated-parent + 0.2.2 + pom + + UTF-8 + UTF-8 + 11 + + + + + MIT License + https://github.com/exasol/cloudwatch-dashboard-examples/blob/main/LICENSE + repo + + + + + Exasol + opensource@exasol.com + Exasol AG + https://www.exasol.com/ + + + + scm:git:https://github.com/exasol/cloudwatch-dashboard-examples.git + scm:git:https://github.com/exasol/cloudwatch-dashboard-examples.git + https://github.com/exasol/cloudwatch-dashboard-examples/ + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.9.1.2184 + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + enforce-maven + + enforce + + + + + 3.6.3 + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + oss + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + org.sonatype.ossindex.maven + ossindex-maven-plugin + 3.2.0 + + + audit + package + + audit + + + + + + io.github.zlika + reproducible-build-maven-plugin + 0.15 + + + strip-jar + package + + strip-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M5 + + + -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} + ${test.excludeTags} + + + + org.codehaus.mojo + versions-maven-plugin + 2.10.0 + + + display-updates + package + + display-plugin-updates + display-dependency-updates + + + + + file:///${project.basedir}/versionsMavenPluginRules.xml + + + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + prepare-agent + + prepare-agent + + + + merge-results + verify + + merge + + + + + ${project.build.directory}/ + + jacoco*.exec + + + + ${project.build.directory}/aggregate.exec + + + + report + verify + + report + + + ${project.build.directory}/aggregate.exec + + + + + + com.exasol + error-code-crawler-maven-plugin + 1.1.1 + + + verify + + verify + + + + + + + diff --git a/pom.xml b/pom.xml index 6004411..af5fa93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ - + + 4.0.0 com.exasol cloudwatch-dashboard-examples - 0.2.1 + 0.2.2 cloudwatch-dashboard-examples Example dashboards for the Exasol database's CloudWatch metrics + https://github.com/exasol/cloudwatch-dashboard-examples/ - UTF-8 - 1.145.0 - 11 - UTF-8 + 1.161.0 @@ -32,15 +31,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.0 - - ${java.version} - ${java.version} - - org.codehaus.mojo exec-maven-plugin @@ -52,7 +42,7 @@ com.exasol project-keeper-maven-plugin - 1.3.4 + 2.4.6 @@ -60,152 +50,27 @@ - - - - - src/test/resources/logging.properties - .github/workflows/release_droid_* - .github/workflows/ci-build-next-java.yml - - - - - org.codehaus.mojo - versions-maven-plugin - 2.9.0 - - - package - - display-plugin-updates - display-dependency-updates - - - - - file:///${project.basedir}/versionsMavenPluginRules.xml - org.sonatype.ossindex.maven ossindex-maven-plugin - 3.2.0 - - - package - - audit - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0 - - - enforce-maven - - enforce - - - - - 3.6.3 - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M3 - - -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} - - **IT.java - + + + + CVE-2020-36518 + + sonatype-2021-4682 + - - org.jacoco - jacoco-maven-plugin - 0.8.7 - - - prepare-agent - - prepare-agent - - - - prepare-agent-integration - - prepare-agent-integration - - - - merge-results - verify - - merge - - - - - ${project.build.directory}/ - - jacoco*.exec - - - - ${project.build.directory}/aggregate.exec - - - - report - verify - - report - - - ${project.build.directory}/aggregate.exec - - - - - - com.exasol - error-code-crawler-maven-plugin - 1.0.0 - - - - verify - - - - - - io.github.zlika - reproducible-build-maven-plugin - 0.15 - - - strip-jar - package - - strip-jar - - - - + + cloudwatch-dashboard-examples-generated-parent + com.exasol + 0.2.2 + pk_generated_parent.pom + \ No newline at end of file diff --git a/release_config.yml b/release_config.yml new file mode 100644 index 0000000..d4fe7f6 --- /dev/null +++ b/release_config.yml @@ -0,0 +1,3 @@ +platforms: + - GitHub + - Jira \ No newline at end of file