Merge branch 'master' into MELOSYS-4500

navikt · Nov 30, 2023 · 5fe17ae · 5fe17ae
2 parents 90b7a66 + d598825
commit 5fe17ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -24,7 +24,7 @@ jobs:
       uses: actions/setup-java@v3
       with:
        java-version: '17'
-       distribution: 'adopt-openj9'
+       distribution: 'temurin'
     - name: Build and test
       run: mvn verify
     - name: Integration Test Report

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.6.7</version>
+        <version>2.6.8</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>no.nav</groupId>