Skip to content

Commit

Permalink
Java 21 (#80)
Browse files Browse the repository at this point in the history
* Java 21
  • Loading branch information
s148719 authored Nov 8, 2023
1 parent b8addca commit bc31fd5
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/deploy_feature.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ jobs:
contents: "read"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/deploy.yaml@main
secrets: inherit
secrets: inherit
with:
maven_options: -B -q -fae -Pit
1 change: 1 addition & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ jobs:
secrets: inherit
with:
nais_variabler_filnavn: main.yaml
maven_options: -B -q -fae -Pit


4 changes: 3 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ jobs:
contents: "write"
id-token: "write"
uses: navikt/bidrag-workflow/.github/workflows/deploy_prod.yaml@main
secrets: inherit
secrets: inherit
with:
maven_options: -B -q -fae -Pit
3 changes: 2 additions & 1 deletion .github/workflows/rollback_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ jobs:
uses: navikt/bidrag-workflow/.github/workflows/rollback_prod.yaml@main
secrets: inherit
with:
deploy_tag: ${{inputs.deploy_tag}}
deploy_tag: ${{inputs.deploy_tag}}
maven_options: -B -q -fae -Pit
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/navikt/baseimages/temurin:17
FROM ghcr.io/navikt/baseimages/temurin:21
LABEL maintainer="Team Bidrag" \
email="[email protected]"

Expand Down
6 changes: 4 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<version>0.0.1-SNAPSHOT</version>
<name>bidrag-behandling</name>
<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<kotlin.version>1.9.20</kotlin.version>
<bidrag-commons.version>20231103132440_edabbf8</bidrag-commons.version>
<bidrag-transport.version>20231106083046_e69b4f4</bidrag-transport.version>
Expand All @@ -30,6 +30,7 @@
<jackson.version>2.15.3</jackson.version>
<testcontainers.version>1.19.1</testcontainers.version>
<tomcat-embed-core.version>10.1.15</tomcat-embed-core.version>
<skipOwasp>false</skipOwasp>
</properties>

<repositories>
Expand Down Expand Up @@ -340,7 +341,8 @@
<artifactId>dependency-check-maven</artifactId>
<version>8.4.2</version>
<configuration>
<failBuildOnCVSS>7</failBuildOnCVSS>
<failBuildOnCVSS>8</failBuildOnCVSS>
<skip>${skipOwasp}</skip>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit bc31fd5

Please sign in to comment.