chore: fjerner ubrukte interface fra felles-log, bump jetty og swagger (

#751) * chore: fjerner ubrukte interface fra felles-log * Bump swagger-annotations og jetty
navikt · Dec 12, 2024 · 2c408e3 · 2c408e3
1 parent d62cca0
commit 2c408e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
 
         <jakarta.jakartaee-bom.version>10.0.0</jakarta.jakartaee-bom.version>
         <hibernate-core.version>6.6.3.Final</hibernate-core.version>
-        <jetty.version>12.0.15</jetty.version>
+        <jetty.version>12.0.16</jetty.version>
         <flyway.version>11.0.1</flyway.version>
     </properties>
 
@@ -218,7 +218,7 @@
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-annotations-jakarta</artifactId>
-                <version>2.2.26</version>
+                <version>2.2.27</version>
             </dependency>
 
             <dependency>

diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/BatchTaskScheduler.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/BatchTaskScheduler.java
@@ -2,24 +2,23 @@
 
 import java.time.LocalDateTime;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.context.control.ActivateRequestContext;
 import jakarta.inject.Inject;
 import jakarta.transaction.Transactional;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskStatus;
-import no.nav.vedtak.log.metrics.Controllable;
+import no.nav.vedtak.server.Controllable;
 
 /**
  * Starter tasks med cron-expression hvis disse ikke har noen status fra før av.
  */
 @ApplicationScoped
 @ActivateRequestContext
 @Transactional
-public class BatchTaskScheduler implements no.nav.vedtak.server.Controllable, Controllable {
+public class BatchTaskScheduler implements Controllable {
 
     private static final Logger LOG = LoggerFactory.getLogger(BatchTaskScheduler.class);
     private TaskManagerRepositoryImpl taskRepository;

diff --git a/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManager.java b/task/src/main/java/no/nav/vedtak/felles/prosesstask/impl/TaskManager.java
@@ -41,13 +41,13 @@
 import no.nav.vedtak.felles.prosesstask.api.TaskMonitor;
 import no.nav.vedtak.felles.prosesstask.api.TaskType;
 import no.nav.vedtak.felles.prosesstask.impl.util.OtelUtil;
-import no.nav.vedtak.log.metrics.Controllable;
+import no.nav.vedtak.server.Controllable;
 
 /**
  * Main class handling polling tasks and dispatching these.
  */
 @ApplicationScoped
-public class TaskManager implements no.nav.vedtak.server.Controllable, Controllable {
+public class TaskManager implements Controllable {
 
     public static final String TASK_MANAGER_POLLING_WAIT = "task.manager.polling.wait";
     public static final String TASK_MANAGER_POLLING_DELAY = "task.manager.polling.delay";