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] 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()