From a2dd64aa768ca3206a6991ad88ca2f42a0ce78ea Mon Sep 17 00:00:00 2001 From: Daniel Bell Date: Fri, 3 Nov 2023 09:56:10 +0100 Subject: [PATCH] Revert "Use Java 11 (#4448)" This reverts commit aa4a0c6912e96635fbdfa1486fffcee29ebc73b0. --- .github/workflows/ci-delta-app.yml | 2 +- .github/workflows/ci-delta-core.yml | 2 +- .github/workflows/ci-delta-plugins.yml | 2 +- .github/workflows/ci-delta-static-analysis.yml | 2 +- .github/workflows/ci-docs-ext-links.yml | 2 +- .github/workflows/ci-docs.yml | 2 +- .github/workflows/ci-integration-tests.yml | 2 +- .github/workflows/ci-release-docker.yml | 2 +- .github/workflows/ci-release-sonatype.yml | 2 +- .github/workflows/ci-snapshot.yml | 2 +- .github/workflows/ci-storage.yml | 2 +- build.sbt | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci-delta-app.yml b/.github/workflows/ci-delta-app.yml index fa6f74af53..268bb4c314 100644 --- a/.github/workflows/ci-delta-app.yml +++ b/.github/workflows/ci-delta-app.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-delta-core.yml b/.github/workflows/ci-delta-core.yml index 77dd129322..eda3b1be86 100644 --- a/.github/workflows/ci-delta-core.yml +++ b/.github/workflows/ci-delta-core.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-delta-plugins.yml b/.github/workflows/ci-delta-plugins.yml index bd6035f869..a0a76d67a3 100644 --- a/.github/workflows/ci-delta-plugins.yml +++ b/.github/workflows/ci-delta-plugins.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-delta-static-analysis.yml b/.github/workflows/ci-delta-static-analysis.yml index c384c2aff2..b5f49c1094 100644 --- a/.github/workflows/ci-delta-static-analysis.yml +++ b/.github/workflows/ci-delta-static-analysis.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-docs-ext-links.yml b/.github/workflows/ci-docs-ext-links.yml index d1322aa302..b0d81dc736 100644 --- a/.github/workflows/ci-docs-ext-links.yml +++ b/.github/workflows/ci-docs-ext-links.yml @@ -13,7 +13,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index f3ba9647de..f68c169139 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-integration-tests.yml b/.github/workflows/ci-integration-tests.yml index 76c6e73df6..9c567fd708 100644 --- a/.github/workflows/ci-integration-tests.yml +++ b/.github/workflows/ci-integration-tests.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/ci-release-docker.yml b/.github/workflows/ci-release-docker.yml index 21f356ae79..6de9164a98 100644 --- a/.github/workflows/ci-release-docker.yml +++ b/.github/workflows/ci-release-docker.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Set up proxy for docker buildx run: | diff --git a/.github/workflows/ci-release-sonatype.yml b/.github/workflows/ci-release-sonatype.yml index 1f77ab272c..849f0bab6b 100644 --- a/.github/workflows/ci-release-sonatype.yml +++ b/.github/workflows/ci-release-sonatype.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Publish To Sonatype run: sbt -Dsbt.color=always -Dsbt.supershell=false ci-release \ No newline at end of file diff --git a/.github/workflows/ci-snapshot.yml b/.github/workflows/ci-snapshot.yml index 3178300c95..84ce50dc60 100644 --- a/.github/workflows/ci-snapshot.yml +++ b/.github/workflows/ci-snapshot.yml @@ -26,7 +26,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Set up proxy for docker buildx run: | diff --git a/.github/workflows/ci-storage.yml b/.github/workflows/ci-storage.yml index 6768474a77..f6f8fbc3d4 100644 --- a/.github/workflows/ci-storage.yml +++ b/.github/workflows/ci-storage.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: '11' + java-version: '17' check-latest: true - name: Checkout uses: actions/checkout@v3 diff --git a/build.sbt b/build.sbt index 8d3d4ced3f..13561fef89 100755 --- a/build.sbt +++ b/build.sbt @@ -915,7 +915,7 @@ lazy val compilation = { Seq( scalaVersion := scalaCompilerVersion, scalacOptions ~= { options: Seq[String] => options.filterNot(Set("-Wself-implicit", "-Xlint:infer-any", "-Wnonunit-statement")) }, - javaSpecificationVersion := "11", + javaSpecificationVersion := "17", javacOptions ++= Seq( "-source", javaSpecificationVersion.value, @@ -979,7 +979,7 @@ lazy val servicePackaging = { else version.value }, Docker / daemonUser := "nexus", - dockerBaseImage := "eclipse-temurin:11-jre", + dockerBaseImage := "eclipse-temurin:17-jre", dockerBuildxPlatforms := Seq("linux/arm64/v8", "linux/amd64"), dockerExposedPorts := Seq(8080), dockerUsername := Some("bluebrain"),