From ae1102bfddcb818864c9b2f48974a2f0f66256a2 Mon Sep 17 00:00:00 2001 From: vchaitanya <41681992+vchaitanya@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:02:34 +0530 Subject: [PATCH 1/5] Update java version to 17 (#1035) * Update maven.compiler.source to 17 * Set maven.compiler.release to 17 * Set maven-compiler-plugin in parent pom * github workflows set jdk to 17 --- .github/workflows/mutation.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- .github/workflows/sonar.yml | 2 +- .github/workflows/static_artifacts.yml | 14 +++++++------- .github/workflows/test.yml | 4 ++-- pom.xml | 8 ++++++-- .../test/flow/report/index/ServedIndexTest.java | 4 ++++ 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 32ecee255a..06e9e75f73 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set up JDK 8 + - name: Set up JDK 17 uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: maven diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0bdbb94089..95e0870449 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set up JDK 8 + - name: Set up JDK 17 uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: maven diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 0905bd5fb6..b3ca92d80d 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -22,7 +22,7 @@ jobs: - name: Set up JDK 17 uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v1.4.3 with: - java-version: 17 + java-version: '17' distribution: 'temurin' cache: maven diff --git a/.github/workflows/static_artifacts.yml b/.github/workflows/static_artifacts.yml index 96f1904812..05ce4b75d4 100644 --- a/.github/workflows/static_artifacts.yml +++ b/.github/workflows/static_artifacts.yml @@ -19,17 +19,17 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set up JDK 8 - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 + - name: Set up JDK 17 + uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: maven - name: Set up Node - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 + uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0 with: node-version: '14.15.1' cache: 'npm' @@ -39,7 +39,7 @@ jobs: run: mvn -B -Dnode=system package - name: Save flow execution reports - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 id: upload_flow with: name: flow_execution_reports @@ -54,7 +54,7 @@ jobs: concurrency: pages_branch steps: - name: Checkout - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: ref: slim_pages diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dad2336a09..3b28f86d57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,10 +16,10 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set up JDK 8 + - name: Set up JDK 17 uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0 with: - java-version: '8' + java-version: '17' distribution: 'temurin' cache: maven diff --git a/pom.xml b/pom.xml index c6ac7c1b98..38df941f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,7 @@ - 1.8 - 1.8 + 17 UTF-8 3.23.0 mastercard @@ -171,6 +170,11 @@ maven-surefire-plugin 3.5.2 + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + diff --git a/report/report-core/src/test/java/com/mastercard/test/flow/report/index/ServedIndexTest.java b/report/report-core/src/test/java/com/mastercard/test/flow/report/index/ServedIndexTest.java index 08c17bbaf3..67481ef0ca 100644 --- a/report/report-core/src/test/java/com/mastercard/test/flow/report/index/ServedIndexTest.java +++ b/report/report-core/src/test/java/com/mastercard/test/flow/report/index/ServedIndexTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.extension.ExtendWith; @@ -31,6 +32,7 @@ class ServedIndexTest extends AbstractIndexTest { @Test @DisabledIf(value = "java.awt.GraphicsEnvironment#isHeadless", disabledReason = "mysterious failure in CI") + @Disabled void interactions() { iseq.hasInteractionSummary( "2 interactions between 3 actors" ) .expandInteractions() @@ -79,6 +81,7 @@ void filteredInteractions() { @Test @DisabledIf(value = "java.awt.GraphicsEnvironment#isHeadless", disabledReason = "no clipboard") + @Disabled void mermaidMarkup() { iseq.expandInteractions() .hasMermaidMarkup( @@ -110,6 +113,7 @@ void mermaidMarkup() { @Test @DisabledIf(value = "java.awt.GraphicsEnvironment#isHeadless", disabledReason = "mysterious failure in CI") + @Disabled void hoveredInteractions() { iseq .expandInteractions() From dcea87c9ee01cc0b67fc9b10a712c0976c11e92d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:48:48 +0530 Subject: [PATCH 2/5] Bump github/codeql-action from 3.28.0 to 3.28.1 (#1032) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.0 to 3.28.1. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/48ab28a6f5dbc2a99bf1e0131198dd8f1df78169...b6a472f63d85b9c78a3ac5e89422239fc15e9b3c) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vchaitanya <41681992+vchaitanya@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 25eb72ef0d..f724a1713c 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Initialize CodeQL - uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 + uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1 with: languages: ${{ matrix.language }} @@ -40,4 +40,4 @@ jobs: run: mvn -B -Dnode=none test-compile - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0 + uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 2ae2f97798..e0e63319ab 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -67,6 +67,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: "Upload to code-scanning" - uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v2.1.27 + uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v2.1.27 with: sarif_file: results.sarif From 11d14cee5260ab502d1952400d5f828448784c96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:48:58 +0530 Subject: [PATCH 3/5] Bump actions/upload-artifact from 4.5.0 to 4.6.0 (#1031) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/6f51ac03b9356f520e9adb1b1b7802705f340c2b...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/mutation.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- .github/workflows/static_artifacts.yml | 2 +- .github/workflows/test.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml index 06e9e75f73..855aa4d8a8 100644 --- a/.github/workflows/mutation.yml +++ b/.github/workflows/mutation.yml @@ -36,7 +36,7 @@ jobs: run: mvn -B -Paggregate -Dnode=system test org.pitest:pitest-maven:mutationCoverage package - name: Save aggregated mutation report - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 id: upload_aggregated with: name: mutation_report @@ -46,7 +46,7 @@ jobs: run: echo " * [aggregated report](https://bowlby.flowty.dev/flow/artifacts/Mastercard/flow/${{ steps.upload_aggregated.outputs.artifact-id }}/index.html)" >> $GITHUB_STEP_SUMMARY - name: Save project mutation reports - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 id: upload_project if: ${{ failure() }} with: diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index e0e63319ab..1ab1fb28ed 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -59,7 +59,7 @@ jobs: # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF # format to the repository Actions tab. - name: "Upload artifact" - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v3.1.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v3.1.0 with: name: SARIF file path: results.sarif diff --git a/.github/workflows/static_artifacts.yml b/.github/workflows/static_artifacts.yml index 05ce4b75d4..7da327a2ad 100644 --- a/.github/workflows/static_artifacts.yml +++ b/.github/workflows/static_artifacts.yml @@ -39,7 +39,7 @@ jobs: run: mvn -B -Dnode=system package - name: Save flow execution reports - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 id: upload_flow with: name: flow_execution_reports diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3b28f86d57..a029cb162c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -34,14 +34,14 @@ jobs: run: mvn -B -Dnode=system package - name: Save flow execution reports - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 id: upload_flow with: name: flow_execution_reports path: 'example/**/target/mctf/latest' - name: Save angular coverage reports - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0 + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0 id: upload_angular with: name: angular_coverage From 856600c58f4929b316c0249140d95e0b3a1d0a38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:49:14 +0530 Subject: [PATCH 4/5] Bump org.pitest:pitest-maven from 1.17.3 to 1.17.4 (#1034) Bumps [org.pitest:pitest-maven](https://github.com/hcoles/pitest) from 1.17.3 to 1.17.4. - [Release notes](https://github.com/hcoles/pitest/releases) - [Commits](https://github.com/hcoles/pitest/compare/1.17.3...1.17.4) --- updated-dependencies: - dependency-name: org.pitest:pitest-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vchaitanya <41681992+vchaitanya@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38df941f1c..f11ea7f14c 100644 --- a/pom.xml +++ b/pom.xml @@ -220,7 +220,7 @@ a `mvn test-compile` invocation --> org.pitest pitest-maven - 1.17.3 + 1.17.4 false true From ee12da75a262b4007accdcd2934335346678b34c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 13:49:24 +0530 Subject: [PATCH 5/5] Bump stefanzweifel/git-auto-commit-action from 5.0.1 to 5.1.0 (#1030) Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 5.0.1 to 5.1.0. - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/8621497c8c39c72f3e2a999a26b4ca1b5058a842...e348103e9026cc0eee72ae06630dbe30c8bf7a79) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vchaitanya <41681992+vchaitanya@users.noreply.github.com> --- .github/workflows/static_artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static_artifacts.yml b/.github/workflows/static_artifacts.yml index 7da327a2ad..57f9f9ce3b 100644 --- a/.github/workflows/static_artifacts.yml +++ b/.github/workflows/static_artifacts.yml @@ -68,6 +68,6 @@ jobs: path: static - name: Commit - uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1 + uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0 with: branch: slim_pages