diff --git a/felles/abac-kontekst/src/main/java/no/nav/foreldrepenger/sikkerhet/abac/KontekstTokenProvider.java b/felles/abac-kontekst/src/main/java/no/nav/foreldrepenger/sikkerhet/abac/KontekstTokenProvider.java index 411742da0..eeb89b96f 100644 --- a/felles/abac-kontekst/src/main/java/no/nav/foreldrepenger/sikkerhet/abac/KontekstTokenProvider.java +++ b/felles/abac-kontekst/src/main/java/no/nav/foreldrepenger/sikkerhet/abac/KontekstTokenProvider.java @@ -1,6 +1,6 @@ package no.nav.foreldrepenger.sikkerhet.abac; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; import no.nav.vedtak.sikkerhet.abac.TokenProvider; import no.nav.vedtak.sikkerhet.kontekst.DefaultRequestKontekstProvider; diff --git a/felles/abac-kontekst/src/main/resources/META-INF/beans.xml b/felles/abac-kontekst/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/abac-kontekst/src/main/resources/META-INF/beans.xml +++ b/felles/abac-kontekst/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacAuditlogger.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacAuditlogger.java index d3d95ee75..1c31f06fc 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacAuditlogger.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacAuditlogger.java @@ -24,8 +24,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import no.nav.vedtak.log.audit.Auditdata; import no.nav.vedtak.log.audit.AuditdataHeader; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessurs.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessurs.java index c81772ca7..a3bcacfa1 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessurs.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessurs.java @@ -6,9 +6,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.interceptor.InterceptorBinding; -import javax.ws.rs.NameBinding; +import jakarta.enterprise.util.Nonbinding; +import jakarta.interceptor.InterceptorBinding; +import jakarta.ws.rs.NameBinding; import no.nav.vedtak.sikkerhet.abac.beskyttet.ActionType; import no.nav.vedtak.sikkerhet.abac.beskyttet.AvailabilityType; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptor.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptor.java index ad0c9771d..1bdbc2584 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptor.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptor.java @@ -5,12 +5,12 @@ import java.util.Collection; import java.util.Optional; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; import org.jboss.weld.interceptor.util.proxy.TargetInstanceProxy; import org.slf4j.Logger; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java index 34fbaa32a..4b7caf1aa 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java @@ -5,9 +5,9 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Default; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Default; +import jakarta.inject.Inject; import no.nav.foreldrepenger.konfig.Cluster; import no.nav.foreldrepenger.konfig.Environment; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenter.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenter.java index a7de7dfac..343a3be65 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenter.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenter.java @@ -2,8 +2,8 @@ import java.lang.reflect.Method; -import javax.jws.WebMethod; -import javax.ws.rs.Path; +import jakarta.jws.WebMethod; +import jakarta.ws.rs.Path; import no.nav.vedtak.sikkerhet.abac.beskyttet.ServiceType; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/AbacPipDto.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/AbacPipDto.java index 421037c98..2d8ec9bb7 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/AbacPipDto.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/AbacPipDto.java @@ -2,7 +2,7 @@ import java.util.Set; -import javax.validation.Valid; +import jakarta.validation.Valid; public record AbacPipDto(@Valid Set aktørIder, PipFagsakStatus fagsakStatus, PipBehandlingStatus behandlingStatus) { } diff --git "a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/PipAkt\303\270rId.java" "b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/PipAkt\303\270rId.java" index 1f7e4525e..7fb5dfd11 100644 --- "a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/PipAkt\303\270rId.java" +++ "b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/pipdata/PipAkt\303\270rId.java" @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.regex.Pattern; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonValue; @@ -21,7 +21,7 @@ public class PipAktørId implements Serializable, Comparable, Ressu @JsonValue @NotNull - @javax.validation.constraints.Pattern(regexp = VALID_REGEXP, message = "aktørId ${validatedValue} har ikke gyldig verdi (pattern '{regexp}')") + @jakarta.validation.constraints.Pattern(regexp = VALID_REGEXP, message = "aktørId ${validatedValue} har ikke gyldig verdi (pattern '{regexp}')") private String aktørId; public PipAktørId(Long aktørId) { diff --git "a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/\303\205penRessurs.java" "b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/\303\205penRessurs.java" index d8d0ea121..be74a90a2 100644 --- "a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/\303\205penRessurs.java" +++ "b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/abac/\303\205penRessurs.java" @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.NameBinding; +import jakarta.ws.rs.NameBinding; @Inherited @Retention(RetentionPolicy.RUNTIME) diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpConsumerImpl.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpConsumerImpl.java index 590096bb0..6eb6f3215 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpConsumerImpl.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpConsumerImpl.java @@ -11,8 +11,8 @@ import java.time.Duration; import java.util.Base64; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java index 4b7e928d4..34ab726f4 100644 --- a/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java +++ b/felles/abac/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/felles/abac/src/main/resources/META-INF/beans.xml b/felles/abac/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/abac/src/main/resources/META-INF/beans.xml +++ b/felles/abac/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/DummyRequestBuilder.java b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/DummyRequestBuilder.java index 1cc5b1e9a..a328850ad 100644 --- a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/DummyRequestBuilder.java +++ b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/DummyRequestBuilder.java @@ -1,8 +1,8 @@ package no.nav.vedtak.sikkerhet.abac; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Alternative; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.Alternative; import no.nav.vedtak.sikkerhet.abac.pdp.AppRessursData; diff --git a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenterTest.java b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenterTest.java index 4e5eed49a..6fdfb85a5 100644 --- a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenterTest.java +++ b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/ActionUthenterTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.ws.rs.Path; +import jakarta.jws.WebMethod; +import jakarta.jws.WebService; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Test; diff --git a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/BeskyttetRessursInterceptorTest.java b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/BeskyttetRessursInterceptorTest.java index 8ecab2063..679b1f5ca 100644 --- a/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/BeskyttetRessursInterceptorTest.java +++ b/felles/abac/src/test/java/no/nav/vedtak/sikkerhet/abac/internal/BeskyttetRessursInterceptorTest.java @@ -18,8 +18,8 @@ import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import javax.interceptor.InvocationContext; -import javax.ws.rs.Path; +import jakarta.interceptor.InvocationContext; +import jakarta.ws.rs.Path; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/felles/abac/src/test/resources/META-INF/beans.xml b/felles/abac/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/abac/src/test/resources/META-INF/beans.xml +++ b/felles/abac/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/auth-filter/src/main/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegate.java b/felles/auth-filter/src/main/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegate.java index 8a754de6b..2673adc7c 100644 --- a/felles/auth-filter/src/main/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegate.java +++ b/felles/auth-filter/src/main/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegate.java @@ -4,12 +4,12 @@ import java.time.Instant; import java.util.Optional; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.Cookie; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/felles/auth-filter/src/main/resources/META-INF/beans.xml b/felles/auth-filter/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/auth-filter/src/main/resources/META-INF/beans.xml +++ b/felles/auth-filter/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/auth-filter/src/test/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegateTest.java b/felles/auth-filter/src/test/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegateTest.java index 64ef450eb..6904ce1b3 100644 --- a/felles/auth-filter/src/test/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegateTest.java +++ b/felles/auth-filter/src/test/java/no/nav/vedtak/sikkerhet/jaxrs/AuthenticationFilterDelegateTest.java @@ -8,10 +8,10 @@ import java.util.Map; import javax.security.auth.Subject; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ResourceInfo; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.container.ContainerRequestContext; +import jakarta.ws.rs.container.ResourceInfo; import org.jose4j.json.JsonUtil; import org.jose4j.jwt.NumericDate; diff --git a/felles/db/pom.xml b/felles/db/pom.xml index 83067f64d..eee4311cb 100644 --- a/felles/db/pom.xml +++ b/felles/db/pom.xml @@ -32,12 +32,12 @@ felles-feil - org.hibernate + org.hibernate.orm hibernate-core provided - org.hibernate + org.hibernate.orm hibernate-micrometer provided diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/DelegatingPersistenceUnitDescriptor.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/DelegatingPersistenceUnitDescriptor.java index bce0f1bd5..14f2cde54 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/DelegatingPersistenceUnitDescriptor.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/DelegatingPersistenceUnitDescriptor.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/EntityManagerProducer.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/EntityManagerProducer.java index 351028ae0..2ec075333 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/EntityManagerProducer.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/EntityManagerProducer.java @@ -5,15 +5,15 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.FlushModeType; -import javax.persistence.Persistence; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Disposes; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.Persistence; import org.hibernate.SessionFactory; import org.hibernate.jpa.QueryHints; diff --git "a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/HibernateVerkt\303\270y.java" "b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/HibernateVerkt\303\270y.java" index 33532a689..f17b0dade 100644 --- "a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/HibernateVerkt\303\270y.java" +++ "b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/HibernateVerkt\303\270y.java" @@ -5,7 +5,7 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.persistence.TypedQuery; +import jakarta.persistence.TypedQuery; import no.nav.vedtak.exception.TekniskException; diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/PersistenceUnitInfoDescriptorAdapter.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/PersistenceUnitInfoDescriptorAdapter.java index 6e404a3c9..52f209ecf 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/PersistenceUnitInfoDescriptorAdapter.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/PersistenceUnitInfoDescriptorAdapter.java @@ -4,10 +4,10 @@ import java.util.List; import java.util.Properties; -import javax.persistence.SharedCacheMode; -import javax.persistence.ValidationMode; -import javax.persistence.spi.PersistenceUnitInfo; -import javax.persistence.spi.PersistenceUnitTransactionType; +import jakarta.persistence.SharedCacheMode; +import jakarta.persistence.ValidationMode; +import jakarta.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.spi.PersistenceUnitTransactionType; import org.hibernate.bytecode.enhance.spi.EnhancementContext; import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionHandler.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionHandler.java index 204f1bcd3..b66db7644 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionHandler.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionHandler.java @@ -1,7 +1,7 @@ package no.nav.vedtak.felles.jpa; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import no.nav.vedtak.felles.jpa.savepoint.SavepointRolledbackException; diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionInterceptor.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionInterceptor.java index 40fc321db..7d65a8cfb 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionInterceptor.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/TransactionInterceptor.java @@ -1,13 +1,13 @@ package no.nav.vedtak.felles.jpa; -import javax.annotation.Priority; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.spi.CDI; -import javax.interceptor.AroundInvoke; -import javax.interceptor.Interceptor; -import javax.interceptor.InvocationContext; -import javax.persistence.EntityManager; -import javax.transaction.Transactional; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.interceptor.AroundInvoke; +import jakarta.interceptor.Interceptor; +import jakarta.interceptor.InvocationContext; +import jakarta.persistence.EntityManager; +import jakarta.transaction.Transactional; /** * Interceptor som kobler {@link Transactional} annotasjon til oppsett og commit/rollback av en databasetransaksjon. diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/VLPersistenceUnitProvider.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/VLPersistenceUnitProvider.java index eec89e5e8..336ced143 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/VLPersistenceUnitProvider.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/VLPersistenceUnitProvider.java @@ -19,9 +19,9 @@ import java.util.jar.JarFile; import java.util.regex.Pattern; -import javax.persistence.PersistenceException; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceUnitInfo; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceUnitInfo; import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/BooleanToStringConverter.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/BooleanToStringConverter.java index 46aa6844f..123314b30 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/BooleanToStringConverter.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/BooleanToStringConverter.java @@ -2,8 +2,8 @@ import java.util.Optional; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * JPA konverterer for å skrive J/N for boolske verdier. diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/PropertiesToStringConverter.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/PropertiesToStringConverter.java index 0e1c916a3..8887dd65e 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/PropertiesToStringConverter.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/converters/PropertiesToStringConverter.java @@ -5,8 +5,8 @@ import java.io.StringWriter; import java.util.Properties; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; /** * JPA konverterer for å skrive ned en key=value text til et databasefelt (output tilsvarer java.util.Properties diff --git a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/savepoint/RunWithSavepoint.java b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/savepoint/RunWithSavepoint.java index 1821e85e0..40a537d8f 100644 --- a/felles/db/src/main/java/no/nav/vedtak/felles/jpa/savepoint/RunWithSavepoint.java +++ b/felles/db/src/main/java/no/nav/vedtak/felles/jpa/savepoint/RunWithSavepoint.java @@ -4,7 +4,7 @@ import java.sql.SQLException; import java.util.Objects; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.hibernate.Session; import org.hibernate.jdbc.ReturningWork; diff --git a/felles/db/src/main/resources/META-INF/beans.xml b/felles/db/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/db/src/main/resources/META-INF/beans.xml +++ b/felles/db/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/db/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider b/felles/db/src/main/resources/META-INF/services/jakarta.persistence.spi.PersistenceProvider similarity index 100% rename from felles/db/src/main/resources/META-INF/services/javax.persistence.spi.PersistenceProvider rename to felles/db/src/main/resources/META-INF/services/jakarta.persistence.spi.PersistenceProvider diff --git a/felles/klient/src/main/resources/META-INF/beans.xml b/felles/klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/klient/src/main/resources/META-INF/beans.xml +++ b/felles/klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java b/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java index 8f7d7fdb6..8f638ba65 100644 --- a/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java +++ b/felles/log/src/main/java/no/nav/vedtak/log/audit/Auditlogger.java @@ -1,7 +1,7 @@ package no.nav.vedtak.log.audit; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/felles/log/src/main/resources/META-INF/beans.xml b/felles/log/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/log/src/main/resources/META-INF/beans.xml +++ b/felles/log/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/oidc/src/main/resources/META-INF/beans.xml b/felles/oidc/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/oidc/src/main/resources/META-INF/beans.xml +++ b/felles/oidc/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/oidc/src/test/resources/META-INF/beans.xml b/felles/oidc/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/oidc/src/test/resources/META-INF/beans.xml +++ b/felles/oidc/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/sikkerhet/pom.xml b/felles/sikkerhet/pom.xml index c0bcb5878..d0d33baa5 100644 --- a/felles/sikkerhet/pom.xml +++ b/felles/sikkerhet/pom.xml @@ -41,8 +41,8 @@ jakarta.ws.rs-api - jakarta.security.auth.message - jakarta.security.auth.message-api + jakarta.authentication + jakarta.authentication-api org.eclipse.jetty @@ -51,8 +51,8 @@ org.eclipse.jetty - jetty-jaspi - runtime + jetty-security + provided jakarta.interceptor diff --git a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/DelegatedProtectedResource.java b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/DelegatedProtectedResource.java index a131dafda..dffd56d18 100644 --- a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/DelegatedProtectedResource.java +++ b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/DelegatedProtectedResource.java @@ -2,8 +2,8 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.message.AuthStatus; -import javax.servlet.http.HttpServletRequest; +import jakarta.security.auth.message.AuthStatus; +import jakarta.servlet.http.HttpServletRequest; import java.util.Optional; diff --git a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModule.java b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModule.java index ec0494948..2b5609bf3 100644 --- a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModule.java +++ b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModule.java @@ -1,9 +1,9 @@ package no.nav.vedtak.sikkerhet.jaspic; -import static javax.security.auth.message.AuthStatus.FAILURE; -import static javax.security.auth.message.AuthStatus.SEND_CONTINUE; -import static javax.security.auth.message.AuthStatus.SEND_SUCCESS; -import static javax.security.auth.message.AuthStatus.SUCCESS; +import static jakarta.security.auth.message.AuthStatus.FAILURE; +import static jakarta.security.auth.message.AuthStatus.SEND_CONTINUE; +import static jakarta.security.auth.message.AuthStatus.SEND_SUCCESS; +import static jakarta.security.auth.message.AuthStatus.SUCCESS; import java.io.IOException; import java.time.Instant; @@ -22,15 +22,15 @@ import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import javax.security.auth.message.AuthException; -import javax.security.auth.message.AuthStatus; -import javax.security.auth.message.MessageInfo; -import javax.security.auth.message.MessagePolicy; -import javax.security.auth.message.callback.CallerPrincipalCallback; -import javax.security.auth.message.config.ServerAuthContext; -import javax.security.auth.message.module.ServerAuthModule; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.security.auth.message.AuthException; +import jakarta.security.auth.message.AuthStatus; +import jakarta.security.auth.message.MessageInfo; +import jakarta.security.auth.message.MessagePolicy; +import jakarta.security.auth.message.callback.CallerPrincipalCallback; +import jakarta.security.auth.message.config.ServerAuthContext; +import jakarta.security.auth.message.module.ServerAuthModule; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,7 +69,7 @@ public class OidcAuthModule implements ServerAuthModule { // When the resource is not protected, GlassFish omits the key altogether. // WebSphere does insert the key and sets // it to false. - private static final String IS_MANDATORY = "javax.security.auth.message.MessagePolicy.isMandatory"; + private static final String IS_MANDATORY = "jakarta.security.auth.message.MessagePolicy.isMandatory"; private final TokenLocator tokenLocator; private final Configuration loginConfiguration; diff --git a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/StatelessHttpServletRequest.java b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/StatelessHttpServletRequest.java index b4504dc3f..0ea9c6670 100644 --- a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/StatelessHttpServletRequest.java +++ b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/StatelessHttpServletRequest.java @@ -1,8 +1,8 @@ package no.nav.vedtak.sikkerhet.jaspic; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpSession; /** * Wraps the request in a object that throws an {@link IllegalArgumentException} diff --git a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocator.java b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocator.java index 21102a027..530a3b293 100644 --- a/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocator.java +++ b/felles/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocator.java @@ -4,8 +4,8 @@ import no.nav.vedtak.sikkerhet.oidc.token.OpenIDToken; import no.nav.vedtak.sikkerhet.oidc.token.TokenString; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Optional; diff --git a/felles/sikkerhet/src/main/resources/META-INF/beans.xml b/felles/sikkerhet/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/sikkerhet/src/main/resources/META-INF/beans.xml +++ b/felles/sikkerhet/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModuleTest.java b/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModuleTest.java index 9c310ce08..8d3222f90 100644 --- a/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModuleTest.java +++ b/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/OidcAuthModuleTest.java @@ -13,10 +13,10 @@ import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.Configuration; -import javax.security.auth.message.AuthStatus; -import javax.security.auth.message.MessageInfo; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.security.auth.message.AuthStatus; +import jakarta.security.auth.message.MessageInfo; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.jose4j.json.JsonUtil; import org.jose4j.jwt.NumericDate; @@ -223,7 +223,7 @@ private MessageInfo createRequestForUnprotectedResource() { private MessageInfo createRequestForResource(boolean isProtected) { MessageInfo messageInfo = Mockito.mock(MessageInfo.class); Map properties = new HashMap<>(); - properties.put("javax.security.auth.message.MessagePolicy.isMandatory", Boolean.toString(isProtected)); + properties.put("jakarta.security.auth.message.MessagePolicy.isMandatory", Boolean.toString(isProtected)); when(messageInfo.getMap()).thenReturn(properties); when(messageInfo.getRequestMessage()).thenReturn(request); when(messageInfo.getResponseMessage()).thenReturn(response); diff --git a/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocatorTest.java b/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocatorTest.java index 0a21c4ef3..b2110c920 100644 --- a/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocatorTest.java +++ b/felles/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/jaspic/TokenLocatorTest.java @@ -3,8 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/felles/sikkerhet/src/test/resources/META-INF/beans.xml b/felles/sikkerhet/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/sikkerhet/src/test/resources/META-INF/beans.xml +++ b/felles/sikkerhet/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/testutilities/pom.xml b/felles/testutilities/pom.xml index 04331c881..523cd2bf5 100644 --- a/felles/testutilities/pom.xml +++ b/felles/testutilities/pom.xml @@ -22,6 +22,7 @@ felles-db + jakarta.el jakarta.el-api @@ -31,7 +32,7 @@ provided - org.hibernate + org.hibernate.orm hibernate-core provided diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/CdiAwareExtension.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/CdiAwareExtension.java index 6282cf6c4..66bbd97c2 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/CdiAwareExtension.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/CdiAwareExtension.java @@ -1,9 +1,9 @@ package no.nav.vedtak.felles.testutilities.cdi; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.CDI; -import javax.enterprise.inject.spi.InjectionTarget; +import jakarta.enterprise.context.spi.CreationalContext; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.InjectionTarget; import org.jboss.weld.context.RequestContext; import org.jboss.weld.context.unbound.UnboundLiteral; diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/UnitTestLookupInstanceImpl.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/UnitTestLookupInstanceImpl.java index fa549ce58..7bea58ce4 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/UnitTestLookupInstanceImpl.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/UnitTestLookupInstanceImpl.java @@ -4,8 +4,8 @@ import java.util.Iterator; import java.util.List; -import javax.enterprise.inject.Instance; -import javax.enterprise.util.TypeLiteral; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.util.TypeLiteral; public class UnitTestLookupInstanceImpl implements Instance { diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/WeldContext.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/WeldContext.java index 7481b516c..d1d7fc883 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/WeldContext.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/cdi/WeldContext.java @@ -2,12 +2,12 @@ import java.util.function.Supplier; -import javax.enterprise.inject.spi.AnnotatedType; -import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanAttributes; -import javax.enterprise.inject.spi.BeanManager; -import javax.enterprise.inject.spi.CDI; -import javax.enterprise.inject.spi.InjectionTargetFactory; +import jakarta.enterprise.inject.spi.AnnotatedType; +import jakarta.enterprise.inject.spi.Bean; +import jakarta.enterprise.inject.spi.BeanAttributes; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.InjectionTargetFactory; import org.jboss.weld.context.RequestContext; import org.jboss.weld.context.unbound.UnboundLiteral; diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareExtension.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareExtension.java index 5f855d778..ed54bbd7b 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareExtension.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareExtension.java @@ -3,9 +3,9 @@ import java.lang.reflect.Method; import java.util.Arrays; -import javax.enterprise.inject.spi.CDI; -import javax.persistence.EntityManager; -import javax.persistence.EntityTransaction; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityTransaction; import org.jboss.weld.context.RequestContext; import org.jboss.weld.context.unbound.UnboundLiteral; diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareTest.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareTest.java index 32055ce5c..885710537 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareTest.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/EntityManagerAwareTest.java @@ -1,6 +1,6 @@ package no.nav.vedtak.felles.testutilities.db; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; /** * Tester som bruker {@link EntityManagerAwareExtension} med JUnit 5 kan bruke diff --git a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/PersistenceUnitInitializer.java b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/PersistenceUnitInitializer.java index 6b45fa6fb..f791df57f 100644 --- a/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/PersistenceUnitInitializer.java +++ b/felles/testutilities/src/main/java/no/nav/vedtak/felles/testutilities/db/PersistenceUnitInitializer.java @@ -3,13 +3,13 @@ import java.util.Collections; import java.util.List; -import javax.enterprise.inject.spi.CDI; -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.Persistence; -import javax.persistence.spi.PersistenceProvider; -import javax.persistence.spi.PersistenceProviderResolver; -import javax.persistence.spi.PersistenceProviderResolverHolder; +import jakarta.enterprise.inject.spi.CDI; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.Persistence; +import jakarta.persistence.spi.PersistenceProvider; +import jakarta.persistence.spi.PersistenceProviderResolver; +import jakarta.persistence.spi.PersistenceProviderResolverHolder; import no.nav.vedtak.felles.jpa.VLPersistenceUnitProvider; diff --git a/felles/testutilities/src/main/resources/META-INF/beans.xml b/felles/testutilities/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/testutilities/src/main/resources/META-INF/beans.xml +++ b/felles/testutilities/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/testutilities/src/test/java/no/nav/vedtak/felles/testutilities/cdi/CdiExtensionTest.java b/felles/testutilities/src/test/java/no/nav/vedtak/felles/testutilities/cdi/CdiExtensionTest.java index 1cc8b1102..752d102e2 100644 --- a/felles/testutilities/src/test/java/no/nav/vedtak/felles/testutilities/cdi/CdiExtensionTest.java +++ b/felles/testutilities/src/test/java/no/nav/vedtak/felles/testutilities/cdi/CdiExtensionTest.java @@ -2,9 +2,9 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/felles/testutilities/src/test/resources/META-INF/beans.xml b/felles/testutilities/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/testutilities/src/test/resources/META-INF/beans.xml +++ b/felles/testutilities/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/util/src/main/resources/META-INF/beans.xml b/felles/util/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/util/src/main/resources/META-INF/beans.xml +++ b/felles/util/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/util/src/test/resources/META-INF/beans.xml b/felles/util/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/felles/util/src/test/resources/META-INF/beans.xml +++ b/felles/util/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/felles/xmlutils/src/main/java/no/nav/foreldrepenger/xmlutils/JaxbHelper.java b/felles/xmlutils/src/main/java/no/nav/foreldrepenger/xmlutils/JaxbHelper.java index 55bc1a017..a6df04f4c 100644 --- a/felles/xmlutils/src/main/java/no/nav/foreldrepenger/xmlutils/JaxbHelper.java +++ b/felles/xmlutils/src/main/java/no/nav/foreldrepenger/xmlutils/JaxbHelper.java @@ -3,7 +3,7 @@ import org.xml.sax.SAXException; import javax.xml.XMLConstants; -import javax.xml.bind.*; +import jakarta.xml.bind.*; import javax.xml.namespace.NamespaceContext; import javax.xml.stream.*; import javax.xml.transform.Source; diff --git a/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonGCPKlient.java b/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonGCPKlient.java index 1f0af02ef..83adc305a 100644 --- a/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonGCPKlient.java +++ b/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonGCPKlient.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonOnPremKlient.java b/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonOnPremKlient.java index 2cb1afd87..a25fa1e1d 100644 --- a/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonOnPremKlient.java +++ b/integrasjon/arbeidsfordeling-klient/src/main/java/no/nav/vedtak/felles/integrasjon/skjerming/AbstractSkjermetPersonOnPremKlient.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import no.nav.foreldrepenger.konfig.Environment; import no.nav.vedtak.felles.integrasjon.rest.RestClient; diff --git a/integrasjon/arbeidsfordeling-klient/src/main/resources/META-INF/beans.xml b/integrasjon/arbeidsfordeling-klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/arbeidsfordeling-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/arbeidsfordeling-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/dokarkiv-klient/src/main/java/no/nav/vedtak/felles/integrasjon/dokarkiv/AbstractDokArkivKlient.java b/integrasjon/dokarkiv-klient/src/main/java/no/nav/vedtak/felles/integrasjon/dokarkiv/AbstractDokArkivKlient.java index 82cdaf5be..f9e914b14 100644 --- a/integrasjon/dokarkiv-klient/src/main/java/no/nav/vedtak/felles/integrasjon/dokarkiv/AbstractDokArkivKlient.java +++ b/integrasjon/dokarkiv-klient/src/main/java/no/nav/vedtak/felles/integrasjon/dokarkiv/AbstractDokArkivKlient.java @@ -2,8 +2,8 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; -import javax.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; import no.nav.vedtak.exception.TekniskException; diff --git a/integrasjon/dokarkiv-klient/src/main/resources/META-INF/beans.xml b/integrasjon/dokarkiv-klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/dokarkiv-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/dokarkiv-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/dokarkiv-klient/src/test/resources/META-INF/beans.xml b/integrasjon/dokarkiv-klient/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/dokarkiv-klient/src/test/resources/META-INF/beans.xml +++ b/integrasjon/dokarkiv-klient/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/ereg-klient/src/main/java/no/nav/vedtak/felles/integrasjon/organisasjon/AbstractOrganisasjonKlient.java b/integrasjon/ereg-klient/src/main/java/no/nav/vedtak/felles/integrasjon/organisasjon/AbstractOrganisasjonKlient.java index dd3e40357..6eb88676a 100644 --- a/integrasjon/ereg-klient/src/main/java/no/nav/vedtak/felles/integrasjon/organisasjon/AbstractOrganisasjonKlient.java +++ b/integrasjon/ereg-klient/src/main/java/no/nav/vedtak/felles/integrasjon/organisasjon/AbstractOrganisasjonKlient.java @@ -2,7 +2,7 @@ import java.net.URI; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import no.nav.vedtak.felles.integrasjon.rest.RestClient; import no.nav.vedtak.felles.integrasjon.rest.RestConfig; diff --git a/integrasjon/ereg-klient/src/main/resources/META-INF/beans.xml b/integrasjon/ereg-klient/src/main/resources/META-INF/beans.xml index 325a01252..8c5870f12 100644 --- a/integrasjon/ereg-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/ereg-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - diff --git a/integrasjon/infotrygd-grunnlag-klient/src/main/java/no/nav/vedtak/felles/integrasjon/infotrygd/grunnlag/AbstractInfotrygdGrunnlag.java b/integrasjon/infotrygd-grunnlag-klient/src/main/java/no/nav/vedtak/felles/integrasjon/infotrygd/grunnlag/AbstractInfotrygdGrunnlag.java index 180e41415..19d23c51a 100644 --- a/integrasjon/infotrygd-grunnlag-klient/src/main/java/no/nav/vedtak/felles/integrasjon/infotrygd/grunnlag/AbstractInfotrygdGrunnlag.java +++ b/integrasjon/infotrygd-grunnlag-klient/src/main/java/no/nav/vedtak/felles/integrasjon/infotrygd/grunnlag/AbstractInfotrygdGrunnlag.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integrasjon/infotrygd-grunnlag-klient/src/main/resources/META-INF/beans.xml b/integrasjon/infotrygd-grunnlag-klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/infotrygd-grunnlag-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/infotrygd-grunnlag-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/infotrygd-grunnlag-klient/src/test/resources/META-INF/beans.xml b/integrasjon/infotrygd-grunnlag-klient/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/infotrygd-grunnlag-klient/src/test/resources/META-INF/beans.xml +++ b/integrasjon/infotrygd-grunnlag-klient/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/oppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/AbstractOppgaveKlient.java b/integrasjon/oppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/AbstractOppgaveKlient.java index e9fa6bbb3..89a0d884d 100644 --- a/integrasjon/oppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/AbstractOppgaveKlient.java +++ b/integrasjon/oppgave-rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/oppgave/v1/AbstractOppgaveKlient.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import no.nav.vedtak.felles.integrasjon.rest.NavHeaders; import no.nav.vedtak.felles.integrasjon.rest.RestClient; diff --git a/integrasjon/oppgave-rest-klient/src/main/resources/META-INF/beans.xml b/integrasjon/oppgave-rest-klient/src/main/resources/META-INF/beans.xml index 325a01252..8c5870f12 100644 --- a/integrasjon/oppgave-rest-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/oppgave-rest-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - diff --git a/integrasjon/person-klient/pom.xml b/integrasjon/person-klient/pom.xml index 45be76a61..00b5e2279 100644 --- a/integrasjon/person-klient/pom.xml +++ b/integrasjon/person-klient/pom.xml @@ -54,6 +54,9 @@ false true false + true + jakarta.annotation.Generated + @jakarta.validation.constraints.NotNull diff --git a/integrasjon/person-klient/src/main/resources/META-INF/beans.xml b/integrasjon/person-klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/person-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/person-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestClientConfig.java b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestClientConfig.java index 25a19f7de..bc9493443 100644 --- a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestClientConfig.java +++ b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestClientConfig.java @@ -7,7 +7,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; +import jakarta.enterprise.util.Nonbinding; @Inherited @Retention(RetentionPolicy.RUNTIME) diff --git a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestRequest.java b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestRequest.java index 39afaf46d..3912e1dd9 100644 --- a/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestRequest.java +++ b/integrasjon/rest-klient/src/main/java/no/nav/vedtak/felles/integrasjon/rest/RestRequest.java @@ -9,8 +9,8 @@ import java.util.function.Consumer; import java.util.function.Supplier; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import no.nav.vedtak.klient.http.HttpClientRequest; import no.nav.vedtak.log.mdc.MDCOperations; diff --git a/integrasjon/rest-klient/src/main/resources/META-INF/beans.xml b/integrasjon/rest-klient/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/rest-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/rest-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/rest-klient/src/test/resources/META-INF/beans.xml b/integrasjon/rest-klient/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/rest-klient/src/test/resources/META-INF/beans.xml +++ b/integrasjon/rest-klient/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/saf-klient/pom.xml b/integrasjon/saf-klient/pom.xml index d520fa949..d60cc4e0a 100644 --- a/integrasjon/saf-klient/pom.xml +++ b/integrasjon/saf-klient/pom.xml @@ -55,6 +55,9 @@ false true false + true + jakarta.annotation.Generated + @jakarta.validation.constraints.NotNull diff --git a/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/AbstractSafKlient.java b/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/AbstractSafKlient.java index ee3af0b28..3c6c5249d 100644 --- a/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/AbstractSafKlient.java +++ b/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/AbstractSafKlient.java @@ -5,7 +5,7 @@ import java.net.http.HttpResponse; import java.util.List; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLOperationRequest; import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequest; diff --git a/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/HentDokumentQuery.java b/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/HentDokumentQuery.java index 82232105f..a30326f6e 100644 --- a/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/HentDokumentQuery.java +++ b/integrasjon/saf-klient/src/main/java/no/nav/vedtak/felles/integrasjon/saf/HentDokumentQuery.java @@ -1,6 +1,6 @@ package no.nav.vedtak.felles.integrasjon.saf; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public record HentDokumentQuery(@NotNull String journalpostId, @NotNull String dokumentId, @NotNull String variantFormat) { } diff --git a/integrasjon/saf-klient/src/main/resources/META-INF/beans.xml b/integrasjon/saf-klient/src/main/resources/META-INF/beans.xml index 847ce7d0a..8c5870f12 100644 --- a/integrasjon/saf-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/saf-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git "a/integrasjon/spokelse-klient/src/main/java/no/nav/vedtak/felles/integrasjon/spokelse/AbstractSp\303\270kelseKlient.java" "b/integrasjon/spokelse-klient/src/main/java/no/nav/vedtak/felles/integrasjon/spokelse/AbstractSp\303\270kelseKlient.java" index 43f6dc942..0fa8fcfad 100644 --- "a/integrasjon/spokelse-klient/src/main/java/no/nav/vedtak/felles/integrasjon/spokelse/AbstractSp\303\270kelseKlient.java" +++ "b/integrasjon/spokelse-klient/src/main/java/no/nav/vedtak/felles/integrasjon/spokelse/AbstractSp\303\270kelseKlient.java" @@ -7,7 +7,7 @@ import java.util.List; import java.util.Optional; -import javax.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/integrasjon/spokelse-klient/src/main/resources/META-INF/beans.xml b/integrasjon/spokelse-klient/src/main/resources/META-INF/beans.xml index 325a01252..8c5870f12 100644 --- a/integrasjon/spokelse-klient/src/main/resources/META-INF/beans.xml +++ b/integrasjon/spokelse-klient/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/AbstractSoapServlet.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/AbstractSoapServlet.java index 58bf0aced..1f61b8ffd 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/AbstractSoapServlet.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/AbstractSoapServlet.java @@ -4,9 +4,9 @@ import java.util.List; import java.util.Map; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.apache.cxf.interceptor.Interceptor; import org.apache.cxf.jaxws.EndpointImpl; diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/CallIdOutInterceptor.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/CallIdOutInterceptor.java index d09072fa3..f21e0dd2f 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/CallIdOutInterceptor.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/CallIdOutInterceptor.java @@ -10,7 +10,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.List; diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/SoapWebServiceFeil.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/SoapWebServiceFeil.java index 9afad1c4b..cc971e985 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/SoapWebServiceFeil.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/SoapWebServiceFeil.java @@ -1,7 +1,7 @@ package no.nav.vedtak.felles.integrasjon.felles.ws; import javax.security.auth.login.LoginException; -import javax.xml.ws.WebServiceException; +import jakarta.xml.ws.WebServiceException; import no.nav.vedtak.exception.IntegrasjonException; import no.nav.vedtak.exception.TekniskException; diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/package-info.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/package-info.java index 99165cddd..1205cd504 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/package-info.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/felles/integrasjon/felles/ws/package-info.java @@ -1,5 +1,5 @@ /** - * Felles kode for å gjøre kall mot {@link javax.jws.WebService}. + * Felles kode for å gjøre kall mot {@link jakarta.jws.WebService}. * Håndtere oppsett av Call-id og request/response. */ -package no.nav.vedtak.felles.integrasjon.felles.ws; \ No newline at end of file +package no.nav.vedtak.felles.integrasjon.felles.ws; diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResource.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResource.java index d15d86ad4..03bfa782f 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResource.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResource.java @@ -1,21 +1,21 @@ package no.nav.vedtak.sikkerhet.jaspic.soap; -import static javax.security.auth.message.AuthStatus.FAILURE; -import static javax.security.auth.message.AuthStatus.SUCCESS; +import static jakarta.security.auth.message.AuthStatus.FAILURE; +import static jakarta.security.auth.message.AuthStatus.SUCCESS; import java.io.IOException; import java.util.Collections; import java.util.Optional; import java.util.Set; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.spi.CDI; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.message.AuthStatus; -import javax.security.auth.message.callback.CallerPrincipalCallback; -import javax.servlet.http.HttpServletRequest; +import jakarta.security.auth.message.AuthStatus; +import jakarta.security.auth.message.callback.CallerPrincipalCallback; +import jakarta.servlet.http.HttpServletRequest; import org.apache.wss4j.dom.handler.WSHandlerConstants; diff --git a/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/WSS4JProtectedServlet.java b/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/WSS4JProtectedServlet.java index e86469417..c05143d8f 100644 --- a/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/WSS4JProtectedServlet.java +++ b/integrasjon/webservice/src/main/java/no/nav/vedtak/sikkerhet/jaspic/soap/WSS4JProtectedServlet.java @@ -3,7 +3,7 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebServlet; //FIXME (u139158): PK-44123 Denne bør få et fornuftig navn, men jeg er for sliten... public interface WSS4JProtectedServlet { diff --git a/integrasjon/webservice/src/main/resources/META-INF/beans.xml b/integrasjon/webservice/src/main/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/webservice/src/main/resources/META-INF/beans.xml +++ b/integrasjon/webservice/src/main/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/integrasjon/webservice/src/test/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResourceTest.java b/integrasjon/webservice/src/test/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResourceTest.java index 8c269fb27..d6f580b9b 100644 --- a/integrasjon/webservice/src/test/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResourceTest.java +++ b/integrasjon/webservice/src/test/java/no/nav/vedtak/sikkerhet/jaspic/soap/SoapProtectedResourceTest.java @@ -4,7 +4,7 @@ import java.util.ServiceLoader; -import javax.servlet.annotation.WebServlet; +import jakarta.servlet.annotation.WebServlet; import org.junit.jupiter.api.Test; diff --git a/integrasjon/webservice/src/test/resources/META-INF/beans.xml b/integrasjon/webservice/src/test/resources/META-INF/beans.xml index 4788e81b1..8c5870f12 100644 --- a/integrasjon/webservice/src/test/resources/META-INF/beans.xml +++ b/integrasjon/webservice/src/test/resources/META-INF/beans.xml @@ -1,6 +1,6 @@ - + diff --git a/pom.xml b/pom.xml index a1a016ba5..66e7ccdb9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ no.nav.foreldrepenger.felles fp-bom - 0.8.2 + 1.0.0 felles-root @@ -33,7 +33,7 @@ no.nav.foreldrepenger.felles fp-bom - 0.8.2 + 1.0.0 import pom