Jakarta EE 9.1 bygg. (#448)

navikt · Aug 27, 2023 · 093c4ac · 093c4ac
1 parent 8d213f7
commit 093c4ac
Show file tree

Hide file tree

Showing 54 changed files with 262 additions and 264 deletions.
diff --git a/kontekst/pom.xml b/kontekst/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>prosesstask-root</artifactId>
         <groupId>no.nav.vedtak.prosesstask</groupId>
-        <version>0.0.0-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>prosesstask-kontekst</artifactId>

diff --git a/...st/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstCdiProsessTaskDispatcher.java b/...st/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstCdiProsessTaskDispatcher.java
@@ -2,7 +2,7 @@
 
 import java.util.Set;
 
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.ApplicationScoped;
 
 import no.nav.vedtak.exception.IntegrasjonException;
 import no.nav.vedtak.exception.TekniskException;
@@ -21,7 +21,7 @@
  */
 @ApplicationScoped
 public class KontekstCdiProsessTaskDispatcher extends BasicCdiProsessTaskDispatcher {
-    private static final MdcExtendedLogContext LOG_CONTEXT = MdcExtendedLogContext.getContext("prosess"); 
+    private static final MdcExtendedLogContext LOG_CONTEXT = MdcExtendedLogContext.getContext("prosess");
 
     public KontekstCdiProsessTaskDispatcher() {
         super(Set.of(TekniskException.class, IntegrasjonException.class));
@@ -31,14 +31,14 @@ public KontekstCdiProsessTaskDispatcher() {
     public void dispatch(ProsessTaskData task) {
         try (ProsessTaskHandlerRef taskHandler = taskHandler(task.taskType())) {
             if (task.getSaksnummer() != null) {
-                LOG_CONTEXT.add("fagsak", task.getSaksnummer());  
+                LOG_CONTEXT.add("fagsak", task.getSaksnummer());
             } else if (task.getFagsakId() != null) { // NOSONAR
                 LOG_CONTEXT.add("fagsak", task.getFagsakId());  // NOSONAR
             }
             if (task.getBehandlingId() != null) {
-                LOG_CONTEXT.add("behandling", task.getBehandlingId());  
+                LOG_CONTEXT.add("behandling", task.getBehandlingId());
             } else if (task.getBehandlingUuid() != null) {
-                LOG_CONTEXT.add("behandling", task.getBehandlingUuid());  
+                LOG_CONTEXT.add("behandling", task.getBehandlingUuid());
             }
 
             taskHandler.doTask(task);

diff --git a/kontekst/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstSubjectProvider.java b/kontekst/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstSubjectProvider.java
@@ -2,7 +2,7 @@
 
 import java.util.Optional;
 
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
 
 import no.nav.foreldrepenger.konfig.Environment;
 import no.nav.vedtak.felles.prosesstask.impl.SubjectProvider;

diff --git a/kontekst/src/main/resources/META-INF/beans.xml b/kontekst/src/main/resources/META-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd" 
-	version="2.0" 
-	bean-discovery-mode="annotated">
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       version="3.0"
+       bean-discovery-mode="annotated">
 </beans>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>no.nav.vedtak.prosesstask</groupId>
 	<artifactId>prosesstask-root</artifactId>
-	<version>0.0.0-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Prosesstask :: Root</name>
@@ -53,11 +53,10 @@
 		<sonar.projectName>fp-prosesstask</sonar.projectName>
 		<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>
 
-		<felles.version>4.4.4</felles.version>
+		<felles.version>5.0.0</felles.version>
 
-        <jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
-        <jakarta.persistence.version>2.2.3</jakarta.persistence.version>
-        <hibernate-core.version>5.6.15.Final</hibernate-core.version>
+        <jakarta.jakartaee-bom.version>9.1.0</jakarta.jakartaee-bom.version>
+        <hibernate-core.version>6.1.7.Final</hibernate-core.version>
     </properties>
 
 	<repositories>
@@ -78,12 +77,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <!-- kan fjernes ved Jakarta EE 9/ oppgradering av jakarta.platform -->
-                <groupId>jakarta.persistence</groupId>
-                <artifactId>jakarta.persistence-api</artifactId>
-                <version>${jakarta.persistence.version}</version>
-            </dependency>
 
 			<dependency>
 				<groupId>no.nav.vedtak.prosesstask</groupId>
@@ -131,23 +124,28 @@
                 <artifactId>felles-abac</artifactId>
                 <version>${felles.version}</version>
             </dependency>
+            <dependency>
+                <groupId>no.nav.foreldrepenger.felles</groupId>
+                <artifactId>felles-testutilities</artifactId>
+                <version>${felles.version}</version>
+            </dependency>
 
             <!-- WELD BOM -->
             <dependency>
                 <groupId>org.jboss.weld</groupId>
                 <artifactId>weld-core-bom</artifactId>
-                <version>3.1.9.Final</version>
+                <version>4.0.3.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-core</artifactId>
                 <version>${hibernate-core.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-micrometer</artifactId>
                 <version>${hibernate-core.version}</version>
             </dependency>
@@ -156,7 +154,7 @@
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-bom</artifactId>
-                <version>2.3.6</version>
+                <version>3.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -165,7 +163,7 @@
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-bom</artifactId>
-                <version>10.0.15</version>
+                <version>11.0.15</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -199,7 +197,7 @@
 
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
-                <artifactId>swagger-annotations</artifactId>
+                <artifactId>swagger-annotations-jakarta</artifactId>
                 <version>2.2.15</version>
             </dependency>
 
@@ -225,12 +223,6 @@
                 <artifactId>postgresql</artifactId>
                 <version>42.6.0</version>
             </dependency>
-
-            <dependency>
-                <groupId>no.nav.foreldrepenger.felles</groupId>
-                <artifactId>felles-testutilities</artifactId>
-                <version>${felles.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.assertj</groupId>
                 <artifactId>assertj-core</artifactId>
@@ -239,7 +231,7 @@
             <dependency>
                 <groupId>ch.qos.logback</groupId>
                 <artifactId>logback-classic</artifactId>
-                <version>1.3.11</version>
+                <version>1.4.11</version>
             </dependency>
         </dependencies>
 	</dependencyManagement>

diff --git a/rest/pom.xml b/rest/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>no.nav.vedtak.prosesstask</groupId>
         <artifactId>prosesstask-root</artifactId>
-        <version>0.0.0-SNAPSHOT</version>
+        <version>0.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>prosesstask-rest-api</artifactId>
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
+            <artifactId>swagger-annotations-jakarta</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/ProsessTaskRestTjeneste.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/ProsessTaskRestTjeneste.java
@@ -3,17 +3,17 @@
 import java.net.HttpURLConnection;
 import java.util.List;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.transaction.Transactional;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...c/main/java/no/nav/vedtak/felles/prosesstask/rest/app/ProsessTaskApplikasjonTjeneste.java b/...c/main/java/no/nav/vedtak/felles/prosesstask/rest/app/ProsessTaskApplikasjonTjeneste.java
@@ -4,8 +4,8 @@
 import java.util.List;
 import java.util.Optional;
 
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
 
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskData;
 import no.nav.vedtak.felles.prosesstask.api.ProsessTaskStatus;

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/FeiletProsessTaskDataDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/FeiletProsessTaskDataDto.java
@@ -1,7 +1,7 @@
 package no.nav.vedtak.felles.prosesstask.rest.dto;
 
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
@@ -22,12 +22,12 @@ public class FeiletProsessTaskDataDto {
     @Size(max=100)
     @Pattern(regexp = "^[\\p{Alnum}_.\\-]*$")
     private String sisteKjøringServerProsess;
-    
+
     @JsonProperty(value="sisteFeilTekst")
     @Size(max=100_000)
     @Pattern(regexp = "^[\\p{Alnum}_.\\-]*$")
     private String sisteFeilTekst;
-    
+
     @JsonProperty(value="feiledeForsøk")
     private Integer feiledeForsøk;
 

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskDataDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskDataDto.java
@@ -3,9 +3,9 @@
 import java.time.LocalDateTime;
 import java.util.Properties;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskIdDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskIdDto.java
@@ -1,8 +1,8 @@
 package no.nav.vedtak.felles.prosesstask.rest.dto;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskOpprettInputDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskOpprettInputDto.java
@@ -2,10 +2,10 @@
 
 import java.util.Properties;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartInputDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartInputDto.java
@@ -1,10 +1,10 @@
 package no.nav.vedtak.felles.prosesstask.rest.dto;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

diff --git a/...rc/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartResultatDto.java b/...rc/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartResultatDto.java
@@ -2,8 +2,8 @@
 
 import java.time.LocalDateTime;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

diff --git a/...c/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRetryAllResultatDto.java b/...c/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRetryAllResultatDto.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

diff --git a/...src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskSetFerdigInputDto.java b/...src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskSetFerdigInputDto.java
@@ -1,10 +1,10 @@
 package no.nav.vedtak.felles.prosesstask.rest.dto;
 
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

diff --git a/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskStatusDto.java b/rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskStatusDto.java
@@ -1,8 +1,8 @@
 package no.nav.vedtak.felles.prosesstask.rest.dto;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;