Skip to content

Commit

Permalink
chore: Migrate to Java 21 and remove usage of Java 17 (DEV-3146) (#2974)
Browse files Browse the repository at this point in the history
  • Loading branch information
seakayone authored Dec 28, 2023
1 parent 9a00c3f commit 779fddb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ "17", "21" ]
java: [ "21" ]
steps:
- name: Run preparatory steps
uses: dasch-swiss/dsp-api/.github/actions/preparation@main
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ "17", "21" ]
java: [ "21" ]
concurrency:
group: ${{ github.ref }}-${{ matrix.java }}-it
cancel-in-progress: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scala-steward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
name: Launch Scala Steward
steps:
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
- name: Launch Scala Steward
uses: scala-steward-org/scala-steward-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
Docker / dockerRepository := Some("daschswiss"),
Docker / packageName := "knora-api",
dockerUpdateLatest := true,
dockerBaseImage := "eclipse-temurin:17-jre-focal",
dockerBaseImage := "eclipse-temurin:21-jre-jammy",
dockerBuildxPlatforms := Seq("linux/arm64/v8", "linux/amd64"),
Docker / maintainer := "[email protected]",
Docker / dockerExposedPorts ++= Seq(3333, 3339),
Expand Down

0 comments on commit 779fddb

Please sign in to comment.