diff --git a/.deploy/naiserator.yaml b/.deploy/naiserator.yaml
index be6a35f9b..602d80925 100644
--- 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
index 98d9bcb75..aabe6ec39 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-17
+21
diff --git a/Dockerfile b/Dockerfile
index 6adcef62a..63ad0b6af 100644
--- 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
index f5ffa2439..6cc637af1 100644
--- a/brevproduksjon/pom.xml
+++ b/brevproduksjon/pom.xml
@@ -7,7 +7,7 @@
no.nav.foreldrepenger.fpformidling
fpformidling
- ${revision}
+ 1.0-SNAPSHOT
brevproduksjon
@@ -100,7 +100,7 @@
org.flywaydb
- flyway-core
+ flyway-database-postgresql
test
diff --git a/domene/pom.xml b/domene/pom.xml
index 0662dbc9f..0bd12ecdf 100644
--- a/domene/pom.xml
+++ b/domene/pom.xml
@@ -7,7 +7,7 @@
no.nav.foreldrepenger.fpformidling
fpformidling
- ${revision}
+ 1.0-SNAPSHOT
domene
@@ -55,7 +55,7 @@
org.flywaydb
- flyway-core
+ flyway-database-postgresql
test
diff --git a/migreringer/pom.xml b/migreringer/pom.xml
index 39fdf1a58..bd8e917dc 100644
--- a/migreringer/pom.xml
+++ b/migreringer/pom.xml
@@ -6,7 +6,7 @@
no.nav.foreldrepenger.fpformidling
fpformidling
- ${revision}
+ 1.0-SNAPSHOT
migreringer
@@ -30,7 +30,7 @@
org.flywaydb
- flyway-core
+ flyway-database-postgresql
test
@@ -44,8 +44,8 @@
test
- no.nav.foreldrepenger
- konfig
+ no.nav.foreldrepenger.felles
+ felles-konfig
test
diff --git a/pom.xml b/pom.xml
index 0bfe8f24b..ab38a9040 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
no.nav.foreldrepenger.felles
fp-bom
- 1.0.2
+ 2.0.1
no.nav.foreldrepenger.fpformidling
fpformidling
- ${revision}
+ 1.0-SNAPSHOT
pom
Fpformidling :: Root
@@ -23,16 +23,15 @@
- 1.0-SNAPSHOT
${project.artifactId}
fp-formidling
navikt_fp-formidling
- 5.1.3
- 4.0.0
- 8.0.8
+ 6.0.0
+ 4.1.0
+ 8.1.0
4.3.1
@@ -45,7 +44,7 @@
no.nav.foreldrepenger.felles
fp-bom
- 1.0.2
+ 2.0.1
import
pom
diff --git a/web/pom.xml b/web/pom.xml
index 579d06b99..fabffcea0 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -7,7 +7,7 @@
no.nav.foreldrepenger.fpformidling
fpformidling
- ${revision}
+ 1.0-SNAPSHOT
webapp
@@ -39,8 +39,8 @@
prosesstask-rest-api
- no.nav.foreldrepenger
- konfig
+ no.nav.foreldrepenger.felles
+ felles-konfig
no.nav.foreldrepenger.felles
@@ -88,7 +88,7 @@
org.flywaydb
- flyway-core
+ flyway-database-postgresql
org.hibernate.orm