Standard oppsett Java 21 (#2467)

navikt · Nov 18, 2023 · bf7f10f · bf7f10f
1 parent ffa2ac7
commit bf7f10f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/.deploy/naiserator.yaml b/.deploy/naiserator.yaml
@@ -33,7 +33,9 @@ spec:
   replicas:
     min: {{minReplicas}}
     max: {{maxReplicas}}
-    cpuThresholdPercentage: 80
+    scalingStrategy:
+      cpu:
+        thresholdPercentage: 80
   resources:
     limits:
       cpu: "2000m"
@@ -46,8 +48,6 @@ spec:
     paths:
       - mountPath: /var/run/secrets/nais.io/serviceuser
         kvPath: {{serviceuserkv}}
-      - mountPath: /var/run/secrets/nais.io/appdynamics
-        kvPath: /apikey/appdynamics/{{environment}}
   secureLogs:
     enabled: true
   env:

diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-17
+21
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/fp-baseimages/java:17-appdynamics
+FROM ghcr.io/navikt/fp-baseimages/java:21
 
 LABEL org.opencontainers.image.source=https://github.com/navikt/fp-formidling
 ENV TZ=Europe/Oslo

diff --git a/brevproduksjon/pom.xml b/brevproduksjon/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.fpformidling</groupId>
         <artifactId>fpformidling</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>brevproduksjon</artifactId>
@@ -100,7 +100,7 @@
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/domene/pom.xml b/domene/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.fpformidling</groupId>
         <artifactId>fpformidling</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>domene</artifactId>
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/migreringer/pom.xml b/migreringer/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.fpformidling</groupId>
         <artifactId>fpformidling</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>migreringer</artifactId>
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -44,8 +44,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>no.nav.foreldrepenger</groupId>
-            <artifactId>konfig</artifactId>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-konfig</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>1.0.2</version>
+        <version>2.0.1</version>
     </parent>
 
     <groupId>no.nav.foreldrepenger.fpformidling</groupId>
     <artifactId>fpformidling</artifactId>
-    <version>${revision}</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Fpformidling :: Root</name>
 
@@ -23,16 +23,15 @@
     </modules>
 
     <properties>
-        <revision>1.0-SNAPSHOT</revision>
 
         <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
         <sonar.projectName>fp-formidling</sonar.projectName>
         <sonar.projectKey>navikt_fp-formidling</sonar.projectKey>
 
         <!-- Felles artefakter -->
-        <felles.version>5.1.3</felles.version>
-        <prosesstask.version>4.0.0</prosesstask.version>
-        <kontrakter.version>8.0.8</kontrakter.version>
+        <felles.version>6.0.0</felles.version>
+        <prosesstask.version>4.1.0</prosesstask.version>
+        <kontrakter.version>8.1.0</kontrakter.version>
 
         <!-- Eksterne -->
         <handlebars.version>4.3.1</handlebars.version>
@@ -45,7 +44,7 @@
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>1.0.2</version>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/web/pom.xml b/web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.fpformidling</groupId>
         <artifactId>fpformidling</artifactId>
-        <version>${revision}</version>
+        <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>webapp</artifactId>
@@ -39,8 +39,8 @@
             <artifactId>prosesstask-rest-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>no.nav.foreldrepenger</groupId>
-            <artifactId>konfig</artifactId>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-konfig</artifactId>
         </dependency>
         <dependency>
             <groupId>no.nav.foreldrepenger.felles</groupId>
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>flyway-database-postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.orm</groupId>