Skip to content

Commit

Permalink
Merge pull request #179 from navikt/jvm_21
Browse files Browse the repository at this point in the history
Upgrade to jdk 21
  • Loading branch information
peterbb authored Jul 2, 2024
2 parents b46cdf4 + 2e65a19 commit f6fa0be
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: maven

- run: mvn -B -DskipTests package
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
java-version: 21
cache: maven
- run: mvn -B package

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM ghcr.io/navikt/baseimages/temurin:17
COPY import-vault-secrets.sh /init-scripts
FROM gcr.io/distroless/java21-debian12
COPY /target/altinn-rettigheter-proxy-0.0.1-SNAPSHOT.jar app.jar
CMD ["app.jar"]
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<description>Arbeidsgiver - Proxy for Altinn tjenester om rettigheter til arbeidsgiver</description>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<kotlin.version>1.9.21</kotlin.version>
<token-support.version>3.2.0</token-support.version>

Expand Down

0 comments on commit f6fa0be

Please sign in to comment.