Java 21 (#506)

navikt · Nov 16, 2023 · 126836b · 126836b
1 parent 31f0497
commit 126836b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,7 @@ jobs:
     uses: navikt/fp-gha-workflows/.github/workflows/build-feature-postgres.yml@main
     with:
       postgres-user: unittest
+      java-version: 21
     secrets: inherit
 
   release-drafter:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -16,4 +16,6 @@ jobs:
      contents: read
      security-events: write
    uses: navikt/fp-gha-workflows/.github/workflows/codeql.yml@main
+   with:
+     java-version: 21
    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,4 +11,5 @@ jobs:
     uses: navikt/fp-gha-workflows/.github/workflows/release-feature.yml@main
     with:
       release-version: ${{ github.event.release.tag_name }}
+      java-version: 21
     secrets: inherit
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-17
+21
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
     </modules>
 
 	<properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <argLine>-Xms256m -Dlog.level.no.nav=WARN -Dfile.encoding=${project.build.sourceEncoding}</argLine>
@@ -53,7 +53,7 @@
 		<sonar.projectName>fp-prosesstask</sonar.projectName>
 		<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>
 
-		<felles.version>5.1.1</felles.version>
+		<felles.version>5.1.3</felles.version>
 
         <jakarta.jakartaee-bom.version>9.1.0</jakarta.jakartaee-bom.version>
         <hibernate-core.version>6.1.7.Final</hibernate-core.version>
@@ -181,7 +181,7 @@
             <dependency>
                 <groupId>org.junit</groupId>
                 <artifactId>junit-bom</artifactId>
-                <version>5.10.0</version>
+                <version>5.10.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -190,15 +190,21 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-bom</artifactId>
-                <version>5.5.0</version>
+                <version>5.7.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
 
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>1.14.9</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations-jakarta</artifactId>
-                <version>2.2.16</version>
+                <version>2.2.19</version>
             </dependency>
 
             <dependency>
@@ -211,7 +217,7 @@
             <dependency>
                 <groupId>com.zaxxer</groupId>
                 <artifactId>HikariCP</artifactId>
-                <version>5.0.1</version>
+                <version>5.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.flywaydb</groupId>
@@ -273,7 +279,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -295,7 +301,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.2</version>
                     <configuration>
                         <!-- Må ha @{argLine} ellers blir properties satt av jacoco-maven-plugin overkrevet -->
                         <argLine>@{argLine} ${argLine}</argLine>
@@ -340,7 +346,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.10</version>
+                    <version>0.8.11</version>
                     <executions>
                         <execution>
                             <id>prepare-agent</id>
@@ -382,7 +388,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.2.2</version>
                     <executions>
                         <execution>
                             <id>failsafe-integration-test</id>