Standard oppsett for Java 21 (#2029)

navikt · Nov 17, 2023 · a1eede8 · a1eede8
1 parent aff1361
commit a1eede8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/.deploy/naiserator.yaml b/.deploy/naiserator.yaml
@@ -33,7 +33,9 @@ spec:
   replicas:
     min: {{minReplica}}
     max: {{maxReplica}}
-    cpuThresholdPercentage: 80
+    scalingStrategy:
+      cpu:
+        thresholdPercentage: 80
   resources:
     limits:
       cpu: 2000m
@@ -54,8 +56,6 @@ spec:
         mountPath: /var/run/secrets/nais.io/serviceuser
       - kvPath: {{ldapuserkv}}
         mountPath: /var/run/secrets/nais.io/ldap
-      - kvPath: /apikey/appdynamics/{{environment}}
-        mountPath: /var/run/secrets/nais.io/appdynamics
   env:
   {{#each env}}
    - name: {{@key}}

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/fplos
 ENV TZ=Europe/Oslo
@@ -8,7 +8,7 @@ RUN mkdir conf
 
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 \
                 -XX:+PrintCommandLineFlags \
-                -Djava.security.egd=file:/dev/./urandom \
+                -Djava.security.egd=file:/dev/urandom \
                 -Duser.timezone=Europe/Oslo \
                 -Dlogback.configurationFile=conf/logback.xml"
 

diff --git a/domene/pom.xml b/domene/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.los</groupId>
         <artifactId>fplos</artifactId>
-        <version>${revision}</version>
+        <version>2.8.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,8 +28,8 @@
         </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>

diff --git a/migreringer/pom.xml b/migreringer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.los</groupId>
         <artifactId>fplos</artifactId>
-        <version>${revision}</version>
+        <version>2.8.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>migreringer</artifactId>
@@ -13,8 +13,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>no.nav.foreldrepenger</groupId>
-            <artifactId>konfig</artifactId>
+            <groupId>no.nav.foreldrepenger.felles</groupId>
+            <artifactId>felles-konfig</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,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.los</groupId>
     <artifactId>fplos</artifactId>
-    <version>${revision}</version>
+    <version>2.8.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Fplos :: Root</name>
 
@@ -21,15 +21,14 @@
     </modules>
 
     <properties>
-        <revision>2.8.2-SNAPSHOT</revision>
 
         <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
         <sonar.projectName>fp-los</sonar.projectName>
         <sonar.projectKey>navikt_fplos</sonar.projectKey>
 
-        <fp-kontrakter.version>7.1.3</fp-kontrakter.version>
-        <felles.version>5.1.3</felles.version>
-        <prosesstask.version>4.0.0</prosesstask.version>
+        <fp-kontrakter.version>8.1.0</fp-kontrakter.version>
+        <felles.version>6.0.0</felles.version>
+        <prosesstask.version>4.1.0</prosesstask.version>
     </properties>
 
     <dependencies>
@@ -55,7 +54,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
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.los</groupId>
         <artifactId>fplos</artifactId>
-        <version>${revision}</version>
+        <version>2.8.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>webapp</artifactId>