diff --git a/domene/pom.xml b/domene/pom.xml index 41eeb9e3..08c32386 100644 --- a/domene/pom.xml +++ b/domene/pom.xml @@ -96,8 +96,8 @@ hibernate-validator - org.glassfish - jakarta.el + org.glassfish.expressly + expressly no.nav.foreldrepenger.felles.integrasjon diff --git a/pom.xml b/pom.xml index 1ff8621c..d1d6c21f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ no.nav.foreldrepenger.felles fp-bom - 3.1.3 + 3.2.0 no.nav.foreldrepenger.abonnent @@ -25,16 +25,16 @@ fp-abonnent navikt_fpabonnent - 7.1.0 + 7.1.2 - 5.0.7 + 5.0.8 - 9.1.8 + 9.1.12 1.11.3 - 7.6.0 + 7.6.1 @@ -42,7 +42,7 @@ no.nav.foreldrepenger.felles fp-bom - 3.1.3 + 3.2.0 import pom diff --git a/web/pom.xml b/web/pom.xml index 10b1f883..745294ad 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -65,6 +65,10 @@ org.glassfish.jersey.inject jersey-hk2 + + org.glassfish.expressly + expressly + @@ -88,28 +92,6 @@ hibernate-micrometer - - - io.prometheus - simpleclient_dropwizard - - - io.prometheus - simpleclient_servlet - - - io.prometheus - simpleclient_hotspot - - - io.prometheus - simpleclient - - - io.prometheus - simpleclient_common - - io.swagger.core.v3 diff --git a/web/src/main/java/no/nav/foreldrepenger/abonnent/web/app/tjenester/ApplicationServiceStarter.java b/web/src/main/java/no/nav/foreldrepenger/abonnent/web/app/tjenester/ApplicationServiceStarter.java index d2c87866..7374d3ae 100644 --- a/web/src/main/java/no/nav/foreldrepenger/abonnent/web/app/tjenester/ApplicationServiceStarter.java +++ b/web/src/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 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();