Merge branch 'master' into undeprecate-resources

BlueBrain · Nov 3, 2023 · 1513872 · 1513872
2 parents 36bd6f2 + 3ed0219
commit 1513872
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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"),

diff --git a/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala b/storage/src/test/scala/ch/epfl/bluebrain/nexus/storage/attributes/AttributesCacheSpec.scala
@@ -11,7 +11,7 @@ import ch.epfl.bluebrain.nexus.storage.File.{Digest, FileAttributes}
 import ch.epfl.bluebrain.nexus.storage.config.AppConfig.DigestConfig
 import org.mockito.{IdiomaticMockito, Mockito}
 import org.scalatest.concurrent.{Eventually, ScalaFutures}
-import org.scalatest.{BeforeAndAfter, Inspectors}
+import org.scalatest.{BeforeAndAfter, Ignore, Inspectors}
 
 import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.duration._
@@ -21,6 +21,7 @@ import ch.epfl.bluebrain.nexus.storage.utils.Randomness
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
+@Ignore
 class AttributesCacheSpec
     extends TestKit(ActorSystem("AttributesCacheSpec"))
     with AnyWordSpecLike