Bom 320, Jakarta EL for EE10 (#1161)

navikt · Apr 12, 2024 · 23ded0f · 23ded0f
1 parent 332e960
commit 23ded0f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 38 deletions.
diff --git a/domene/pom.xml b/domene/pom.xml
@@ -96,8 +96,8 @@
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish</groupId>
-			<artifactId>jakarta.el</artifactId>
+			<groupId>org.glassfish.expressly</groupId>
+			<artifactId>expressly</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>no.nav.foreldrepenger.felles.integrasjon</groupId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>no.nav.foreldrepenger.felles</groupId>
         <artifactId>fp-bom</artifactId>
-        <version>3.1.3</version>
+        <version>3.2.0</version>
     </parent>
 
     <groupId>no.nav.foreldrepenger.abonnent</groupId>
@@ -25,24 +25,24 @@
         <sonar.projectName>fp-abonnent</sonar.projectName>
         <sonar.projectKey>navikt_fpabonnent</sonar.projectKey>
 
-        <felles.version>7.1.0</felles.version>
+        <felles.version>7.1.2</felles.version>
 
-        <prosesstask.version>5.0.7</prosesstask.version>
+        <prosesstask.version>5.0.8</prosesstask.version>
 
-        <fp-kontrakter.version>9.1.8</fp-kontrakter.version>
+        <fp-kontrakter.version>9.1.12</fp-kontrakter.version>
 
         <!-- Eksterne -->
         <avro.version>1.11.3</avro.version>
 
-        <confluent.version>7.6.0</confluent.version>
+        <confluent.version>7.6.1</confluent.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>no.nav.foreldrepenger.felles</groupId>
                 <artifactId>fp-bom</artifactId>
-                <version>3.1.3</version>
+                <version>3.2.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/web/pom.xml b/web/pom.xml
@@ -65,6 +65,10 @@
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
 		</dependency>
+        <dependency>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+        </dependency>
 
 		<!-- Database -->
 		<dependency>
@@ -88,28 +92,6 @@
             <artifactId>hibernate-micrometer</artifactId>
         </dependency>
 
-		<!-- Metrics, helse- og selftest -->
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_dropwizard</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_servlet</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_hotspot</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.prometheus</groupId>
-			<artifactId>simpleclient_common</artifactId>
-		</dependency>
-
 		<!-- Swagger -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>

diff --git a/...main/java/no/nav/foreldrepenger/abonnent/web/app/tjenester/ApplicationServiceStarter.java b/...main/java/no/nav/foreldrepenger/abonnent/web/app/tjenester/ApplicationServiceStarter.java
@@ -7,15 +7,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Any;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.prometheus.client.hotspot.DefaultExports;
 import no.nav.vedtak.log.metrics.Controllable;
 
 @ApplicationScoped
@@ -42,9 +40,6 @@ public ApplicationServiceStarter(@Any Instance<Controllable> services) {
     }
 
     public void startServices() {
-        // Prometheus
-        DefaultExports.initialize();
-
         // Services
         LOGGER.info("Starter {} services", services.size());
         CompletableFuture.allOf(services.stream().map(service -> runAsync(service::start)).toArray(CompletableFuture[]::new)).join();