diff --git a/felles/abac-kontekst/pom.xml b/felles/abac-kontekst/pom.xml
index 9a30788b8..1f9e4e0c9 100644
--- a/felles/abac-kontekst/pom.xml
+++ b/felles/abac-kontekst/pom.xml
@@ -13,6 +13,10 @@
Felles :: ABAC
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
no.nav.foreldrepenger.felles
felles-kontekst
diff --git a/felles/abac/pom.xml b/felles/abac/pom.xml
index 23650ea84..52013b9d9 100644
--- a/felles/abac/pom.xml
+++ b/felles/abac/pom.xml
@@ -63,22 +63,7 @@
org.jboss.weld.se
weld-se-core
-
-
- org.jboss.spec.javax.interceptor
- jboss-interceptors-api_1.2_spec
-
-
- org.jboss.spec.javax.annotation
-
- jboss-annotations-api_1.3_spec
-
-
-
- org.jboss.spec.javax.el
- jboss-el-api_3.0_spec
-
-
+ provided
diff --git a/felles/db/pom.xml b/felles/db/pom.xml
index d7892d679..83067f64d 100644
--- a/felles/db/pom.xml
+++ b/felles/db/pom.xml
@@ -15,14 +15,6 @@
2.3.3
-
- no.nav.foreldrepenger.felles
- felles-feil
-
-
- org.hibernate
- hibernate-core
-
jakarta.persistence
jakarta.persistence-api
@@ -31,10 +23,23 @@
jakarta.interceptor
jakarta.interceptor-api
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
+
+ no.nav.foreldrepenger.felles
+ felles-feil
+
+
+ org.hibernate
+ hibernate-core
+ provided
+
org.hibernate
hibernate-micrometer
- ${hibernate.version}
+ provided
io.micrometer
@@ -49,22 +54,7 @@
org.jboss.weld.se
weld-se-core
-
-
- org.jboss.spec.javax.interceptor
- jboss-interceptors-api_1.2_spec
-
-
- org.jboss.spec.javax.annotation
-
- jboss-annotations-api_1.3_spec
-
-
-
- org.jboss.spec.javax.el
- jboss-el-api_3.0_spec
-
-
+ provided
diff --git a/felles/kontekst/pom.xml b/felles/kontekst/pom.xml
index ca5589b47..156d8f8cc 100644
--- a/felles/kontekst/pom.xml
+++ b/felles/kontekst/pom.xml
@@ -15,6 +15,10 @@
jar
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
no.nav.foreldrepenger
konfig
diff --git a/felles/log/pom.xml b/felles/log/pom.xml
index f402df70a..5440eab7f 100644
--- a/felles/log/pom.xml
+++ b/felles/log/pom.xml
@@ -13,6 +13,10 @@
jar
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
no.nav.foreldrepenger
konfig
@@ -21,9 +25,5 @@
io.micrometer
micrometer-registry-prometheus
-
- jakarta.enterprise
- jakarta.enterprise.cdi-api
-
diff --git a/felles/sikkerhet/pom.xml b/felles/sikkerhet/pom.xml
index 328e6a1c2..c0bcb5878 100644
--- a/felles/sikkerhet/pom.xml
+++ b/felles/sikkerhet/pom.xml
@@ -47,6 +47,7 @@
org.eclipse.jetty
jetty-server
+ provided
org.eclipse.jetty
diff --git a/felles/testutilities/pom.xml b/felles/testutilities/pom.xml
index 766d125fc..04331c881 100644
--- a/felles/testutilities/pom.xml
+++ b/felles/testutilities/pom.xml
@@ -13,6 +13,10 @@
felles-testutilities
+
+ jakarta.persistence
+ jakarta.persistence-api
+
no.nav.foreldrepenger.felles
felles-db
@@ -21,6 +25,16 @@
jakarta.el
jakarta.el-api
+
+ org.jboss.weld.se
+ weld-se-core
+ provided
+
+
+ org.hibernate
+ hibernate-core
+ provided
+
org.junit.jupiter
junit-jupiter-api
diff --git a/felles/xmlutils/pom.xml b/felles/xmlutils/pom.xml
index b0ebf9272..efaf928b0 100644
--- a/felles/xmlutils/pom.xml
+++ b/felles/xmlutils/pom.xml
@@ -20,12 +20,7 @@
org.glassfish.jaxb
jaxb-runtime
-
-
- javax.activation
- javax.activation-api
-
-
+ provided
diff --git a/integrasjon/rest-klient/pom.xml b/integrasjon/rest-klient/pom.xml
index f217a0fd0..5e0f0904a 100644
--- a/integrasjon/rest-klient/pom.xml
+++ b/integrasjon/rest-klient/pom.xml
@@ -12,6 +12,14 @@
Felles :: Integrasjon :: REST-klient
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
+
+ jakarta.ws.rs
+ jakarta.ws.rs-api
+
no.nav.foreldrepenger
konfig
@@ -29,17 +37,14 @@
felles-mapper
- jakarta.ws.rs
- jakarta.ws.rs-api
+ org.slf4j
+ jul-to-slf4j
+
no.nav.foreldrepenger.felles
felles-testutilities
test
-
- org.slf4j
- jul-to-slf4j
-
diff --git a/integrasjon/webservice/pom.xml b/integrasjon/webservice/pom.xml
index 2bc2ae36d..fcd6d055b 100644
--- a/integrasjon/webservice/pom.xml
+++ b/integrasjon/webservice/pom.xml
@@ -14,6 +14,14 @@
Felles :: Integrasjon :: WebService
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+
+
+ jakarta.activation
+ jakarta.activation-api
+
no.nav.foreldrepenger.felles
felles-log
@@ -50,11 +58,12 @@
org.apache.cxf
cxf-rt-ws-security
-
- jakarta.activation
- jakarta.activation-api
+ org.eclipse.jetty
+ jetty-server
+ provided
+
no.nav.foreldrepenger.felles
diff --git a/pom.xml b/pom.xml
index c5fec95fe..b05f24bcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
no.nav.foreldrepenger.felles
fp-bom
- 0.5.6
+ 0.6.0
felles-root
@@ -33,7 +33,7 @@
no.nav.foreldrepenger.felles
fp-bom
- 0.5.6
+ 0.6.0
import
pom
@@ -43,6 +43,12 @@
jose4j
0.9.3
+
+
+ org.hibernate
+ hibernate-micrometer
+ ${hibernate.version}
+
@@ -105,7 +111,7 @@
no.nav.k9.dev
dev-jakarta-transform
- 0.6.10
+ 0.6.11
ant-contrib