Skip to content

Commit 093c4ac

Browse files
mrsladekmrsladek
authored
Jakarta EE 9.1 bygg. (#448)
1 parent 8d213f7 commit 093c4ac

File tree

54 files changed

+262
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+262
-264
lines changed

‎kontekst/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>prosesstask-root</artifactId>
88
<groupId>no.nav.vedtak.prosesstask</groupId>
9-
<version>0.0.0-SNAPSHOT</version>
9+
<version>0.5.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>prosesstask-kontekst</artifactId>

‎kontekst/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstCdiProsessTaskDispatcher.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Set;
44

5-
import javax.enterprise.context.ApplicationScoped;
5+
import jakarta.enterprise.context.ApplicationScoped;
66

77
import no.nav.vedtak.exception.IntegrasjonException;
88
import no.nav.vedtak.exception.TekniskException;
@@ -21,7 +21,7 @@
2121
*/
2222
@ApplicationScoped
2323
public class KontekstCdiProsessTaskDispatcher extends BasicCdiProsessTaskDispatcher {
24-
private static final MdcExtendedLogContext LOG_CONTEXT = MdcExtendedLogContext.getContext("prosess");
24+
private static final MdcExtendedLogContext LOG_CONTEXT = MdcExtendedLogContext.getContext("prosess");
2525

2626
public KontekstCdiProsessTaskDispatcher() {
2727
super(Set.of(TekniskException.class, IntegrasjonException.class));
@@ -31,14 +31,14 @@ public KontekstCdiProsessTaskDispatcher() {
3131
public void dispatch(ProsessTaskData task) {
3232
try (ProsessTaskHandlerRef taskHandler = taskHandler(task.taskType())) {
3333
if (task.getSaksnummer() != null) {
34-
LOG_CONTEXT.add("fagsak", task.getSaksnummer());
34+
LOG_CONTEXT.add("fagsak", task.getSaksnummer());
3535
} else if (task.getFagsakId() != null) { // NOSONAR
3636
LOG_CONTEXT.add("fagsak", task.getFagsakId()); // NOSONAR
3737
}
3838
if (task.getBehandlingId() != null) {
39-
LOG_CONTEXT.add("behandling", task.getBehandlingId());
39+
LOG_CONTEXT.add("behandling", task.getBehandlingId());
4040
} else if (task.getBehandlingUuid() != null) {
41-
LOG_CONTEXT.add("behandling", task.getBehandlingUuid());
41+
LOG_CONTEXT.add("behandling", task.getBehandlingUuid());
4242
}
4343

4444
taskHandler.doTask(task);

‎kontekst/src/main/java/no/nav/vedtak/prosesstask/kontekst/KontekstSubjectProvider.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.Optional;
44

5-
import javax.enterprise.context.Dependent;
5+
import jakarta.enterprise.context.Dependent;
66

77
import no.nav.foreldrepenger.konfig.Environment;
88
import no.nav.vedtak.felles.prosesstask.impl.SubjectProvider;

‎kontekst/src/main/resources/META-INF/beans.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
4-
version="2.0"
5-
bean-discovery-mode="annotated">
2+
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
4+
version="3.0"
5+
bean-discovery-mode="annotated">
66
</beans>

‎pom.xml

+16-24
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>no.nav.vedtak.prosesstask</groupId>
88
<artifactId>prosesstask-root</artifactId>
9-
<version>0.0.0-SNAPSHOT</version>
9+
<version>0.5.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>Prosesstask :: Root</name>
@@ -53,11 +53,10 @@
5353
<sonar.projectName>fp-prosesstask</sonar.projectName>
5454
<sonar.projectKey>navikt_fp-prosesstask</sonar.projectKey>
5555

56-
<felles.version>4.4.4</felles.version>
56+
<felles.version>5.0.0</felles.version>
5757

58-
<jakarta.jakartaee-bom.version>8.0.0</jakarta.jakartaee-bom.version>
59-
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
60-
<hibernate-core.version>5.6.15.Final</hibernate-core.version>
58+
<jakarta.jakartaee-bom.version>9.1.0</jakarta.jakartaee-bom.version>
59+
<hibernate-core.version>6.1.7.Final</hibernate-core.version>
6160
</properties>
6261

6362
<repositories>
@@ -78,12 +77,6 @@
7877
<scope>import</scope>
7978
<type>pom</type>
8079
</dependency>
81-
<dependency>
82-
<!-- kan fjernes ved Jakarta EE 9/ oppgradering av jakarta.platform -->
83-
<groupId>jakarta.persistence</groupId>
84-
<artifactId>jakarta.persistence-api</artifactId>
85-
<version>${jakarta.persistence.version}</version>
86-
</dependency>
8780

8881
<dependency>
8982
<groupId>no.nav.vedtak.prosesstask</groupId>
@@ -131,23 +124,28 @@
131124
<artifactId>felles-abac</artifactId>
132125
<version>${felles.version}</version>
133126
</dependency>
127+
<dependency>
128+
<groupId>no.nav.foreldrepenger.felles</groupId>
129+
<artifactId>felles-testutilities</artifactId>
130+
<version>${felles.version}</version>
131+
</dependency>
134132

135133
<!-- WELD BOM -->
136134
<dependency>
137135
<groupId>org.jboss.weld</groupId>
138136
<artifactId>weld-core-bom</artifactId>
139-
<version>3.1.9.Final</version>
137+
<version>4.0.3.Final</version>
140138
<scope>import</scope>
141139
<type>pom</type>
142140
</dependency>
143141

144142
<dependency>
145-
<groupId>org.hibernate</groupId>
143+
<groupId>org.hibernate.orm</groupId>
146144
<artifactId>hibernate-core</artifactId>
147145
<version>${hibernate-core.version}</version>
148146
</dependency>
149147
<dependency>
150-
<groupId>org.hibernate</groupId>
148+
<groupId>org.hibernate.orm</groupId>
151149
<artifactId>hibernate-micrometer</artifactId>
152150
<version>${hibernate-core.version}</version>
153151
</dependency>
@@ -156,7 +154,7 @@
156154
<dependency>
157155
<groupId>org.glassfish.jaxb</groupId>
158156
<artifactId>jaxb-bom</artifactId>
159-
<version>2.3.6</version>
157+
<version>3.0.1</version>
160158
<scope>import</scope>
161159
<type>pom</type>
162160
</dependency>
@@ -165,7 +163,7 @@
165163
<dependency>
166164
<groupId>org.eclipse.jetty</groupId>
167165
<artifactId>jetty-bom</artifactId>
168-
<version>10.0.15</version>
166+
<version>11.0.15</version>
169167
<scope>import</scope>
170168
<type>pom</type>
171169
</dependency>
@@ -199,7 +197,7 @@
199197

200198
<dependency>
201199
<groupId>io.swagger.core.v3</groupId>
202-
<artifactId>swagger-annotations</artifactId>
200+
<artifactId>swagger-annotations-jakarta</artifactId>
203201
<version>2.2.15</version>
204202
</dependency>
205203

@@ -225,12 +223,6 @@
225223
<artifactId>postgresql</artifactId>
226224
<version>42.6.0</version>
227225
</dependency>
228-
229-
<dependency>
230-
<groupId>no.nav.foreldrepenger.felles</groupId>
231-
<artifactId>felles-testutilities</artifactId>
232-
<version>${felles.version}</version>
233-
</dependency>
234226
<dependency>
235227
<groupId>org.assertj</groupId>
236228
<artifactId>assertj-core</artifactId>
@@ -239,7 +231,7 @@
239231
<dependency>
240232
<groupId>ch.qos.logback</groupId>
241233
<artifactId>logback-classic</artifactId>
242-
<version>1.3.11</version>
234+
<version>1.4.11</version>
243235
</dependency>
244236
</dependencies>
245237
</dependencyManagement>

‎rest/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>no.nav.vedtak.prosesstask</groupId>
88
<artifactId>prosesstask-root</artifactId>
9-
<version>0.0.0-SNAPSHOT</version>
9+
<version>0.5.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>prosesstask-rest-api</artifactId>
@@ -42,7 +42,7 @@
4242

4343
<dependency>
4444
<groupId>io.swagger.core.v3</groupId>
45-
<artifactId>swagger-annotations</artifactId>
45+
<artifactId>swagger-annotations-jakarta</artifactId>
4646
<scope>provided</scope>
4747
</dependency>
4848
</dependencies>

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/ProsessTaskRestTjeneste.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
import java.net.HttpURLConnection;
44
import java.util.List;
55

6-
import javax.enterprise.context.RequestScoped;
7-
import javax.inject.Inject;
8-
import javax.transaction.Transactional;
9-
import javax.validation.Valid;
10-
import javax.validation.constraints.NotNull;
11-
import javax.ws.rs.Consumes;
12-
import javax.ws.rs.POST;
13-
import javax.ws.rs.Path;
14-
import javax.ws.rs.Produces;
15-
import javax.ws.rs.core.MediaType;
16-
import javax.ws.rs.core.Response;
6+
import jakarta.enterprise.context.RequestScoped;
7+
import jakarta.inject.Inject;
8+
import jakarta.transaction.Transactional;
9+
import jakarta.validation.Valid;
10+
import jakarta.validation.constraints.NotNull;
11+
import jakarta.ws.rs.Consumes;
12+
import jakarta.ws.rs.POST;
13+
import jakarta.ws.rs.Path;
14+
import jakarta.ws.rs.Produces;
15+
import jakarta.ws.rs.core.MediaType;
16+
import jakarta.ws.rs.core.Response;
1717

1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/app/ProsessTaskApplikasjonTjeneste.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.List;
55
import java.util.Optional;
66

7-
import javax.enterprise.context.Dependent;
8-
import javax.inject.Inject;
7+
import jakarta.enterprise.context.Dependent;
8+
import jakarta.inject.Inject;
99

1010
import no.nav.vedtak.felles.prosesstask.api.ProsessTaskData;
1111
import no.nav.vedtak.felles.prosesstask.api.ProsessTaskStatus;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/FeiletProsessTaskDataDto.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package no.nav.vedtak.felles.prosesstask.rest.dto;
22

3-
import javax.validation.constraints.Pattern;
4-
import javax.validation.constraints.Size;
3+
import jakarta.validation.constraints.Pattern;
4+
import jakarta.validation.constraints.Size;
55

66
import com.fasterxml.jackson.annotation.JsonAutoDetect;
77
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
@@ -22,12 +22,12 @@ public class FeiletProsessTaskDataDto {
2222
@Size(max=100)
2323
@Pattern(regexp = "^[\\p{Alnum}_.\\-]*$")
2424
private String sisteKjøringServerProsess;
25-
25+
2626
@JsonProperty(value="sisteFeilTekst")
2727
@Size(max=100_000)
2828
@Pattern(regexp = "^[\\p{Alnum}_.\\-]*$")
2929
private String sisteFeilTekst;
30-
30+
3131
@JsonProperty(value="feiledeForsøk")
3232
private Integer feiledeForsøk;
3333

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskDataDto.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.time.LocalDateTime;
44
import java.util.Properties;
55

6-
import javax.validation.Valid;
7-
import javax.validation.constraints.Pattern;
8-
import javax.validation.constraints.Size;
6+
import jakarta.validation.Valid;
7+
import jakarta.validation.constraints.Pattern;
8+
import jakarta.validation.constraints.Size;
99

1010
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1111
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskIdDto.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.vedtak.felles.prosesstask.rest.dto;
22

3-
import javax.validation.constraints.Max;
4-
import javax.validation.constraints.Min;
5-
import javax.validation.constraints.NotNull;
3+
import jakarta.validation.constraints.Max;
4+
import jakarta.validation.constraints.Min;
5+
import jakarta.validation.constraints.NotNull;
66

77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskOpprettInputDto.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.util.Properties;
44

5-
import javax.validation.Valid;
6-
import javax.validation.constraints.NotNull;
7-
import javax.validation.constraints.Pattern;
8-
import javax.validation.constraints.Size;
5+
import jakarta.validation.Valid;
6+
import jakarta.validation.constraints.NotNull;
7+
import jakarta.validation.constraints.Pattern;
8+
import jakarta.validation.constraints.Size;
99

1010
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1111
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartInputDto.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package no.nav.vedtak.felles.prosesstask.rest.dto;
22

3-
import javax.validation.constraints.Max;
4-
import javax.validation.constraints.Min;
5-
import javax.validation.constraints.NotNull;
6-
import javax.validation.constraints.Pattern;
7-
import javax.validation.constraints.Size;
3+
import jakarta.validation.constraints.Max;
4+
import jakarta.validation.constraints.Min;
5+
import jakarta.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.Pattern;
7+
import jakarta.validation.constraints.Size;
88

99
import com.fasterxml.jackson.annotation.JsonAlias;
1010
import com.fasterxml.jackson.annotation.JsonAutoDetect;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRestartResultatDto.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.time.LocalDateTime;
44

5-
import javax.validation.constraints.NotNull;
6-
import javax.validation.constraints.Pattern;
5+
import jakarta.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.Pattern;
77

88
import com.fasterxml.jackson.annotation.JsonAutoDetect;
99
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskRetryAllResultatDto.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import javax.validation.Valid;
7-
import javax.validation.constraints.NotNull;
6+
import jakarta.validation.Valid;
7+
import jakarta.validation.constraints.NotNull;
88

99
import com.fasterxml.jackson.annotation.JsonAutoDetect;
1010
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskSetFerdigInputDto.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package no.nav.vedtak.felles.prosesstask.rest.dto;
22

3-
import javax.validation.constraints.Max;
4-
import javax.validation.constraints.Min;
5-
import javax.validation.constraints.NotNull;
6-
import javax.validation.constraints.Pattern;
7-
import javax.validation.constraints.Size;
3+
import jakarta.validation.constraints.Max;
4+
import jakarta.validation.constraints.Min;
5+
import jakarta.validation.constraints.NotNull;
6+
import jakarta.validation.constraints.Pattern;
7+
import jakarta.validation.constraints.Size;
88

99
import com.fasterxml.jackson.annotation.JsonAlias;
1010
import com.fasterxml.jackson.annotation.JsonAutoDetect;

‎rest/src/main/java/no/nav/vedtak/felles/prosesstask/rest/dto/ProsessTaskStatusDto.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package no.nav.vedtak.felles.prosesstask.rest.dto;
22

3-
import javax.validation.constraints.NotNull;
4-
import javax.validation.constraints.Pattern;
5-
import javax.validation.constraints.Size;
3+
import jakarta.validation.constraints.NotNull;
4+
import jakarta.validation.constraints.Pattern;
5+
import jakarta.validation.constraints.Size;
66

77
import com.fasterxml.jackson.annotation.JsonAutoDetect;
88
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;

0 commit comments

Comments
 (0)