Merge branch 'master' into reserverer-saksnummer-fra-k9-sak

navikt · Feb 21, 2024 · da7627d · da7627d
2 parents 7008691 + 9fc270a
commit da7627d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-master-deploy-dev.yaml b/.github/workflows/build-master-deploy-dev.yaml
@@ -25,7 +25,7 @@ jobs:
       id-token: write # nais docker-build-push
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -49,15 +49,15 @@ jobs:
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
       - name: Deploy til preprod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-fss
           RESOURCE: nais/dev-fss.yml
           IMAGE: ${{ steps.docker-push.outputs.image }}
 
       - name: Maven Dependency Tree Dependency Submission
-        uses: advanced-security/maven-dependency-submission-action@v3
+        uses: advanced-security/maven-dependency-submission-action@v4.0.0 # feil i 4.0.1
         with:
           settings-file: ./.m2/settings.xml
           ignore-maven-wrapper: true

diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -29,7 +29,7 @@ jobs:
         run: docker build --pull .
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
         with:
           fail-on-severity: moderate
           comment-summary-in-pr: on-failure
diff --git a/.github/workflows/deploy-kafka-manager.yaml b/.github/workflows/deploy-kafka-manager.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v1
+      - uses: nais/deploy/actions/deploy@v2
         if: github.ref == 'refs/heads/master'
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}

diff --git a/.github/workflows/deploy-kafka.yaml b/.github/workflows/deploy-kafka.yaml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Deploy topics to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
@@ -30,7 +30,7 @@ jobs:
 
       - name: Deploy topics to prod
         if: github.ref == 'refs/heads/master'
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp

diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml
@@ -9,7 +9,7 @@ jobs:
       id-token: write # nais docker-build-push
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
+      - uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: temurin
@@ -32,7 +32,7 @@ jobs:
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
       - name: Deploy til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-fss

diff --git a/.github/workflows/deploy-sha-prod.yaml b/.github/workflows/deploy-sha-prod.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Deploy image til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-fss

diff --git a/pom.xml b/pom.xml
@@ -32,12 +32,12 @@
 
         <!-- Kontrakt -->
         <k9-sak.version>4.1.4</k9-sak.version>
-        <k9-formidling.version>1.0.5</k9-formidling.version>
+        <k9-formidling.version>1.0.7</k9-formidling.version>
         <k9-format.version>9.0.6</k9-format.version>
-        <k9-rapid.version>1.20231019060904-f8be04b</k9-rapid.version>
+        <k9-rapid.version>1.20240115061003-339d641</k9-rapid.version>
 
         <!-- database -->
-        <postgresql.version>42.7.1</postgresql.version>
+        <postgresql.version>42.7.2</postgresql.version>
         <flyway.version>10.8.1</flyway.version>
         <vault-jdbc.version>1.3.10</vault-jdbc.version>
         <HikariCP.version>5.1.0</HikariCP.version>
@@ -49,7 +49,7 @@
         <jsonassert.version>1.5.1</jsonassert.version>
         <testcontainers.version>1.19.5</testcontainers.version>
         <springmockk.version>4.0.2</springmockk.version>
-        <wiremock.version>3.4.0</wiremock.version>
+        <wiremock.version>3.4.1</wiremock.version>
 
         <!-- pdf -->
         <openhtmltopdf.version>1.0.10</openhtmltopdf.version>
@@ -64,7 +64,7 @@
         <fuel.version>2.3.1</fuel.version>
         <kotlinx-coroutines.version>1.8.0</kotlinx-coroutines.version>
         <token-support.version>4.0.5</token-support.version>
-        <dusseldorf-ktor.version>4.0.10</dusseldorf-ktor.version>
+        <dusseldorf-ktor.version>4.2.1</dusseldorf-ktor.version>
         <de.huxhorn.sulky.ulid.version>8.3.0</de.huxhorn.sulky.ulid.version>
     </properties>