diff --git a/core/pom.xml b/core/pom.xml
index 765e9baa62..df548c1fad 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -103,9 +103,8 @@
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
+ <groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -123,12 +122,12 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>3.0.2</version>
+ <version>4.0.5</version>
<scope>runtime</scope>
</dependency>
diff --git a/core/src/main/java/modules/JakartaLocalTxnInterceptor.java b/core/src/main/java/modules/JakartaLocalTxnInterceptor.java
deleted file mode 100644
index 42656c22b9..0000000000
--- a/core/src/main/java/modules/JakartaLocalTxnInterceptor.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package modules;
-
-import com.google.inject.Inject;
-import com.google.inject.persist.Transactional;
-import com.google.inject.persist.UnitOfWork;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityTransaction;
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import java.lang.reflect.Method;
-
-class JakartaLocalTxnInterceptor implements MethodInterceptor {
-
- @Inject
- private JakartaPersistService emProvider = null;
- @Inject
- private UnitOfWork unitOfWork = null;
-
- @Transactional
- private static class Internal {
- }
-
- // Tracks if the unit of work was begun implicitly by this transaction.
- private final ThreadLocal<Boolean> didWeStartWork = new ThreadLocal<>();
-
- @Override
- public Object invoke(MethodInvocation methodInvocation) throws Throwable {
-
- // Should we start a unit of work?
- if (!emProvider.isWorking()) {
- emProvider.begin();
- didWeStartWork.set(true);
- }
-
- Transactional transactional = readTransactionMetadata(methodInvocation);
- EntityManager em = this.emProvider.get();
-
- // Allow 'joining' of transactions if there is an enclosing @Transactional method.
- if (em.getTransaction().isActive()) {
- return methodInvocation.proceed();
- }
-
- final EntityTransaction txn = em.getTransaction();
- txn.begin();
-
- Object result;
- try {
- result = methodInvocation.proceed();
-
- } catch (Exception e) {
- //commit transaction only if rollback didnt occur
- if (rollbackIfNecessary(transactional, e, txn)) {
- txn.commit();
- }
-
- //propagate whatever exception is thrown anyway
- throw e;
- } finally {
- // Close the em if necessary (guarded so this code doesn't run unless catch fired).
- if (null != didWeStartWork.get() && !txn.isActive()) {
- didWeStartWork.remove();
- unitOfWork.end();
- }
- }
-
- //everything was normal so commit the txn (do not move into try block above as it
- // interferes with the advised method's throwing semantics)
- try {
- txn.commit();
- } finally {
- //close the em if necessary
- if (null != didWeStartWork.get()) {
- didWeStartWork.remove();
- unitOfWork.end();
- }
- }
-
- //or return result
- return result;
- }
-
- private Transactional readTransactionMetadata(MethodInvocation methodInvocation) {
- Transactional transactional;
- Method method = methodInvocation.getMethod();
- Class<?> targetClass = methodInvocation.getThis().getClass();
-
- transactional = method.getAnnotation(Transactional.class);
- if (null == transactional) {
- // If none on method, try the class.
- transactional = targetClass.getAnnotation(Transactional.class);
- }
- if (null == transactional) {
- // If there is no transactional annotation present, use the default
- transactional = Internal.class.getAnnotation(Transactional.class);
- }
-
- return transactional;
- }
-
- /**
- * Returns True if rollback DID NOT HAPPEN (i.e. if commit should continue).
- *
- * @param transactional The metadata annotaiton of the method
- * @param e The exception to test for rollback
- * @param txn A JPA Transaction to issue rollbacks on
- */
- private boolean rollbackIfNecessary(
- Transactional transactional, Exception e, EntityTransaction txn)
- {
- boolean commit = true;
-
- //check rollback clauses
- for (Class<? extends Exception> rollBackOn : transactional.rollbackOn()) {
-
- //if one matched, try to perform a rollback
- if (rollBackOn.isInstance(e)) {
- commit = false;
-
- //check ignore clauses (supercedes rollback clause)
- for (Class<? extends Exception> exceptOn : transactional.ignore()) {
- //An exception to the rollback clause was found, DON'T rollback
- // (i.e. commit and throw anyway)
- if (exceptOn.isInstance(e)) {
- commit = true;
- break;
- }
- }
-
- //rollback only if nothing matched the ignore check
- if (!commit) {
- txn.rollback();
- }
- //otherwise continue to commit
-
- break;
- }
- }
-
- return commit;
- }
-}
diff --git a/core/src/main/java/modules/JakartaPersistModule.java b/core/src/main/java/modules/JakartaPersistModule.java
deleted file mode 100644
index c6e5cfbe74..0000000000
--- a/core/src/main/java/modules/JakartaPersistModule.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package modules;
-
-import com.google.inject.Singleton;
-import com.google.inject.persist.PersistModule;
-import com.google.inject.persist.PersistService;
-import com.google.inject.persist.UnitOfWork;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import org.aopalliance.intercept.MethodInterceptor;
-
-import java.util.Objects;
-
-public class JakartaPersistModule extends PersistModule {
- private final String jpaUnit;
-
- public JakartaPersistModule(String jpaUnit) {
- this.jpaUnit = Objects.requireNonNull(jpaUnit, "JPA unit name must be a non-empty string.");
- }
-
- private MethodInterceptor transactionInterceptor;
-
- @Override
- protected void configurePersistence() {
- bindConstant().annotatedWith(Jpa.class).to(jpaUnit);
-
- bind(JakartaPersistService.class).in(Singleton.class);
-
- bind(PersistService.class).to(JakartaPersistService.class);
- bind(UnitOfWork.class).to(JakartaPersistService.class);
- bind(EntityManager.class).toProvider(JakartaPersistService.class);
- bind(EntityManagerFactory.class)
- .toProvider(JakartaPersistService.EntityManagerFactoryProvider.class);
-
- transactionInterceptor = new JakartaLocalTxnInterceptor();
- requestInjection(transactionInterceptor);
- }
-
- @Override
- protected MethodInterceptor getTransactionInterceptor() {
- return transactionInterceptor;
- }
-}
diff --git a/core/src/main/java/modules/JakartaPersistService.java b/core/src/main/java/modules/JakartaPersistService.java
deleted file mode 100644
index 4a8277f5bc..0000000000
--- a/core/src/main/java/modules/JakartaPersistService.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package modules;
-
-import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-import com.google.inject.persist.PersistService;
-import com.google.inject.persist.UnitOfWork;
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.Persistence;
-
-@Singleton
-class JakartaPersistService implements Provider<EntityManager>, UnitOfWork, PersistService {
- private final ThreadLocal<EntityManager> entityManager = new ThreadLocal<>();
-
- private final String persistenceUnitName;
-
- @Inject
- public JakartaPersistService(@Jpa String persistenceUnitName) {
- this.persistenceUnitName = persistenceUnitName;
- }
-
- @Override
- public EntityManager get() {
- if (!isWorking()) {
- begin();
- }
-
- EntityManager em = entityManager.get();
- Preconditions.checkState(
- null != em,
- "Requested EntityManager outside work unit. "
- + "Try calling UnitOfWork.begin() first, or use a PersistFilter if you "
- + "are inside a servlet environment.");
-
- return em;
- }
-
- public boolean isWorking() {
- return entityManager.get() != null;
- }
-
- @Override
- public void begin() {
- Preconditions.checkState(
- null == entityManager.get(),
- "Work already begun on this thread. Looks like you have called UnitOfWork.begin() twice"
- + " without a balancing call to end() in between.");
-
- entityManager.set(emFactory.createEntityManager());
- }
-
- @Override
- public void end() {
- EntityManager em = entityManager.get();
-
- // Let's not penalize users for calling end() multiple times.
- if (null == em) {
- return;
- }
-
- try {
- em.close();
- } finally {
- entityManager.remove();
- }
- }
-
- private volatile EntityManagerFactory emFactory;
-
- @Override
- public synchronized void start() {
- Preconditions.checkState(null == emFactory, "Persistence service was already initialized.");
- this.emFactory = Persistence.createEntityManagerFactory(persistenceUnitName);
- }
-
- @Override
- public synchronized void stop() {
- Preconditions.checkState(emFactory.isOpen(), "Persistence service was already shut down.");
- emFactory.close();
- }
-
- @Singleton
- public static class EntityManagerFactoryProvider implements Provider<EntityManagerFactory> {
- private final JakartaPersistService emProvider;
-
- @Inject
- public EntityManagerFactoryProvider(JakartaPersistService emProvider) {
- this.emProvider = emProvider;
- }
-
- @Override
- public EntityManagerFactory get() {
- assert null != emProvider.emFactory;
- return emProvider.emFactory;
- }
- }
-}
diff --git a/core/src/main/java/modules/Jpa.java b/core/src/main/java/modules/Jpa.java
deleted file mode 100644
index c9bd988b62..0000000000
--- a/core/src/main/java/modules/Jpa.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package modules;
-
-import com.google.inject.BindingAnnotation;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-@BindingAnnotation
-public @interface Jpa {
-}
diff --git a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java b/core/src/main/java/se/su/dsv/scipro/DataInitializer.java
index 97f7a17238..3a878fc72b 100644
--- a/core/src/main/java/se/su/dsv/scipro/DataInitializer.java
+++ b/core/src/main/java/se/su/dsv/scipro/DataInitializer.java
@@ -15,8 +15,8 @@ import se.su.dsv.scipro.report.GradingReportTemplate;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.LocalDate;
import java.time.LocalTime;
diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java
index 2f76f0fc8c..684bfdb7a7 100755
--- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImpl.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.misc.DaysService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java
index d0de11df8b..904ed006dc 100755
--- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.activityplan;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ActivityPlanServiceImpl extends AbstractServiceImpl<ActivityPlan,Long> implements ActivityPlanService {
diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java
index b0c3e9e78a..1ee2963dc9 100755
--- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateServiceImpl.java
@@ -6,8 +6,8 @@ import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java
index 9ae5612940..16ff0d5a94 100755
--- a/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/activityplan/ActivityServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.activityplan;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ActivityServiceImpl extends AbstractServiceImpl<Activity, Long> implements ActivityService {
diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistAnswerServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistAnswerServiceImpl.java
index 0fd4abf4e1..1e1893ccda 100644
--- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistAnswerServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistAnswerServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.checklist;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ChecklistAnswerServiceImpl extends AbstractServiceImpl<ChecklistAnswer, Long> implements ChecklistAnswerService {
diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java
index 8d1611e709..27caa5ac53 100644
--- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistCategoryRepoImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.checklist;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ChecklistCategoryRepoImpl extends GenericRepo<ChecklistCategory, Long> implements ChecklistCategoryRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java
index 362e335052..0846d001aa 100644
--- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistQuestionRepoImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.checklist;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ChecklistQuestionRepoImpl extends GenericRepo<ChecklistQuestion, Long> implements ChecklistQuestionRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java
index d0b6640c60..cba683c25a 100755
--- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistServiceImpl.java
@@ -6,8 +6,8 @@ import se.su.dsv.scipro.activityplan.QActivityPlan;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.system.User;
diff --git a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java
index d55c712d36..7676f990a0 100755
--- a/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImpl.java
@@ -6,8 +6,8 @@ import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java b/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java
index 5af115fac7..7c2f6a7142 100755
--- a/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/daisyExternal/http/DaisyAPIImpl.java
@@ -13,8 +13,8 @@ import jakarta.ws.rs.core.Response;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import se.su.dsv.scipro.io.dto.*;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java b/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java
index b6db942714..e258cf450e 100755
--- a/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java
+++ b/core/src/main/java/se/su/dsv/scipro/data/facade/MailFacade.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java
index d748077797..cd6584cadb 100644
--- a/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/file/FileDescriptionRepoImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.file;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FileDescriptionRepoImpl extends GenericRepo<FileDescription, Long> implements FileDescriptionRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java
index f580fcc3c2..cacc3f7a16 100644
--- a/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/file/FileReferenceRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.file;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
class FileReferenceRepositoryImpl extends AbstractRepository implements FileReferenceRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java
index a483824df3..2fe1f634d6 100755
--- a/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/file/FileServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.file;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.io.InputStream;
diff --git a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java
index c5335f4e8c..ad3cc70445 100644
--- a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileRepositoryImpl.java
@@ -6,8 +6,8 @@ import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java
index a44170e3d6..7e513b2434 100644
--- a/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/file/ProjectFileServiceImpl.java
@@ -4,7 +4,7 @@ import com.google.inject.persist.Transactional;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ProjectFileServiceImpl implements ProjectFileService {
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java
index fef44c41f0..1acb79b98a 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/AuthorRepositoryImpl.java
@@ -8,8 +8,8 @@ import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java
index 0a6254f724..7c20d3f851 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java
index 1aaeca7ee9..a51f10f6bc 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarActiveParticipationServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.finalseminar;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FinalSeminarActiveParticipationServiceImpl extends AbstractServiceImpl<FinalSeminarActiveParticipation, Long> implements FinalSeminarActiveParticipationService {
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java
index 60d5bbea4a..f0597564bb 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarCreationSubscribers.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.notifications.dataobject.SeminarEvent;
import se.su.dsv.scipro.project.Author;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java
index f84e06bcf0..2fe781e2b7 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionRepoImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImpl.java
index f69de9c962..b1d0a48fd8 100755
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.finalseminar;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FinalSeminarOppositionServiceImpl extends AbstractServiceImpl<FinalSeminarOpposition, Long> implements FinalSeminarOppositionService {
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java
index 64371efcaa..f17e41be75 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRepositoryImpl.java
@@ -4,8 +4,8 @@ import com.google.inject.persist.Transactional;
import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
public class FinalSeminarRepositoryImpl extends AbstractRepository implements FinalSeminarRepository {
@Inject
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImpl.java
index db3db7d791..ee7478c33c 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImpl.java
@@ -3,9 +3,9 @@ package se.su.dsv.scipro.finalseminar;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java
index e36da9723a..8f1a0a9a85 100755
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImpl.java
@@ -21,8 +21,8 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.time.*;
import java.util.Date;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettingsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettingsServiceImpl.java
index 3e43718870..24aa74c59e 100755
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettingsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettingsServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.finalseminar;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FinalSeminarSettingsServiceImpl extends AbstractServiceImpl<FinalSeminarSettings,Long> implements FinalSeminarSettingsService {
diff --git a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java
index b0a781b762..5feff42af2 100755
--- a/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarUploadControllerImpl.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class FinalSeminarUploadControllerImpl implements FinalSeminarUploadController {
diff --git a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java
index a826b39613..00d6898a6f 100644
--- a/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImpl.java
@@ -22,9 +22,9 @@ import se.su.dsv.scipro.report.GradingReportService;
import se.su.dsv.scipro.report.SupervisorGradingReport;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import java.util.*;
@Named
diff --git a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java
index 96bfb3b8f7..0192c3af58 100644
--- a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingReminderWorker.java
@@ -5,7 +5,7 @@ import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.inject.*;
+import jakarta.inject.*;
import se.su.dsv.scipro.match.Idea.Status;
import se.su.dsv.scipro.match.IdeaService.Filter;
diff --git a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java
index 880078f990..23d1832201 100644
--- a/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingServiceImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.activityplan.ActivityPlanFacade;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Date;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java
index 80da26b4f8..cc1db0a920 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/AbstractThreadRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.forum.dataobjects.QForumThread;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class AbstractThreadRepositoryImpl extends GenericRepo<ForumThread, Long> implements AbstractThreadRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java
index 176dabb629..05642970d2 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/BasicForumServiceImpl.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumPostReadState;
import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepositoryImpl.java
index 688975b167..909c57693f 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostReadStateRepositoryImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.forum.dataobjects.QForumPostReadState;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import static com.querydsl.core.types.dsl.Expressions.allOf;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java
index c6b2e36403..e4536e7582 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ForumPostRepositoryImpl.java
@@ -12,8 +12,8 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.*;
import static com.querydsl.core.types.dsl.Expressions.allOf;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
index 63731a551b..bed0169c09 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/GroupForumServiceImpl.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.forum.dataobjects.GroupThread;
import se.su.dsv.scipro.group.Group;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class GroupForumServiceImpl implements GroupForumService {
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java
index 91491b3309..773f104ba2 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/GroupThreadRepositoryImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.forum.dataobjects.QGroupThread;
import se.su.dsv.scipro.group.Group;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
index bba67612c8..3785b66d6f 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ProjectForumServiceImpl.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ProjectForumServiceImpl implements ProjectForumService {
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java
index 0c2aa4fb47..b278d1d214 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/ProjectThreadRepositoryImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.forum.dataobjects.QProjectThread;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotificationRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotificationRepositoryImpl.java
index 7d94372904..658c936b0f 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotificationRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotificationRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.forum.notifications;
import com.querydsl.jpa.impl.JPAQuery;
import se.su.dsv.scipro.forum.dataobjects.ForumPost;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java b/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java
index 2a93a1ebc3..b294608351 100644
--- a/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java
+++ b/core/src/main/java/se/su/dsv/scipro/forum/notifications/ForumNotifications.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.notifications.NotificationController;
import se.su.dsv.scipro.notifications.NotificationService;
import se.su.dsv.scipro.reviewing.NewReviewerInteractionMessage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Set;
import java.util.function.Function;
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailRepositoryImpl.java
index ff67c9a11f..1d5d40a98b 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailRepositoryImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.forummail;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ForumMailRepositoryImpl extends GenericRepo<ForumMail, Long> implements ForumMailRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailServiceImpl.java
index 7e3b194c99..1e6bcae2bd 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailServiceImpl.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.forummail;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ForumMailServiceImpl implements ForumMailService {
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImpl.java
index b02a67c041..d93db49e64 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.forummail;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ForumMailSettingsServiceImpl extends AbstractServiceImpl<ForumMailSettings,Long> implements ForumMailSettingsService {
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorker.java b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorker.java
index 913ffcca8a..933f4d7033 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorker.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.forummail;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ForumMailWorker extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorkerSchedule.java b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorkerSchedule.java
index f254edd60b..e09a9a8826 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorkerSchedule.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ForumMailWorkerSchedule.java
@@ -3,9 +3,9 @@ package se.su.dsv.scipro.forummail;
import se.su.dsv.scipro.system.Lifecycle;
import se.su.dsv.scipro.workerthreads.Scheduler;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.util.concurrent.TimeUnit;
@Singleton
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/IMAPReader.java b/core/src/main/java/se/su/dsv/scipro/forummail/IMAPReader.java
index f0e1011720..4646a17745 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/IMAPReader.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/IMAPReader.java
@@ -13,7 +13,7 @@ import jakarta.mail.search.FlagTerm;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/ReadForumMail.java b/core/src/main/java/se/su/dsv/scipro/forummail/ReadForumMail.java
index 9b3d5deacd..e45f143fdb 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/ReadForumMail.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/ReadForumMail.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.forum.GroupForumService;
import se.su.dsv.scipro.forum.ProjectForumService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.InputStream;
import java.util.*;
import java.util.function.Function;
diff --git a/core/src/main/java/se/su/dsv/scipro/forummail/SendForumMail.java b/core/src/main/java/se/su/dsv/scipro/forummail/SendForumMail.java
index 5b671ffc2a..f146fbf356 100644
--- a/core/src/main/java/se/su/dsv/scipro/forummail/SendForumMail.java
+++ b/core/src/main/java/se/su/dsv/scipro/forummail/SendForumMail.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
diff --git a/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java b/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java
index 7862a247d5..8de05293ca 100644
--- a/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java
+++ b/core/src/main/java/se/su/dsv/scipro/gdpr/ZipReporter.java
@@ -31,7 +31,7 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettingsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettingsServiceImpl.java
index ff092fcfa7..1550844b4e 100755
--- a/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettingsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/generalsystemsettings/GeneralSystemSettingsServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.generalsystemsettings;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class GeneralSystemSettingsServiceImpl extends AbstractServiceImpl<GeneralSystemSettings, Long> implements GeneralSystemSettingsService {
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java
index 6bfc594df5..8b1181ae68 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistory.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.grading;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java
index 9d64ee3dae..68b25d1cd0 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/GradingHistoryEventRepositoryImpl.java
@@ -5,8 +5,8 @@ import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.Collection;
public class GradingHistoryEventRepositoryImpl extends AbstractRepository implements GradingHistoryEventRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java
index bd462566e6..efd271ba90 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/GradingServiceImpl.java
@@ -5,8 +5,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java
index 5e9cce59c0..2a6d009a47 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryRepositoryImpl.java
@@ -4,8 +4,8 @@ import com.google.inject.persist.Transactional;
import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java
index cfec9fe63b..dbb34d8bd1 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/NationalSubjectCategoryServiceImpl.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.grading;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java
index 00e5ddd217..f1b2ac5a38 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataRepositoryImpl.java
@@ -5,8 +5,8 @@ import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
class PublicationMetadataRepositoryImpl extends AbstractRepository implements PublicationMetadataRepository {
@Inject
diff --git a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java
index ddc34c04a5..26f0e1801b 100644
--- a/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataServiceImpl.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.grading;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.Language;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Objects;
class PublicationMetadataServiceImpl implements PublicationMetadataService {
diff --git a/core/src/main/java/se/su/dsv/scipro/group/GroupServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/group/GroupServiceImpl.java
index b7751cf5dc..d23f909f5e 100755
--- a/core/src/main/java/se/su/dsv/scipro/group/GroupServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/group/GroupServiceImpl.java
@@ -8,8 +8,8 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.FilteredService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java
index f540c859f5..a1f0317143 100644
--- a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/ActivityFinalSeminarRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.integration.activityfinalseminar;
import se.su.dsv.scipro.finalseminar.FinalSeminar;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java
index 87e516e90e..5fe5f5149c 100644
--- a/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java
+++ b/core/src/main/java/se/su/dsv/scipro/integration/activityfinalseminar/FinalSeminarActivityHandler.java
@@ -11,8 +11,8 @@ import se.su.dsv.scipro.finalseminar.FinalSeminarCreatedEvent;
import se.su.dsv.scipro.finalseminar.FinalSeminarDeletedEvent;
import se.su.dsv.scipro.finalseminar.FinalSeminarMovedEvent;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.*;
@Singleton
diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThreadRepositoryImpl.java
index 7d6ed3f9e3..a161abb4a6 100644
--- a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThreadRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/ActivityThreadRepositoryImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.jpa.impl.JPAQuery;
import se.su.dsv.scipro.activityplan.Activity;
import se.su.dsv.scipro.forum.dataobjects.ProjectThread;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java
index a3b835f210..07edadf118 100644
--- a/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java
+++ b/core/src/main/java/se/su/dsv/scipro/integration/activityforum/PostActivityUploadToForum.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.forum.ProjectForumService;
import se.su.dsv.scipro.forum.dataobjects.ProjectThread;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.*;
@Singleton
diff --git a/core/src/main/java/se/su/dsv/scipro/mail/Mail.java b/core/src/main/java/se/su/dsv/scipro/mail/Mail.java
index 2bcdf4b27b..a41c528259 100755
--- a/core/src/main/java/se/su/dsv/scipro/mail/Mail.java
+++ b/core/src/main/java/se/su/dsv/scipro/mail/Mail.java
@@ -5,7 +5,7 @@ import jakarta.mail.internet.AddressException;
import jakarta.mail.internet.InternetAddress;
import se.su.dsv.scipro.file.FileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class Mail extends SMTPMailer {
diff --git a/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java
index 61729a96fd..651f3965a4 100755
--- a/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/mail/MailEventServiceImpl.java
@@ -5,8 +5,8 @@ import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java b/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java
index f27e4d8c13..c18364b1ad 100755
--- a/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/mail/MailEventWorker.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java b/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java
index 03ea1bfb64..80a790144e 100644
--- a/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java
+++ b/core/src/main/java/se/su/dsv/scipro/mail/RedirectingMailer.java
@@ -5,7 +5,7 @@ import jakarta.mail.internet.AddressException;
import jakarta.mail.internet.InternetAddress;
import se.su.dsv.scipro.file.FileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class RedirectingMailer extends SMTPMailer {
private final String redirectTo;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java b/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java
index 994ce8b9fa..3b75bea8d2 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/AddActivityPlanOnProjectStart.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.activityplan.ActivityPlanFacade;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.ZoneId;
import java.util.Date;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodFacadeImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodFacadeImpl.java
index ea2ef20a4b..5edd84a832 100755
--- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodFacadeImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodFacadeImpl.java
@@ -4,7 +4,7 @@ import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ApplicationPeriodFacadeImpl implements ApplicationPeriodFacade {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java
index 789beac328..aad6e262be 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodProjectTypeServiceImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.core.types.dsl.BooleanExpression;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ApplicationPeriodProjectTypeServiceImpl extends AbstractServiceImpl<ApplicationPeriodProjectType, ApplicationPeriodProjectTypeId> implements ApplicationPeriodProjectTypeService {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java
index 8b43b077ec..b884d5eb91 100755
--- a/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.Clock;
import java.time.LocalDate;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java
index c28920f8a9..8ed543e2b3 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/FirstMeetingRepositoryImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.match;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FirstMeetingRepositoryImpl extends GenericRepo<FirstMeeting, Long> implements FirstMeetingRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java
index b6cad9bc8a..3127261425 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaFacade.java
@@ -4,7 +4,7 @@ import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaRepositoryImpl.java
index 406dc61b20..82526a3af4 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/IdeaRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java
index f386fd0330..fdeae929fa 100755
--- a/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/IdeaServiceImpl.java
@@ -24,8 +24,8 @@ import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.Either;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.text.MessageFormat;
import java.time.Clock;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java
index 7fe4c697ac..d68ddf4ff2 100755
--- a/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/KeywordServiceImpl.java
@@ -10,8 +10,8 @@ import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ResearchArea;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java
index bc7a9b7838..fb0f451e48 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/MatchFollowUpServiceImpl.java
@@ -11,8 +11,8 @@ import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/MatchServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/MatchServiceImpl.java
index 9d04b34b62..d6d82c98e0 100755
--- a/core/src/main/java/se/su/dsv/scipro/match/MatchServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/MatchServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.match;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class MatchServiceImpl extends AbstractServiceImpl<Match,Long> implements MatchService {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java
index 521adef0ae..bc762d2834 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/PreliminaryMatchServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.match;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class PreliminaryMatchServiceImpl extends AbstractServiceImpl<PreliminaryMatch, Long> implements PreliminaryMatchService {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java
index 96cd282178..ebfccfd272 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/ProgramServiceImpl.java
@@ -8,8 +8,8 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.Program;
import se.su.dsv.scipro.system.QProgram;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java b/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java
index 0dc3124e5f..b9a0dad6a8 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/ProjectStartNotifier.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.notifications.dataobject.IdeaEvent;
import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ProjectStartNotifier {
private final NotificationController notificationController;
diff --git a/core/src/main/java/se/su/dsv/scipro/match/TargetRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/match/TargetRepositoryImpl.java
index b06e2407f5..1aa069ac8e 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/TargetRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/TargetRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class TargetRepositoryImpl extends AbstractRepository implements TargetRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java
index f45042bc18..b70b638da3 100644
--- a/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/match/TargetServiceImpl.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java
index 08db3c259c..3176034738 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/MilestoneActivityTemplateRepositoryImpl.java
@@ -6,8 +6,8 @@ import se.su.dsv.scipro.milestones.dataobjects.QMilestoneActivityTemplate;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java
index ac1ba3cefc..f952be4182 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/ActivateCompletedMilestonesOnNewProjects.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectCreatedEvent;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ActivateCompletedMilestonesOnNewProjects {
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java
index b2ca569ae6..d19f65687a 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/MilestoneActivator.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.reviewing.RoughDraftApprovalApprovedEvent;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalRequestedEvent;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Objects;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java
index 91493f8682..f3727f39fe 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneActivityTemplateServiceImpl.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java
index 7712c11504..b4edc5af32 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImpl.java
@@ -8,8 +8,8 @@ import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java
index 6b5cb65dd9..5c335b94b0 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImpl.java
@@ -21,8 +21,8 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java
index c9fb178af8..f24e7a37e4 100644
--- a/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImpl.java
@@ -20,8 +20,8 @@ import se.su.dsv.scipro.project.QProject;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java
index 92671a9649..8d4c45cac4 100644
--- a/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/misc/DaysServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.misc;
import se.su.dsv.scipro.nonworkperiod.NonWorkDayPeriodService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.DayOfWeek;
import java.time.Duration;
import java.time.Instant;
diff --git a/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImpl.java
index fc2e6b7709..46eab7680c 100755
--- a/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.core.types.dsl.Expressions;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/core/src/main/java/se/su/dsv/scipro/notes/NoteServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notes/NoteServiceImpl.java
index 09208c051c..126470035e 100755
--- a/core/src/main/java/se/su/dsv/scipro/notes/NoteServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notes/NoteServiceImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.core.types.dsl.BooleanExpression;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class NoteServiceImpl extends AbstractServiceImpl<Note, Long> implements NoteService {
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java
index 92874b5fa0..8bd1a88a13 100755
--- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationControllerImpl.java
@@ -19,8 +19,8 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.CurrentUser;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventRepositoryImpl.java
index 30d26fc4d2..b6ea677fc6 100644
--- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventRepositoryImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.notifications;
import se.su.dsv.scipro.notifications.dataobject.NotificationEvent;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java
index 8c211ef62f..ba417323ac 100644
--- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationEventServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.notifications;
import se.su.dsv.scipro.notifications.dataobject.NotificationEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
public class NotificationEventServiceImpl implements NotificationEventService {
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java
index 7b7067c7f5..b8c7cb0d9a 100755
--- a/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/NotificationServiceImpl.java
@@ -12,8 +12,8 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java b/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java
index cb3baee637..2f887614c9 100644
--- a/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/Notifications.java
@@ -21,8 +21,8 @@ import se.su.dsv.scipro.project.ProjectCompletedEvent;
import se.su.dsv.scipro.project.ProjectDeactivatedEvent;
import se.su.dsv.scipro.project.ReviewerAssignedEvent;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.Set;
@Singleton
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java
index 3e8f264e2a..cdf67a52d4 100755
--- a/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/interfaces/impl/NotificationMailFormatterImpl.java
@@ -14,8 +14,8 @@ import se.su.dsv.scipro.notifications.interfaces.NotificationMailFormatter;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.util.PropsUtils;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.io.IOException;
import java.text.MessageFormat;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java
index fd639665b2..285b9f6c0a 100644
--- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java
index 1047e78e2e..37befe6c34 100644
--- a/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImpl.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.notifications.settings.entities.QReceiverConfiguration;
import se.su.dsv.scipro.notifications.settings.entities.ReceiverConfiguration;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import static com.querydsl.core.types.dsl.Expressions.allOf;
diff --git a/core/src/main/java/se/su/dsv/scipro/oauth/OAuthModule.java b/core/src/main/java/se/su/dsv/scipro/oauth/OAuthModule.java
index 01b18c8fcb..bce825afe1 100644
--- a/core/src/main/java/se/su/dsv/scipro/oauth/OAuthModule.java
+++ b/core/src/main/java/se/su/dsv/scipro/oauth/OAuthModule.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.oauth;
import com.google.inject.PrivateModule;
import com.google.inject.Provides;
-import javax.inject.Named;
+import jakarta.inject.Named;
public class OAuthModule extends PrivateModule {
@Override
diff --git a/core/src/main/java/se/su/dsv/scipro/oauth/OAuthServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/oauth/OAuthServiceImpl.java
index d86ff651d0..465c7ce67b 100644
--- a/core/src/main/java/se/su/dsv/scipro/oauth/OAuthServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/oauth/OAuthServiceImpl.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.oauth;
import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
import org.glassfish.jersey.jackson.JacksonFeature;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.Entity;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java
index 355c12a4bb..db26096621 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.peer;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java
index 6ba3055c60..6bda7bdc3a 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadRepoImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.peer;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import static com.querydsl.core.types.dsl.Expressions.allOf;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadServiceImpl.java
index ac990da9fe..82d1e68e53 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/CommentThreadServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.peer;
import com.google.inject.persist.Transactional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class CommentThreadServiceImpl implements CommentThreadService {
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java
index 28c658eb9a..bb15047813 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredRequestWorker.java
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Duration;
import java.time.Instant;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredReviewResetWorker.java b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredReviewResetWorker.java
index 387e77593d..f7c0a6725e 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/ExpiredReviewResetWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/ExpiredReviewResetWorker.java
@@ -4,7 +4,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ExpiredReviewResetWorker extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java
index 34139bb6c2..5582001f6a 100755
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerPortalImpl.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.Duration;
import java.time.Instant;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java
index c4f0bb9226..96663a5cd6 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestRepositoryImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.peer;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class PeerRequestRepositoryImpl extends GenericRepo<PeerRequest, Long> implements PeerRequestRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java
index c546583b50..d4ad19ea87 100755
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerRequestServiceImpl.java
@@ -14,8 +14,8 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java
index f2096e9f6d..054908f309 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java
index bb469e9e51..b75239494b 100755
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerReviewServiceImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java b/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java
index ce2fec64a4..4a164beeb5 100644
--- a/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java
+++ b/core/src/main/java/se/su/dsv/scipro/peer/PeerWorkerSchedules.java
@@ -3,9 +3,9 @@ package se.su.dsv.scipro.peer;
import se.su.dsv.scipro.system.Lifecycle;
import se.su.dsv.scipro.workerthreads.Scheduler;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.util.concurrent.TimeUnit;
@Singleton
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java
index a262dc95d1..b21bd32fe9 100755
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismControlImpl.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.plagiarism.urkund.UrkundSubmission;
import se.su.dsv.scipro.plagiarism.urkund.UrkundSubmissionRepository;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Objects;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismRequestRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismRequestRepositoryImpl.java
index a19289949d..fc8c91fb57 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismRequestRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismRequestRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.plagiarism;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismSubmitter.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismSubmitter.java
index b0962b3cc0..8edc5b7551 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismSubmitter.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/PlagiarismSubmitter.java
@@ -8,8 +8,8 @@ import se.su.dsv.scipro.plagiarism.urkund.UrkundService;
import se.su.dsv.scipro.plagiarism.urkund.UrkundSettings;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.List;
public class PlagiarismSubmitter extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java
index 3d1fb79e62..00c19759ce 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/StatusPollingWorker.java
@@ -5,8 +5,8 @@ import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.sukat.Sukat;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.time.Instant;
public class StatusPollingWorker extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java
index 1db11f71af..37fe3d3c02 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundApiImpl.java
@@ -5,8 +5,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.file.FileService;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.io.IOException;
import java.io.InputStream;
import java.net.Authenticator;
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java
index c5ee1b44f2..8eac423c9b 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundServiceImpl.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.sukat.Sukat;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.Username;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.ZoneOffset;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java
index f86963f335..6ca3bfdc58 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.plagiarism.urkund;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java
index 95d89e5990..f05cfca647 100644
--- a/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.plagiarism.urkund;
import com.querydsl.jpa.impl.JPAQuery;
import se.su.dsv.scipro.file.FileDescription;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/profiles/CurrentProfile.java b/core/src/main/java/se/su/dsv/scipro/profiles/CurrentProfile.java
index c9a86ebc10..679ba53157 100755
--- a/core/src/main/java/se/su/dsv/scipro/profiles/CurrentProfile.java
+++ b/core/src/main/java/se/su/dsv/scipro/profiles/CurrentProfile.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.profiles;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
public class CurrentProfile {
diff --git a/core/src/main/java/se/su/dsv/scipro/project/ProjectPeopleStatisticsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/project/ProjectPeopleStatisticsServiceImpl.java
index 2787eef208..9a2862ae63 100644
--- a/core/src/main/java/se/su/dsv/scipro/project/ProjectPeopleStatisticsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/project/ProjectPeopleStatisticsServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.QUser;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class ProjectPeopleStatisticsServiceImpl extends AbstractServiceImpl<Project, Long> implements ProjectPeopleStatisticsService {
diff --git a/core/src/main/java/se/su/dsv/scipro/project/ProjectRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/project/ProjectRepoImpl.java
index cc0b4c6cd1..306912f560 100644
--- a/core/src/main/java/se/su/dsv/scipro/project/ProjectRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/project/ProjectRepoImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.project;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import java.util.Collection;
diff --git a/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
index a6f6f4573c..c2f8e83098 100755
--- a/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/project/ProjectServiceImpl.java
@@ -14,8 +14,8 @@ import se.su.dsv.scipro.system.QUser;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.Clock;
import java.time.Duration;
diff --git a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java
index 26089c8aa0..63dada7bf6 100644
--- a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.projectpartner;
import com.google.inject.persist.Transactional;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
diff --git a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImpl.java
index 802d014361..cc4cb5a635 100644
--- a/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.match.QIdeaParticipation;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.Duration;
import java.time.Instant;
diff --git a/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java b/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java
index cd527ea654..9e7d8069d6 100644
--- a/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/projectpartner/RemoveFulfilledPartnerAdsWorker.java
@@ -4,7 +4,7 @@ import se.su.dsv.scipro.match.Idea;
import se.su.dsv.scipro.match.IdeaService;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.List;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java
index 5e34898707..ccd23a6244 100644
--- a/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reflection/ReflectionServiceImpl.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.project.Author;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
class ReflectionServiceImpl implements ReflectionService {
private final AuthorRepository authorRepository;
diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java
index ea7a665416..b57d2bee0c 100644
--- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java
@@ -12,9 +12,9 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import java.time.Clock;
import java.time.Instant;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java
index ee3127c4b1..170ef05806 100644
--- a/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.report;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
diff --git a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java
index 816974749a..b83ff0adba 100644
--- a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportRepoImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.report;
import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class OppositionReportRepoImpl extends GenericRepo<OppositionReport, Long> implements OppositionReportRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java
index 3a386bca20..bf1321d744 100644
--- a/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/report/OppositionReportServiceImpl.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.finalseminar.FinalSeminarOpposition;
import se.su.dsv.scipro.finalseminar.FinalSeminarOppositionRepo;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
public class OppositionReportServiceImpl implements OppositionReportService {
diff --git a/core/src/main/java/se/su/dsv/scipro/report/ReportServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/report/ReportServiceImpl.java
index 79d0ee4032..f8ba6bd969 100644
--- a/core/src/main/java/se/su/dsv/scipro/report/ReportServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/report/ReportServiceImpl.java
@@ -6,8 +6,8 @@ import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.file.FileUpload;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/AbstractReviewerApprovalServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/AbstractReviewerApprovalServiceImpl.java
index 143d85bb70..39c3bfe513 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/AbstractReviewerApprovalServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/AbstractReviewerApprovalServiceImpl.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java
index 6d26492708..52643f2d84 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/DecisionRepositoryImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.time.LocalDate;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java
index a2f056d785..5d8e123342 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImpl.java
@@ -9,8 +9,8 @@ import se.su.dsv.scipro.misc.DaysService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Date;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java
index 283d27e889..018b255f9b 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ProjectFinalSeminarStatisticsServiceImpl.java
@@ -16,8 +16,8 @@ import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.Date;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java
index 7f1d832cf0..671388508b 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImpl.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.Month;
import java.time.Year;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java
index 9909a268c0..1edd826fb5 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineFollowupServiceImpl.java
@@ -5,8 +5,8 @@ import com.querydsl.jpa.JPAExpressions;
import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.ArrayList;
import java.util.Date;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsRepositoryImpl.java
index 912a700c54..bcaf1e434e 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsRepositoryImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.reviewing;
import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.system.AbstractRepository;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
class ReviewerDeadlineSettingsRepositoryImpl
extends AbstractRepository
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsServiceImpl.java
index 59ae94adde..e52d28d078 100755
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDeadlineSettingsServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.reviewing;
import com.google.inject.persist.Transactional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ReviewerDeadlineSettingsServiceImpl implements ReviewerDeadlineSettingsService {
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java
index 304c338d39..16e011b3c1 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerDecisionReminderWorker.java
@@ -20,7 +20,7 @@ import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ReviewerDecisionReminderWorker extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java
index 1681d89553..0079e40a2b 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerInteractionServiceImpl.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.forum.dataobjects.ReviewerThread;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ReviewerInteractionServiceImpl implements ReviewerInteractionService {
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java
index 9b5c9bd86d..985ae1934b 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerTargetRepositoryImpl.java
@@ -5,8 +5,8 @@ import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.system.AbstractRepository;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.time.Year;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerThreadRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerThreadRepositoryImpl.java
index 129546658d..7cc9d289b6 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerThreadRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewerThreadRepositoryImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.forum.dataobjects.ReviewerThread;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java
index f9b04f703d..9087510e37 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/ReviewingServiceImpl.java
@@ -16,8 +16,8 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.Page;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java
index acb7d77f8b..fea26c83d6 100644
--- a/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/reviewing/RoughDraftApprovalServiceImpl.java
@@ -9,8 +9,8 @@ import se.su.dsv.scipro.misc.DaysService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Date;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/security/auth/AuthenticationServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/security/auth/AuthenticationServiceImpl.java
index 98df731a33..b213680052 100644
--- a/core/src/main/java/se/su/dsv/scipro/security/auth/AuthenticationServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/security/auth/AuthenticationServiceImpl.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.security.auth;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Set;
public class AuthenticationServiceImpl implements AuthenticationService {
diff --git a/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java b/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java
index 8a01910a74..ae7f3fa8b0 100644
--- a/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java
+++ b/core/src/main/java/se/su/dsv/scipro/security/auth/LocalAuthentication.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.security.auth;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class LocalAuthentication implements AuthenticationProvider {
private final UserService userService;
diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
index a9109afe08..4110fac926 100755
--- a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImpl.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.SupervisorService;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UnitServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UnitServiceImpl.java
index ecfad47113..a8d949d61f 100755
--- a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UnitServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UnitServiceImpl.java
@@ -5,8 +5,8 @@ import se.su.dsv.scipro.system.AbstractServiceImpl;
import se.su.dsv.scipro.system.QUnit;
import se.su.dsv.scipro.system.Unit;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class UnitServiceImpl extends AbstractServiceImpl<Unit,Long> implements UnitService {
diff --git a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java
index 98b9eff5f0..112f48664d 100644
--- a/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImpl.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.settings.dataobjects.UserProfile;
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java
index 28ee9b3246..9bc4f51e9a 100644
--- a/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/survey/QuestionRepositoryImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.survey;
import se.su.dsv.scipro.system.GenericRepo;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class QuestionRepositoryImpl extends GenericRepo<Question, Long> implements QuestionRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java
index cc97314c7d..0ad67d6a8e 100644
--- a/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/survey/SurveyRepositoryImpl.java
@@ -4,8 +4,8 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.GenericRepo;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java
index fcff4e6445..ecb7c22070 100644
--- a/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/survey/SurveyServiceImpl.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.reflection.ReflectionService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/AbstractRepository.java b/core/src/main/java/se/su/dsv/scipro/system/AbstractRepository.java
index 6d787cd852..1eb4166edc 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/AbstractRepository.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/AbstractRepository.java
@@ -4,7 +4,7 @@ package se.su.dsv.scipro.system;
import com.querydsl.core.types.EntityPath;
import com.querydsl.jpa.impl.JPAQuery;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class AbstractRepository {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java
index b92f8c6d4a..22e22d9613 100755
--- a/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/AbstractServiceImpl.java
@@ -9,7 +9,7 @@ import com.querydsl.jpa.impl.JPAQuery;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java b/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java
index 4f947a86d2..400776d582 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/AggregateUserSearch.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.system;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.Comparator;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/EventServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/EventServiceImpl.java
index c10d8d29b5..3fbcbc485e 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/EventServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/EventServiceImpl.java
@@ -1,8 +1,8 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
@Named
diff --git a/core/src/main/java/se/su/dsv/scipro/system/ExternalResourceServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/ExternalResourceServiceImpl.java
index 765cd80a60..22e90d4d9c 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/ExternalResourceServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/ExternalResourceServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.system;
import com.querydsl.jpa.impl.JPAQuery;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java
index 86091877e0..cb10abb4a2 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/FooterAddressRepoImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class FooterAddressRepoImpl extends GenericRepo<FooterAddress, Long> implements FooterAddressRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java
index d92f19d883..382a24185e 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkRepoImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java
index fcee0bd7e4..327b83accc 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/FooterLinkServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class FooterLinkServiceImpl implements FooterLinkService {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java b/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java
index a512fac091..36c735a306 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/GenericRepo.java
@@ -11,7 +11,7 @@ import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/LocalUserSearch.java b/core/src/main/java/se/su/dsv/scipro/system/LocalUserSearch.java
index fa52d8a31d..197886adc0 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/LocalUserSearch.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/LocalUserSearch.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.system;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/MergeServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/MergeServiceImpl.java
index 0095b11a38..0c58d7f4d5 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/MergeServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/MergeServiceImpl.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.system;
import com.google.inject.persist.Transactional;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class MergeServiceImpl implements MergeService {
private final UserNameService userNameService;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/PasswordRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/PasswordRepoImpl.java
index 6c993ced40..59c34eb5c5 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/PasswordRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/PasswordRepoImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class PasswordRepoImpl extends GenericRepo<Password, Long> implements PasswordRepo {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java
index 11730381d8..1691b55e85 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/PasswordServiceImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
@Named
public class PasswordServiceImpl implements PasswordService {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java
index b1ae26af8f..d631c86db9 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/ProjectTypeServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.system;
import com.querydsl.core.types.dsl.BooleanExpression;
import se.su.dsv.scipro.project.QProject;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java
index 2620dc126f..76dc29c854 100755
--- a/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/ResearchAreaServiceImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Comparator;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java
index b13b6eda72..537dbfce81 100755
--- a/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/UserNameServiceImpl.java
@@ -1,7 +1,7 @@
package se.su.dsv.scipro.system;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class UserNameServiceImpl extends AbstractServiceImpl<Username, Long> implements UserNameService {
diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserRepoImpl.java b/core/src/main/java/se/su/dsv/scipro/system/UserRepoImpl.java
index c2b09399a6..80a0a28ee4 100644
--- a/core/src/main/java/se/su/dsv/scipro/system/UserRepoImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/UserRepoImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.jpa.JPAExpressions;
import org.springframework.data.domain.Pageable;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.Collection;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java
index f16c22e349..5fd3aaa5fb 100755
--- a/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/system/UserServiceImpl.java
@@ -4,8 +4,8 @@ import com.querydsl.core.BooleanBuilder;
import com.querydsl.core.types.Predicate;
import org.springframework.data.domain.Pageable;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import se.su.dsv.scipro.security.auth.roles.Roles;
diff --git a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java
index 0bb0055573..7c43a97286 100755
--- a/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkServiceImpl.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.thesislink;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.util.List;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/AbstractWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/AbstractWorker.java
index bdb8f800de..751b6c8831 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/AbstractWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/AbstractWorker.java
@@ -4,8 +4,8 @@ import com.google.inject.persist.UnitOfWork;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
import java.util.Date;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java
index 018227c1a0..f5debaf3f4 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/GradeFinalSeminarParticipantReminderWorker.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.mail.MailEvent;
import se.su.dsv.scipro.mail.MailEventService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java
index 6dd74f92b9..b804974c12 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/IdeaExportWorker.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.MessageFormat;
import java.time.*;
import java.util.*;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java
index 6e7b2c24b2..87d4ebe639 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ManualMatchRemindWorker.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.match.Idea;
import se.su.dsv.scipro.match.IdeaService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.LocalDate;
import java.util.Collections;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java
index 7005b9e73b..d92764fa0b 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/NotificationCompilationWorker.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.notifications.settings.service.DeliveryConfigurationServ
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class NotificationCompilationWorker extends AbstractWorker {
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java
index 3ce70b65b8..d8ecf35252 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/SchedulerImpl.java
@@ -4,9 +4,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import se.su.dsv.scipro.system.Lifecycle;
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
+import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java
index a211203f8b..3e5f06a700 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/Task.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.workerthreads;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import java.io.Serializable;
import java.util.Comparator;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/TaskScheduling.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/TaskScheduling.java
index f74f7f29dc..b56f9ba386 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/TaskScheduling.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/TaskScheduling.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.workerthreads;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import java.util.concurrent.TimeUnit;
class TaskScheduling implements ScheduleBuilder, WorkerBuilder {
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java
index e206ff085f..caab359a7f 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/TemporaryWorkerScheduler.java
@@ -6,8 +6,8 @@ import se.su.dsv.scipro.plagiarism.urkund.StatusPollingWorker;
import se.su.dsv.scipro.projectpartner.RemoveFulfilledPartnerAdsWorker;
import se.su.dsv.scipro.reviewing.ReviewerDecisionReminderWorker;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.concurrent.TimeUnit;
public class TemporaryWorkerScheduler {
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java
index 4d6f279aaf..98e9d14f53 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadDeadlineWorker.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.workerthreads;
import se.su.dsv.scipro.finalseminar.FinalSeminar;
import se.su.dsv.scipro.finalseminar.FinalSeminarService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.LocalDate;
import java.time.Month;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java
index 26f221dc29..9c16bd7196 100755
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/ThesisUploadReminderWorker.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.notifications.dataobject.SeminarEvent;
import se.su.dsv.scipro.reusable.SciProUtilities;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerBuilder.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerBuilder.java
index c988760c69..fea8697655 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerBuilder.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerBuilder.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.workerthreads;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
public interface WorkerBuilder {
ScheduleBuilder runBy(Provider<? extends Worker> provider);
diff --git a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java
index 75ce5fa5db..23dccfd75e 100644
--- a/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java
+++ b/core/src/main/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImpl.java
@@ -2,8 +2,8 @@ package se.su.dsv.scipro.workerthreads;
import se.su.dsv.scipro.system.AbstractServiceImpl;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
public class WorkerDataServiceImpl extends AbstractServiceImpl<WorkerData,Long> implements WorkerDataService {
diff --git a/core/src/main/resources/META-INF/persistence.xml b/core/src/main/resources/META-INF/persistence.xml
index fb40a71417..fc5f0a5977 100755
--- a/core/src/main/resources/META-INF/persistence.xml
+++ b/core/src/main/resources/META-INF/persistence.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
- http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
- version="2.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+ version="3.0">
<!-- NOTE THAT THERE ARE TWO PERSISTENCE UNITS, one default and one test
used for either running or unit-tests -->
diff --git a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java
index cf064a49fa..1fcbe09d16 100644
--- a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTest.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java
index ced3fcb9d5..33c717a87e 100644
--- a/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java
+++ b/core/src/test/java/se/su/dsv/scipro/activityplan/ActivityPlanFacadeImplIntegrationTestChecklistMethods.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
diff --git a/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java
index 19a1380ad5..ec10a6909a 100644
--- a/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/checklist/ChecklistTemplateServiceImplTest.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.ArrayList;
diff --git a/core/src/test/java/se/su/dsv/scipro/date/DateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/date/DateServiceImplTest.java
index cb7e20a0a9..e3ab4fae59 100644
--- a/core/src/test/java/se/su/dsv/scipro/date/DateServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/date/DateServiceImplTest.java
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class DateServiceImplTest extends IntegrationTest {
diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java
index 11e7e6fa6d..07fdc37c8c 100644
--- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarOppositionServiceImplIntegrationTest.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Date;
diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java
index ec20a29a92..aec42c16e9 100644
--- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarRespondentServiceImplIntegrationTest.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Date;
diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java
index becb0ebc04..d6d3bd3b69 100644
--- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarSchedulingTest.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.test.MutableFixedClock;
import se.su.dsv.scipro.test.StreamingUpload;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java
index 9245f2b764..b11c3af291 100644
--- a/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/finalseminar/FinalSeminarServiceImplIntegrationTest.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.Date;
diff --git a/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java
index 715b92ec71..a60b2d2ab6 100644
--- a/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/finalthesis/FinalThesisServiceImplTest.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
import se.su.dsv.scipro.test.StreamingUpload;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.InputStream;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java b/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java
index 3443094f7c..5c6caea2ef 100644
--- a/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forum/GroupForumServiceTest.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.forum.dataobjects.GroupThread;
import se.su.dsv.scipro.group.Group;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
diff --git a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
index 400143e7bd..199d5e8520 100644
--- a/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forum/ProjectForumServiceImplTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.StreamingUpload;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailServiceImplTest.java
index 6d8f3c8546..c9295b445c 100644
--- a/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailServiceImplTest.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImplTest.java
index cfa6beefca..4ea3e85405 100644
--- a/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forummail/ForumMailSettingsServiceImplTest.java
@@ -2,7 +2,7 @@ package se.su.dsv.scipro.forummail;
import org.junit.jupiter.api.Test;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/core/src/test/java/se/su/dsv/scipro/forummail/ReadForumMailTest.java b/core/src/test/java/se/su/dsv/scipro/forummail/ReadForumMailTest.java
index 3c41af4d16..3226f85d78 100644
--- a/core/src/test/java/se/su/dsv/scipro/forummail/ReadForumMailTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/forummail/ReadForumMailTest.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.ObjectMother;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java
index 120242a68d..da314ab9c1 100644
--- a/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/group/GroupServiceImplTest.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Collections;
import java.util.HashSet;
diff --git a/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java
index b5c065e9b3..de318612eb 100644
--- a/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/match/ApplicationPeriodServiceImplTest.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Collections;
diff --git a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java
index a2c5e6fbd7..c200ff22c5 100644
--- a/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/match/IdeaServiceImplIntegrationTest.java
@@ -12,7 +12,7 @@ import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Set;
diff --git a/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java b/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java
index c4192a4d5b..d3e1aa499a 100644
--- a/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/match/MatchFollowUpServiceTest.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java
index dcd62476c7..e31511020f 100644
--- a/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/match/TargetServiceImplTest.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/core/src/test/java/se/su/dsv/scipro/match/TestKeyword.java b/core/src/test/java/se/su/dsv/scipro/match/TestKeyword.java
index 7bb9ce3869..3932af2b01 100755
--- a/core/src/test/java/se/su/dsv/scipro/match/TestKeyword.java
+++ b/core/src/test/java/se/su/dsv/scipro/match/TestKeyword.java
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java
index dc1d50f326..a09823fa35 100644
--- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestonePhaseTemplateServiceImplTest.java
@@ -6,7 +6,7 @@ import org.springframework.data.domain.Sort;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java
index 75b44b8b0c..83dab95c61 100644
--- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneServiceImplIntegrationTest.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Collections;
diff --git a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java
index 51ed521562..7d4283e986 100644
--- a/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/milestones/service/impl/MilestoneStatisticsServiceImplTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Collection;
diff --git a/core/src/test/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImplTest.java
index 731114b464..64d4ea6480 100644
--- a/core/src/test/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/nonworkperiod/NonWorkDayPeriodServiceImplTest.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.nonworkperiod;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Date;
diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java
index 7b75e82cd2..1c496ff1f1 100644
--- a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplIntegrationTest.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java
index ecdfb47a50..21215fba77 100644
--- a/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/notifications/NotificationServiceImplTest.java
@@ -5,7 +5,7 @@ import se.su.dsv.scipro.notifications.dataobject.Notification;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java
index 6790ea91b7..859d745825 100644
--- a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/DeliveryConfigurationServiceImplTest.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.notifications.settings.entities.DeliveryMethod;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImplTest.java
index a8c708490c..6bcf07bee1 100644
--- a/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/notifications/settings/service/ReceiverConfigurationServiceImplTest.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.notifications.dataobject.Notification;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java
index 8b6a0ee1e4..a06e305f00 100644
--- a/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/CommentServiceImplTest.java
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java
index bca7eb68ca..55cee624c3 100644
--- a/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/CommentThreadServiceImplTest.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.Dates;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java
index 660d254b03..d06d0b63b7 100644
--- a/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerRequestServiceImplTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.Dates;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.EnumSet;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java
index 52b55aafe5..7d7b8fa320 100644
--- a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplIntegrationTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.Dates;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.List;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java
index 6f3241afc9..c35daaff5e 100644
--- a/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/PeerReviewServiceImplTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.Dates;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.EnumSet;
diff --git a/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java b/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java
index 22f850a556..48838b35f3 100755
--- a/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java
+++ b/core/src/test/java/se/su/dsv/scipro/peer/TestPeerReview.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Duration;
diff --git a/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryTest.java b/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryTest.java
index bbb6e92035..a2eb62c871 100644
--- a/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSettingsRepositoryTest.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.sukat.SukatModule;
import se.su.dsv.scipro.test.GuiceTest;
import se.su.dsv.scipro.test.InMemoryFileStore;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryTest.java b/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryTest.java
index ed837b530a..0d2599f5fd 100644
--- a/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/plagiarism/urkund/UrkundSubmissionRepositoryTest.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.sukat.Sukat;
import se.su.dsv.scipro.test.GuiceTest;
import se.su.dsv.scipro.test.InMemoryFileStore;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.util.Optional;
diff --git a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java
index c822ebd8d4..0028849f94 100644
--- a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplIntegrationTest.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplTest.java
index ea5cbaf5ff..90c4d77867 100644
--- a/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/project/ProjectServiceImplTest.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.UserBuilder;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.LocalDate;
diff --git a/core/src/test/java/se/su/dsv/scipro/project/TestProject.java b/core/src/test/java/se/su/dsv/scipro/project/TestProject.java
index d583947782..7d92c2e545 100755
--- a/core/src/test/java/se/su/dsv/scipro/project/TestProject.java
+++ b/core/src/test/java/se/su/dsv/scipro/project/TestProject.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.List;
diff --git a/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java
index 976c310579..d758673608 100644
--- a/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/projectpartner/ProjectPartnerServiceImplTest.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java b/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java
index 21ef6c6adb..8d8d462e31 100644
--- a/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/reflection/ReflectionServiceTest.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.test.IntegrationTest;
import se.su.dsv.scipro.test.MutableFixedClock;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Set;
diff --git a/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java
index 1639a40c7f..6bd8a3f8a8 100644
--- a/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/report/GradingReportServiceImplIntegrationTest.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java
index 97236187de..587bd8b6c8 100644
--- a/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/reviewing/FinalSeminarApprovalServiceImplTest.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.Optional;
import java.util.function.Function;
diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java
index de9a555168..8c87bf7d11 100644
--- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewerCapacityServiceImplTest.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.Month;
import java.time.Year;
diff --git a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java
index 1400126577..56398d9f29 100644
--- a/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/reviewing/ReviewingServiceImplTest.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
diff --git a/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java b/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java
index f2b8f6cef1..d752c73cff 100644
--- a/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/security/auth/LocalAuthenticationTest.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.Username;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImplTest.java
index 1babac5e7b..2b6ac80265 100644
--- a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/SupervisorServiceImplTest.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.Username;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
diff --git a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java
index 3f32d8c707..69a22cdbaa 100644
--- a/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/springdata/serviceimpls/UserProfileServiceImplIntegrationTest.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/core/src/test/java/se/su/dsv/scipro/system/EventServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/system/EventServiceImplTest.java
index c465773528..5154bddd10 100644
--- a/core/src/test/java/se/su/dsv/scipro/system/EventServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/system/EventServiceImplTest.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.system;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java
index 037cc1edfb..835a575d2a 100644
--- a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplIntegrationTest.java
@@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplTest.java
index 278a16a27a..90f1502cb4 100644
--- a/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/system/ProjectTypeServiceImplTest.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.system;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.not;
diff --git a/core/src/test/java/se/su/dsv/scipro/system/ResearchAreaServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/system/ResearchAreaServiceImplIntegrationTest.java
index 911da933fb..a575b2a884 100644
--- a/core/src/test/java/se/su/dsv/scipro/system/ResearchAreaServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/system/ResearchAreaServiceImplIntegrationTest.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.system;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import static org.hamcrest.CoreMatchers.hasItem;
diff --git a/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java
index 4edf1b3adb..8a8d7bd372 100644
--- a/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/system/UserServiceImplIntegrationTest.java
@@ -6,7 +6,7 @@ import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.hasItem;
diff --git a/core/src/test/java/se/su/dsv/scipro/test/GuiceTest.java b/core/src/test/java/se/su/dsv/scipro/test/GuiceTest.java
index 7ecf909628..6d2667ef5c 100644
--- a/core/src/test/java/se/su/dsv/scipro/test/GuiceTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/test/GuiceTest.java
@@ -5,17 +5,20 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.persist.PersistService;
+import com.google.inject.persist.UnitOfWork;
+import com.google.inject.persist.jpa.JpaPersistModule;
import jakarta.persistence.EntityManager;
import jakarta.persistence.EntityTransaction;
-import modules.JakartaPersistModule;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.time.Clock;
public abstract class GuiceTest {
+ @Inject
+ private UnitOfWork unitOfWork;
@Inject
private PersistService persistService;
@Inject
@@ -24,7 +27,7 @@ public abstract class GuiceTest {
@BeforeEach
public final void prepareGuice() {
Injector injector = Guice.createInjector(
- new JakartaPersistModule("testPersistenceUnit"),
+ new JpaPersistModule("testPersistenceUnit"),
new AbstractModule() {
@Override
protected void configure() {
@@ -34,6 +37,12 @@ public abstract class GuiceTest {
}
},
moduleUnderTest());
+
+ // Have to start the PersistService and UnitOfWork manually since they are no longer
+ // automatically started as an EntityManager is injected
+ injector.getInstance(PersistService.class).start();
+ injector.getInstance(UnitOfWork.class).begin();
+
injector.injectMembers(this);
persistService.start();
@@ -47,6 +56,7 @@ public abstract class GuiceTest {
@AfterEach
public final void shutDownPersistence() {
entityManager.get().getTransaction().rollback();
+ unitOfWork.end();
persistService.stop();
}
diff --git a/core/src/test/java/se/su/dsv/scipro/test/InstanceProvider.java b/core/src/test/java/se/su/dsv/scipro/test/InstanceProvider.java
index e20b09e21c..5228f4755f 100644
--- a/core/src/test/java/se/su/dsv/scipro/test/InstanceProvider.java
+++ b/core/src/test/java/se/su/dsv/scipro/test/InstanceProvider.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.test;
-import javax.inject.Provider;
+import jakarta.inject.Provider;
public class InstanceProvider<T> implements Provider<T> {
private final T instance;
diff --git a/core/src/test/java/se/su/dsv/scipro/test/IntegrationTest.java b/core/src/test/java/se/su/dsv/scipro/test/IntegrationTest.java
index 553457e866..4833f0e4bd 100644
--- a/core/src/test/java/se/su/dsv/scipro/test/IntegrationTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/test/IntegrationTest.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.sukat.SukatModule;
import se.su.dsv.scipro.system.CurrentUser;
import se.su.dsv.scipro.system.User;
-import javax.inject.Singleton;
+import jakarta.inject.Singleton;
public abstract class IntegrationTest extends GuiceTest {
diff --git a/core/src/test/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImplTest.java b/core/src/test/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImplTest.java
index ede0f94d74..f09cba2817 100644
--- a/core/src/test/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImplTest.java
+++ b/core/src/test/java/se/su/dsv/scipro/workerthreads/WorkerDataServiceImplTest.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.workerthreads;
import org.junit.jupiter.api.Test;
import se.su.dsv.scipro.test.IntegrationTest;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java
index 467f3fe1c9..b73c8bb2e1 100755
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ExternalImporterDaisyImpl.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserImportService;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ws.rs.ClientErrorException;
import java.util.*;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java
index d0c6e4e906..0fe1dd6e51 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/daisyExternal/impl/ImporterTransactionsImpl.java
@@ -16,8 +16,8 @@ import se.su.dsv.scipro.system.Program;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.*;
import java.util.stream.Stream;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/Daisy.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/Daisy.java
index 03130e8b17..b9761ae4d9 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/Daisy.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/Daisy.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.match.IdeaParticipation;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java
index 663b2a8902..9d9196ffde 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyConsentService.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.io.dto.PublishingConsentLevel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
class DaisyConsentService implements PublishingConsentService {
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java
index 555e86a529..5a19240abf 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyUserSearchService.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchProvider;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import jakarta.ws.rs.WebApplicationException;
import java.util.Collection;
import java.util.Collections;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java
index f5c5ac2d99..4d52011ff7 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/DaisyWorkerInitialization.java
@@ -3,8 +3,8 @@ package se.su.dsv.scipro.integration.daisy;
import se.su.dsv.scipro.integration.daisy.workers.*;
import se.su.dsv.scipro.workerthreads.Scheduler;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.concurrent.TimeUnit;
public class DaisyWorkerInitialization {
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java
index c59158255c..0ce564f578 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/SyncReviewerWithDaisy.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ReviewerAssignedEvent;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Objects;
import java.util.Set;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java
index f36e18155e..3decbe0be9 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/GradingCompletedMilestoneActivator.java
@@ -17,8 +17,8 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Optional;
import java.util.Set;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java
index c77101bd7a..4f58039bb0 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ImportNationalCategories.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.grading.NationalSubjectCategoryService;
import se.su.dsv.scipro.io.dto.ResearchSubject;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Optional;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java
index 201a8c2b69..063b799079 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectExporter.java
@@ -21,8 +21,8 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.time.Instant;
import java.time.Period;
import java.util.Calendar;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java
index c839ad1bdd..7830db1ab9 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/ProjectFinalizer.java
@@ -11,8 +11,8 @@ import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.project.QProject;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.time.Instant;
import java.util.Optional;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java
index 2308a4d006..ad6cd7d8eb 100644
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/RejectedThesisWorker.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.report.GradingReportService;
import se.su.dsv.scipro.report.SupervisorGradingReport;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Date;
import java.util.List;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java
index 45d0e557b3..7ddcc8a675 100755
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/integration/daisy/workers/UserImportWorker.java
@@ -19,8 +19,8 @@ import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.system.Username;
import se.su.dsv.scipro.workerthreads.AbstractWorker;
-import javax.inject.Inject;
-import javax.inject.Provider;
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.persistence.EntityManager;
import java.time.Year;
import java.util.*;
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java b/daisy-integration/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java
index ff868666aa..4d7c11803d 100755
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/io/facade/ExporterFacade.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ExporterFacade {
diff --git a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java
index 37c480ba8a..66d34aa027 100755
--- a/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java
+++ b/daisy-integration/src/main/java/se/su/dsv/scipro/io/impl/ExternalExporterDaisyImpl.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
diff --git a/pom.xml b/pom.xml
index a5a702df33..d3f2719494 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<!-- Dependency versions -->
<slf4j.version>2.0.7</slf4j.version>
<log4j2.version>2.20.0</log4j2.version>
- <wicket.version>9.16.0</wicket.version>
+ <wicket.version>10.0.0</wicket.version>
<!-- See https://hibernate.org/orm/releases/ for which version Hibernate implements -->
<jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
@@ -30,14 +30,14 @@
<mariadb-java-client.version>3.2.0</mariadb-java-client.version>
<querydsl.version>5.0.0</querydsl.version>
- <jakarta.servlet.version>4.0.4</jakarta.servlet.version>
+ <jakarta.servlet.version>5.0.0</jakarta.servlet.version>
<junit.version>5.9.3</junit.version>
<hsqldb.version>2.7.1</hsqldb.version>
<mockito.version>5.3.1</mockito.version>
<flyway.version>9.19.1</flyway.version>
<jersey.version>3.1.6</jersey.version>
- <guice.version>5.1.0</guice.version>
- <poi.version>5.2.3</poi.version>
+ <guice.version>7.0.0</guice.version>
+ <poi.version>5.2.5</poi.version>
<jackson.version>2.17.0</jackson.version>
<!-- Database stuff -->
@@ -71,6 +71,11 @@
<artifactId>wicket-extensions</artifactId>
<version>${wicket.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-tester</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jasperreports</artifactId>
@@ -195,17 +200,17 @@
<dependency>
<groupId>jakarta.mail</groupId>
<artifactId>jakarta.mail-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.3</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>2.0.1</version>
+ <version>2.1.3</version>
</dependency>
<dependency>
- <groupId>com.sun.mail</groupId>
+ <groupId>org.eclipse.angus</groupId>
<artifactId>jakarta.mail</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
<scope>runtime</scope>
</dependency>
@@ -351,11 +356,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.0</version>
- <configuration>
- <systemPropertyVariables>
- <wicket.ioc.useByteBuddy>true</wicket.ioc.useByteBuddy>
- </systemPropertyVariables>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/view/pom.xml b/view/pom.xml
index 9d38734b6c..e3a1248be5 100644
--- a/view/pom.xml
+++ b/view/pom.xml
@@ -50,6 +50,11 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-tester</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-jasperreports</artifactId>
diff --git a/view/src/main/java/ApplicationBootstrap.java b/view/src/main/java/ApplicationBootstrap.java
index d54cca9cff..d5631e6f1c 100644
--- a/view/src/main/java/ApplicationBootstrap.java
+++ b/view/src/main/java/ApplicationBootstrap.java
@@ -9,7 +9,7 @@ import com.google.inject.servlet.ServletModule;
import org.apache.wicket.guice.GuiceWebApplicationFactory;
import org.apache.wicket.protocol.http.WicketFilter;
-import javax.servlet.ServletContext;
+import jakarta.servlet.ServletContext;
import java.net.CookieHandler;
import java.net.CookieManager;
import java.time.Clock;
diff --git a/view/src/main/java/DatabaseMigration.java b/view/src/main/java/DatabaseMigration.java
index 1da0d98854..442e3003e4 100644
--- a/view/src/main/java/DatabaseMigration.java
+++ b/view/src/main/java/DatabaseMigration.java
@@ -2,8 +2,8 @@ import org.flywaydb.core.Flyway;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
import javax.sql.DataSource;
public class DatabaseMigration implements ServletContextListener {
diff --git a/view/src/main/java/se/su/dsv/scipro/HomePage.java b/view/src/main/java/se/su/dsv/scipro/HomePage.java
index 02cd3b7d30..c2eec34275 100755
--- a/view/src/main/java/se/su/dsv/scipro/HomePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/HomePage.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.supervisor.pages.SupervisorStartPage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class HomePage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/SciProApplication.java b/view/src/main/java/se/su/dsv/scipro/SciProApplication.java
index 41c2fb5aec..e5e2f46932 100755
--- a/view/src/main/java/se/su/dsv/scipro/SciProApplication.java
+++ b/view/src/main/java/se/su/dsv/scipro/SciProApplication.java
@@ -79,7 +79,7 @@ import se.su.dsv.scipro.user.AdminSwitchUserPage;
import se.su.dsv.scipro.user.AdminUsersPage;
import se.su.dsv.scipro.util.AdditionalExceptionLogger;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
diff --git a/view/src/main/java/se/su/dsv/scipro/SciProModule.java b/view/src/main/java/se/su/dsv/scipro/SciProModule.java
index 8b406b18f4..26e7f0a6ba 100644
--- a/view/src/main/java/se/su/dsv/scipro/SciProModule.java
+++ b/view/src/main/java/se/su/dsv/scipro/SciProModule.java
@@ -2,10 +2,10 @@ package se.su.dsv.scipro;
import com.google.inject.Singleton;
import com.google.inject.multibindings.Multibinder;
+import com.google.inject.persist.jpa.JpaPersistModule;
import com.google.inject.servlet.ServletModule;
import com.google.inject.servlet.SessionScoped;
import modules.CoreModule;
-import modules.JakartaPersistModule;
import org.apache.wicket.protocol.http.WebApplication;
import se.su.dsv.scipro.file.FileModule;
import se.su.dsv.scipro.file.FileStore;
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.workerthreads.WorkerModule;
public class SciProModule extends ServletModule {
@Override
protected void configureServlets() {
- install(new JakartaPersistModule("defaultPersistenceUnit"));
+ install(new JpaPersistModule("defaultPersistenceUnit"));
install(new CoreModule());
install(new FileModule());
bind(FileStore.class).to(FileSystemStore.class);
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java
index 4bffff0ad4..ff3b0414de 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanPanel.java
@@ -41,7 +41,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java
index 19ba2d3522..80eeb110c3 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDataPanel.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.dataproviders.PageAdapter;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java
index 4d1aa76d59..ce514b5a7d 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityPlanTemplateDetailsPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ActivityPlanTemplateDetailsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityUploadForm.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityUploadForm.java
index 4e9b98ecc6..0893c724c7 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityUploadForm.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ActivityUploadForm.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static se.su.dsv.scipro.notifications.dataobject.ProjectEvent.Event.FILE_UPLOADED;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java
index afe7259e60..606e508172 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AddActivitiesFromTemplatePanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java
index 1d47ca1a48..d2d2a6ecf8 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.checklist.ChecklistTemplate;
import se.su.dsv.scipro.checklist.ChecklistTemplateService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
public abstract class AdminEditActivityPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java
index befcdf08af..2bf7a8c88f 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/AdminEditActivityTemplatePage.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAdminActivityPl
import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AdminEditActivityTemplatePage extends AbstractAdminProjectPage implements MenuHighlightAdminActivityPlanTemplates {
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java
index 03196c34b4..f137f799ad 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityPanel.java
@@ -28,7 +28,7 @@ import se.su.dsv.scipro.security.auth.ProjectModuleComponent;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java
index 3ea40242a1..c5de1cbb94 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/EditActivityTemplatePanel.java
@@ -15,7 +15,7 @@ import org.apache.wicket.model.Model;
import se.su.dsv.scipro.components.ModalWindowPlus;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java
index 0685228f28..2b7762c5ae 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/PreviewActivityPlanTemplatePanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.components.BootstrapDateField;
import se.su.dsv.scipro.components.DateLabel;
import se.su.dsv.scipro.misc.DaysService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java
index eef14f423a..f1f0c622c7 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/ProjectEditActivityPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles={Roles.AUTHOR})
@ProjectModuleComponent(ProjectModule.ACTIVITY_PLAN)
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanel.java
index 81d04c0ae3..d3f75c3f6f 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SaveAsTemplatePanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SaveAsTemplatePanel extends GenericPanel<ActivityPlan> {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java
index 11a9dd5ff9..eba8a531b1 100755
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityPage.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles={Roles.SUPERVISOR})
@ProjectModuleComponent(ProjectModule.ACTIVITY_PLAN)
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java
index 2445d34bbe..03113925a5 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/SupervisorEditActivityTemplatePage.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorAllProjectsPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorEditActivityTemplatePage extends AbstractSupervisorAllProjectsPage implements MenuHighlightSupervisorActivityTemplates {
public static final String PANEL = "panel";
diff --git a/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java b/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java
index ca4942372f..fee31e277a 100644
--- a/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/activityplan/UpcomingActivitiesPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminPage.java
index 235f90b782..8de601f2c2 100755
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AbstractAdminPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.statistics.AdminStatisticsPage;
import se.su.dsv.scipro.user.AdminUsersPage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java
index 4edfb8f09f..3d137d35b0 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminAssignReviewerPage.java
@@ -37,7 +37,7 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.LocalDate;
import java.util.ArrayList;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java
index e76da6b34d..2656b2ea90 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminCreateProjectPage.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchService;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java
index 98cd4ce34d..618b425393 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminEditProjectPage.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminForumSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminForumSettingsPage.java
index e145670c42..4782ee234b 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminForumSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminForumSettingsPage.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import se.su.dsv.scipro.forummail.ForumMailSettings;
import se.su.dsv.scipro.forummail.ForumMailSettingsService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AdminForumSettingsPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java
index b88bb90d37..921e69bbe7 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminMailLogPage.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.mail.MailEvent;
import se.su.dsv.scipro.mail.MailEventService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java
index 348978a23e..6510ac7166 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminReviewerCapacityManagementPage.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.springdata.services.UnitService;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.Year;
import java.util.ArrayList;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java
index d5d979bb6c..0c1aa1c26d 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyPage.java
@@ -22,7 +22,7 @@ import se.su.dsv.scipro.components.ConfirmationLink;
import se.su.dsv.scipro.survey.Question;
import se.su.dsv.scipro.survey.SurveyService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java
index 73c9c33ca0..74d431751d 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/AdminSurveyStatisticsPage.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.survey.SurveyStatistics;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminSurveyStatisticsPage extends AbstractAdminStatisticsPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java
index 23f31f6ea2..6228da74af 100755
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.workerthreads.Task;
import se.su.dsv.scipro.workerthreads.WorkerData;
import se.su.dsv.scipro.workerthreads.WorkerDataService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Duration;
import java.util.List;
import java.util.Optional;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java
index da9f508a8d..d460d34769 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectModuleSettingsPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java
index 0a954c0eee..9f68227ffa 100755
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminProjectTypeSettingsPage.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.components.ModalWindowPlus;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminProjectTypeSettingsPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminReviewerDeadlineSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminReviewerDeadlineSettingsPage.java
index c123f4eb90..4c508708f1 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminReviewerDeadlineSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminReviewerDeadlineSettingsPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.admin.pages.AbstractAdminSystemPage;
import se.su.dsv.scipro.reviewing.ReviewerDeadlineSettings;
import se.su.dsv.scipro.reviewing.ReviewerDeadlineSettingsService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AdminReviewerDeadlineSettingsPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java
index cba24e1de0..acccdd4e39 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/settings/AdminUrkundSettingsPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.admin.pages.AbstractAdminSystemPage;
import se.su.dsv.scipro.plagiarism.urkund.UrkundSettings;
import se.su.dsv.scipro.plagiarism.urkund.UrkundSettingsRepository;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AdminUrkundSettingsPage extends AbstractAdminSystemPage {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java
index e5f956aec1..48e268a040 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterAddressPanel.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.Model;
import se.su.dsv.scipro.system.FooterAddress;
import se.su.dsv.scipro.system.FooterAddressRepo;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminEditFooterAddressPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java
index 561e5c326a..b6338863af 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminEditFooterColumnPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.system.FooterColumn;
import se.su.dsv.scipro.system.FooterLink;
import se.su.dsv.scipro.system.FooterLinkService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminEditFooterColumnPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java
index b01f595e15..35c9cc82ab 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminMailPanel.java
@@ -52,7 +52,7 @@ import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.CopyTextPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java
index 3f6972cde8..a50e5f87d5 100755
--- a/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/AdminProjectTypePanel.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.ProjectTypeSettings;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
public class AdminProjectTypePanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/panels/PeerRequestStatsPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/panels/PeerRequestStatsPanel.java
index 396177c936..f264894abf 100755
--- a/view/src/main/java/se/su/dsv/scipro/admin/panels/PeerRequestStatsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/panels/PeerRequestStatsPanel.java
@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import se.su.dsv.scipro.peer.PeerRequestService;
import se.su.dsv.scipro.peer.RequestStatus;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class PeerRequestStatsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java
index 9b1375bca1..5b87f995ee 100755
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminApplicationPeriodsPanel.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.match.*;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java
index 26c55b96bd..a66f718d02 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodExemptionsPage.java
@@ -31,7 +31,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java
index 5c43fd47c9..bbb588c1a2 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditApplicationPeriodPage.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java
index 9b461a2964..18e80cc2c5 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/AdminEditTargetsPage.java
@@ -28,7 +28,7 @@ import se.su.dsv.scipro.springdata.services.SupervisorService.FilterParams;
import se.su.dsv.scipro.springdata.services.UnitService;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java
index e95316cfe2..c73b21edb9 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodActivityPlanTemplateColumnPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.match.ApplicationPeriodProjectType;
import se.su.dsv.scipro.match.ApplicationPeriodProjectTypeService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
public abstract class ApplicationPeriodActivityPlanTemplateColumnPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java
index 96de15c51f..480c6e1a1d 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/ApplicationPeriodSupervisorPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java b/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java
index ccb1716720..56b71bcd45 100644
--- a/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/applicationperiod/EditApplicationPeriodActivityPlanTemplatePanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.match.ApplicationPeriodProjectType;
import se.su.dsv.scipro.match.ApplicationPeriodService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class EditApplicationPeriodActivityPlanTemplatePanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java b/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java
index fab20e29dd..fdd554dc11 100755
--- a/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/basepanels/FooterPanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import se.su.dsv.scipro.components.AutoHidingListView;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class FooterPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java
index 683e50ecc9..ce3a95f5b7 100755
--- a/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/basepanels/NotificationsMenuPanel.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.notifications.NotificationService;
import se.su.dsv.scipro.notifications.pages.NotificationsPage;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class NotificationsMenuPanel extends Panel {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java b/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java
index 1e576f0f38..c02e81f30f 100644
--- a/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/AdminEditChecklistTemplatePage.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java
index d8d7ae958b..1af096eee2 100644
--- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistOverviewPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.security.auth.ProjectModuleComponent;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.EnumMap;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java
index 518fc96acd..a5733d7be1 100755
--- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistQuestionPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ChecklistQuestionPanel extends GenericPanel<Checklist> {
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java
index f2d4976d82..e2dddd2204 100755
--- a/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/ChecklistTemplateDataPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.datatables.ClickableOrderColumn;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java b/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java
index fb5eee67ad..3d2e2174f2 100644
--- a/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/EditAnswerPanel.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.LambdaModel;
import org.apache.wicket.model.Model;
import se.su.dsv.scipro.checklist.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class EditAnswerPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java b/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java
index df56789368..278a217742 100755
--- a/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/ProjectViewChecklistPage.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
public class ProjectViewChecklistPage extends AbstractProjectDetailsPage implements MenuHighlightActivityPlan {
diff --git a/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java b/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java
index 1351a6a317..4d6c427937 100755
--- a/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/checklists/SupervisorViewChecklistPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static se.su.dsv.scipro.security.auth.roles.Roles.SUPERVISOR;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java b/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java
index 5c8da5a285..78f18bdad9 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/AddUsersPanel.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashSet;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/CoAuthorChoice.java b/view/src/main/java/se/su/dsv/scipro/components/CoAuthorChoice.java
index f337101959..d0c9d8ad37 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/CoAuthorChoice.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/CoAuthorChoice.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.EnumSet;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java b/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java
index 037203b6e0..76ddee7304 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/DateLabel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.util.convert.IConverter;
import se.su.dsv.scipro.data.enums.DateStyle;
import se.su.dsv.scipro.date.DateService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.Locale;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/KeywordAutoComplete.java b/view/src/main/java/se/su/dsv/scipro/components/KeywordAutoComplete.java
index 7aa9ed921f..9d4530efbd 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/KeywordAutoComplete.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/KeywordAutoComplete.java
@@ -6,7 +6,7 @@ import org.wicketstuff.select2.Response;
import se.su.dsv.scipro.match.Keyword;
import se.su.dsv.scipro.match.KeywordService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/ProgramAutoComplete.java b/view/src/main/java/se/su/dsv/scipro/components/ProgramAutoComplete.java
index d728f7a8ba..595dc85b19 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/ProgramAutoComplete.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/ProgramAutoComplete.java
@@ -6,7 +6,7 @@ import org.wicketstuff.select2.Response;
import se.su.dsv.scipro.match.ProgramService;
import se.su.dsv.scipro.system.Program;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/components/SupervisorAutoComplete.java b/view/src/main/java/se/su/dsv/scipro/components/SupervisorAutoComplete.java
index 449f4e6b6f..6900d1dcec 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/SupervisorAutoComplete.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/SupervisorAutoComplete.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.EnumSet;
public class SupervisorAutoComplete extends AutoCompleteChoice<User> {
diff --git a/view/src/main/java/se/su/dsv/scipro/components/UserAutoComplete.java b/view/src/main/java/se/su/dsv/scipro/components/UserAutoComplete.java
index 34ceda44c3..52dff9974d 100644
--- a/view/src/main/java/se/su/dsv/scipro/components/UserAutoComplete.java
+++ b/view/src/main/java/se/su/dsv/scipro/components/UserAutoComplete.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.EnumSet;
public abstract class UserAutoComplete extends AjaxAutoCompleteChoice<User> {
diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java
index 3b1f28fa87..e77e8864c4 100644
--- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java
+++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ForwardPhase2Feedback.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.reviewing.ReviewerApproval;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalApprovedEvent;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalRejectedEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashSet;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedDeadline.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedDeadline.java
index 8050b38cab..c7d9d7a1cb 100644
--- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedDeadline.java
+++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedDeadline.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.project.ReviewerAssignedEvent;
import se.su.dsv.scipro.project.ReviewerUnassignedEvent;
import se.su.dsv.scipro.reviewing.*;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.time.Clock;
import java.time.LocalDate;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java
index 187ff7ffc6..c0111caf10 100644
--- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java
+++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerAssignedNotifications.java
@@ -10,8 +10,8 @@ import se.su.dsv.scipro.reviewing.FinalSeminarApprovalService;
import se.su.dsv.scipro.reviewing.ReviewerApproval;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalService;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.function.Consumer;
@Singleton
diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java
index 795580b2bb..2fd86978ca 100644
--- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java
+++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewerSupportMailer.java
@@ -12,8 +12,8 @@ import se.su.dsv.scipro.reviewing.FinalSeminarApprovalRequestEvent;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalRequestedEvent;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
index d12c6a8e36..17b4746f9f 100644
--- a/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
+++ b/view/src/main/java/se/su/dsv/scipro/crosscutting/ReviewingNotifications.java
@@ -19,8 +19,8 @@ import se.su.dsv.scipro.reviewing.RoughDraftApprovalApprovedEvent;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalRejectedEvent;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalRequestedEvent;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
@Singleton
public class ReviewingNotifications {
diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java
index ac31ee90b4..b1ebdf8cb2 100644
--- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectDataPanel.java
@@ -46,7 +46,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ProjectDataPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java
index 23a70f5c08..7b0d7b7efc 100644
--- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectExternalOrganisationPanel.java
@@ -35,7 +35,7 @@ import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import static java.util.Arrays.asList;
diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java
index cfac37ac4d..667962b195 100644
--- a/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/datatables/project/ProjectFilterPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static java.util.Arrays.asList;
diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java
index 2a6a77034f..1daef03507 100644
--- a/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/datatables/target/AddTargetLinkPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.match.ApplicationPeriodFacade;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AddTargetLinkPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java b/view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java
index c55159f158..31dcedd59c 100644
--- a/view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/datatables/target/EditTargetPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.match.TargetService;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class EditTargetPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java b/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java
index 25cb41905b..6e69516476 100644
--- a/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/examiner/pages/ExaminerPage.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.EXAMINER})
public abstract class ExaminerPage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java
index 703c3fc01b..9557edcb83 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarDataPanel.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.reusable.SciProUtilities;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java
index 6fcd48a66b..135943bd0f 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarExemptionPage.java
@@ -35,7 +35,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java
index 883ded02e4..6cfecd9f06 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AdminFinalSeminarSettingsPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.ProjectTypeSettings;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminFinalSeminarSettingsPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java
index 04da8716e2..5983aeb34d 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/AttendingPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AttendingPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
index ba37482a92..211a0f8c4f 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDataPanel.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDateTimeComponent.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDateTimeComponent.java
index 25616f7251..52fb0e2401 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDateTimeComponent.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDateTimeComponent.java
@@ -3,7 +3,7 @@ package se.su.dsv.scipro.finalseminar;
import org.apache.wicket.model.IModel;
import se.su.dsv.scipro.components.BootstrapDateTimeComponent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class FinalSeminarDateTimeComponent extends BootstrapDateTimeComponent {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java
index 2d53d2dd79..245f9eb696 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarDetailsParametersPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettings;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.system.Language;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class FinalSeminarDetailsParametersPanel extends GenericPanel<FinalSeminarDetailsParameters> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java
index 91a799e2f9..87a360cf8c 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/MoveFinalSeminarPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.notifications.dataobject.SeminarEvent;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.LocalDate;
import java.time.LocalDateTime;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java
index b1ff10fa47..ed3ae21d06 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OpposeColumnPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.Either;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
index 306f793e23..f0fcc13dfa 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OppositionReportPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.report.OppositionReportService;
import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class OppositionReportPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorOpposition {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java
index 225e606214..2a1bde4ab9 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/OverviewSeminarPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ProjectModuleComponent(ProjectModule.FINAL_SEMINAR)
public class OverviewSeminarPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java
index 4ab6c7d135..f4dcdb973f 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ParticipateColumnPanel.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.Either;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class ParticipateColumnPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java
index 0321c62f02..158b6ec5d9 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectActiveParticipationListPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java
index d5d9a11cb9..887b63378c 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarDetailsPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.project.pages.ProjectPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ProjectFinalSeminarDetailsPage extends ProjectPage implements MenuHighlightAuthorFinalSeminars {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPage.java
index 94a20eac11..3e3517406f 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectFinalSeminarPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.security.auth.ProjectModuleComponent;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
@ProjectModuleComponent(ProjectModule.FINAL_SEMINAR)
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java
index 694741a2ff..32fd7d19b5 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionPage.java
@@ -31,7 +31,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java
index 5e93766da0..1bcb145500 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ProjectOppositionsListPanel.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ProjectOppositionsListPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java
index 8a01e6f637..e9200c8a47 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/ScheduleFinalSeminarPanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java
index db3fc9c835..f2eaefa593 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarActiveParticipantsPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java
index 3b63d35544..5e50dda110 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarCRUDPanel.java
@@ -22,7 +22,7 @@ import se.su.dsv.scipro.system.UserSearchService;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class SeminarCRUDPanel extends GenericPanel<FinalSeminar> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarDateValidator.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarDateValidator.java
index 806e98be47..09d1e2b90f 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarDateValidator.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarDateValidator.java
@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.validation.validator.RangeValidator;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
public class SeminarDateValidator extends RangeValidator<LocalDate> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java
index 03c55ad9b6..6bcf0afc69 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionPanel.java
@@ -32,7 +32,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.List;
import java.util.Objects;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java
index 57d1eb94d0..0339452529 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarOppositionReportPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@ProjectModuleComponent(ProjectModule.GRADING)
public class SeminarOppositionReportPanel extends GenericPanel<FinalSeminarOpposition> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java
index 71a74c828e..11d03dee51 100755
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class SeminarPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java
index ccd9fc91ac..f939badad0 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarRespondentsPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.components.AjaxRadioChoice;
import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java
index ff8b0efeb9..e5b3ae8039 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SeminarThesisPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class SeminarThesisPanel extends GenericPanel<FinalSeminar> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPage.java
index 0dc3e77ee0..c38c00feff 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarDetailsPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorFinalSeminarDetailsPage extends AbstractSupervisorPage implements MenuHighlightSupervisorFinalSeminars {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPage.java b/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPage.java
index 66af9e3364..b1c77f5442 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalseminar/SupervisorFinalSeminarPage.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.SUPERVISOR})
@ProjectModuleComponent(ProjectModule.FINAL_SEMINAR)
diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java
index 4300535ed6..b95b1b7e48 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/ApproveFinalThesisPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
import java.util.Optional;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java
index 3c5ad46c60..008bf88212 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisPanel.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZoneId;
import java.time.ZonedDateTime;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanel.java
index f3b0cdd43c..3a4c15d025 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/FinalThesisUploadFormPanel.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.files.WicketProjectFileUpload;
import se.su.dsv.scipro.finalseminar.FinalSeminarService;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
class FinalThesisUploadFormPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
index 7b4cfb004b..6c79b27565 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/RejectFinalThesisPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java b/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java
index 169591aa4c..7a27339a55 100644
--- a/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/finalthesis/SupervisorFinalThesisListingPage.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.file.FileReference;
import se.su.dsv.scipro.repository.components.FileDownloadLink;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorAllProjectsPage;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java
index 70ceb7d852..701bfd17aa 100755
--- a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingColumnPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.date.DateService;
import se.su.dsv.scipro.match.Idea;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class FirstMeetingColumnPanel extends GenericPanel<Idea> {
diff --git a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java
index 8506b1e596..04645c91e5 100644
--- a/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/firstmeeting/FirstMeetingPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.notifications.dataobject.IdeaEvent;
import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.ZoneId;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailGroupPage.java b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailGroupPage.java
index a17a4b8c75..9ee758af29 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailGroupPage.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.supervisor.pages.SupervisorViewGroupThreadPage;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static se.su.dsv.scipro.security.auth.roles.Roles.AUTHOR;
import static se.su.dsv.scipro.security.auth.roles.Roles.REVIEWER;
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailProjectPage.java b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailProjectPage.java
index 4ce781b397..9e892850cf 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailProjectPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailProjectPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import static se.su.dsv.scipro.security.auth.roles.Roles.AUTHOR;
import static se.su.dsv.scipro.security.auth.roles.Roles.REVIEWER;
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailReceiverSettingsPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailReceiverSettingsPanel.java
index e3bdb97e52..8b5816828f 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailReceiverSettingsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/mail/ForumMailReceiverSettingsPanel.java
@@ -7,7 +7,7 @@ import org.apache.wicket.model.Model;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ForumMailReceiverSettingsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
index 2d112a930c..c0eed424bb 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectCreateForumThreadPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
@ProjectModuleComponent(ProjectModule.FORUM)
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java
index f21285a3fb..646abb3393 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectThreadedForumPage.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java
index f72a5943ea..f883dbc2e0 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/ProjectViewForumThreadPage.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
@ProjectModuleComponent(ProjectModule.FORUM)
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
index f7d13d7a44..b9c2f27796 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorCreateForumThreadPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.SUPERVISOR})
@ProjectModuleComponent(ProjectModule.FORUM)
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java
index 8c4834c9ba..c418c3a313 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorThreadedForumPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java
index e8de92dd6b..1e95bebb46 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/pages/threaded/SupervisorViewForumThreadPage.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.SUPERVISOR})
@ProjectModuleComponent(ProjectModule.FORUM)
diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanel.java
index 5d4f8028b8..2e16cb4953 100644
--- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ThreadReadStatePanel.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.forum.panels.AbstractReadStatePanel;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author : emil-siv
diff --git a/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java b/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java
index 69ad3fbdba..6781a555e5 100644
--- a/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/gdpr/AdminGDPRPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = Roles.SYSADMIN)
public class AdminGDPRPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java b/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java
index 67e272877e..269ad8f59e 100644
--- a/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java
+++ b/view/src/main/java/se/su/dsv/scipro/gdpr/GDPRReportResourceReference.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserSearchService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collection;
import java.util.EnumSet;
import java.util.Optional;
diff --git a/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java
index 870744ee35..37f2110139 100755
--- a/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/generalsystemsettings/AdminGeneralSettingsPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.SystemModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
@Authorization(authorizedRoles = { Roles.SYSADMIN})
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java
index 795f90a475..fbf8b36a5f 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/AbstractExaminationsPanel.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java
index 8845b0146e..2dcfa3420a 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/CriteriaPanel.java
@@ -39,7 +39,7 @@ import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Objects;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java
index 70247ea7ec..85906e3c15 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/ExaminerTimelinePanel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import se.su.dsv.scipro.grading.ExaminerTimelineService.Event;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ExaminerTimelinePanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java
index 8ced8db2c9..05a45ee3ec 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/FillOutReportPanel.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Optional;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java
index d7fc2e0711..52c9adeca8 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/GradingBasisPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.report.GradingCriterion;
import se.su.dsv.scipro.report.GradingReportService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java
index 6468da55a3..d76881782b 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/IndividualAuthorAssessmentPanel.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.report.GradingReportService;
import se.su.dsv.scipro.report.SupervisorGradingReport;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalTime;
import java.time.temporal.ChronoUnit;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java
index 4e50a1210c..aea827cb11 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataFormComponentPanel.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.LambdaModel;
import org.apache.wicket.model.LoadableDetachableModel;
import se.su.dsv.scipro.system.Language;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class PublicationMetadataFormComponentPanel extends GenericPanel<PublicationMetadata> {
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java
index c9fbcf51e2..04ccf601d0 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/PublicationMetadataPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.finalthesis.FinalThesis;
import se.su.dsv.scipro.finalthesis.FinalThesisService;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class PublicationMetadataPanel extends GenericPanel<Project> {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java
index df6ab2a9e4..3ccf7680a8 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/SendToExaminer.java
@@ -38,7 +38,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java
index 3672981c71..695354d4c9 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingPage.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
index 772ae8fba8..b4590290a6 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java
@@ -37,7 +37,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java
index 339d825672..28abad67a2 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/ThesisApprovedPanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.report.GradingReportService;
import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ThesisApprovedPanel extends GenericPanel<Project> {
private static final String FILE_PANEL = "filePanel";
diff --git a/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java b/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java
index cd5d1b1ffa..761c7094ea 100644
--- a/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/grading/UploadTextMatchingPanel.java
@@ -32,7 +32,7 @@ import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.Ajax;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.HashSet;
public class UploadTextMatchingPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java
index 41fb1b1e5a..7e03b022ec 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/AbstractAuthorGroupPage.java
@@ -17,8 +17,8 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.Cookie;
@SystemModuleComponent(SystemModule.GROUP)
public abstract class AbstractAuthorGroupPage extends ProjectPage implements MenuHighlightAuthorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java
index c33dc59f8b..d676271296 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/AuthorGroupPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.forum.dataobjects.GroupThread;
import se.su.dsv.scipro.forum.panels.threaded.ThreadsOverviewPanel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java b/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java
index 19544897de..2bb8a2aa46 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/AuthorMyGroupsPage.java
@@ -22,7 +22,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java b/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java
index b14ad2b1c2..1acdcfcb6d 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/CreateThreadPage.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.forum.panels.threaded.SubmitForumThreadPanel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class CreateThreadPage extends AbstractAuthorGroupPage implements MenuHighlightAuthorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java b/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java
index 8b35370fc7..4b13a106ae 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class EditGroupPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java
index b84b3e3644..5331e1ac45 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/GroupsOverviewPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.security.auth.SystemModuleComponent;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java
index 084e61f224..dc32ef6c2a 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/ViewGroupProjectsPanel.java
@@ -22,7 +22,7 @@ import se.su.dsv.scipro.supervisor.pages.SupervisorProjectDetailsPage;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
public class ViewGroupProjectsPanel extends GenericPanel<Group> {
diff --git a/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java b/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java
index 4f92cab7b1..fdaaefc9d2 100644
--- a/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/group/ViewThreadPage.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.forum.dataobjects.ForumThread;
import se.su.dsv.scipro.forum.panels.threaded.ViewForumThreadPanel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ViewThreadPage extends AbstractAuthorGroupPage implements MenuHighlightAuthorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java
index a9a518c68b..5a89962c70 100644
--- a/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/latestevents/LatestEventsPanel.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class LatestEventsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/FirstTimeRegistrationPage.java b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/FirstTimeRegistrationPage.java
index 296ee7834d..713eee86ff 100644
--- a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/FirstTimeRegistrationPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/FirstTimeRegistrationPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.basepages.PublicPage;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.HashSet;
diff --git a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/LoginPage.java b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/LoginPage.java
index bf91ad33a0..75d61a2a78 100755
--- a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/LoginPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/LoginPage.java
@@ -5,7 +5,7 @@ import se.su.dsv.scipro.basepages.PublicPage;
import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class LoginPage extends PublicPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java
index c97b20f922..5ebf9f0f0f 100644
--- a/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/loginlogout/pages/SSOPage.java
@@ -7,8 +7,8 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserImportService;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Optional;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/loginlogout/panels/LoginPanel.java b/view/src/main/java/se/su/dsv/scipro/loginlogout/panels/LoginPanel.java
index 6f8b68dd14..6460305ae8 100755
--- a/view/src/main/java/se/su/dsv/scipro/loginlogout/panels/LoginPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/loginlogout/panels/LoginPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class LoginPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java
index 06a5dd959d..d775add388 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AbstractAdminIdeaPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java
index c172b5de2c..d925103f31 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AcceptIdeaDialogPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AcceptIdeaDialogPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java
index 98f77ead54..0d1e4a5511 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaDetailsCrudPanel.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public abstract class AdminIdeaDetailsCrudPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java
index 73841fd345..68b9906a77 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaHistoryPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.data.enums.DateStyle;
import se.su.dsv.scipro.dataproviders.PageAdapter;
import se.su.dsv.scipro.profile.UserLinkPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java
index 218fff634a..9d54aad13a 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaOverviewPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.datatables.ClickableIconColumn;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java
index 79cf4870a0..8430e6d33b 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.mail.MailEventService;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java
index e83cfbeb0e..4ce65e95a3 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaPopupPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.components.EmployeeAutoComplete;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java
index f1f8cda986..8a9b0a0000 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatisticsPage.java
@@ -22,7 +22,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java
index 3eefc05422..c5f938e6b2 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminIdeaStatusStatisticsPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java
index 760a906fae..7c249041f5 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminKeywordCrudPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.dataproviders.GenericDataProvider;
import se.su.dsv.scipro.datatables.AjaxCheckboxWrapper;
import se.su.dsv.scipro.datatables.ClickableIconColumn;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java
index 5302bf59df..ac7ad7c479 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminProgramPage.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.Program;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java
index 738814561f..38eefd7755 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaCrudPanel.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.springdata.services.SupervisorService;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.ResearchAreaService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java
index 772bc3743f..1b38d7822d 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaEditPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.components.KeywordAutoComplete;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public abstract class AdminResearchAreaEditPanel extends GenericPanel<ResearchArea> {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java
index c91d680b7c..56d11f22bd 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaKeywordPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.dataproviders.PageAdapter;
import se.su.dsv.scipro.system.ResearchArea;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java
index 86a2d1b0ce..67507ba015 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminResearchAreaSupervisorPanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.springdata.services.SupervisorService;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java b/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java
index 11feae8018..260bc2d449 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AdminUnitPage.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.springdata.services.UnitService;
import se.su.dsv.scipro.system.Unit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java b/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java
index bd08674adf..1cf788e4aa 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/AjaxIdeaFilterPanel.java
@@ -28,7 +28,7 @@ import se.su.dsv.scipro.system.ResearchAreaService;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java
index 0438459f09..94523a9039 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/CompleteIdeaDialogPanel.java
@@ -33,7 +33,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java
index c9b6abcf6c..72e8ed4518 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/EditKeywordPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.components.AjaxDropDownChoice;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.ResearchAreaService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java
index 016eb690a7..167703949f 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/EditProgramPanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.system.Program;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class EditProgramPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java
index 2a2d90f4ab..306e1bf4a8 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/EditResearchAreaPanel.java
@@ -13,7 +13,7 @@ import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.ResearchAreaService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class EditResearchAreaPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java b/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java
index 69b057d84f..a2a7d1f0b5 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/EditUnitPanel.java
@@ -16,7 +16,7 @@ import org.apache.wicket.validation.validator.EmailAddressValidator;
import se.su.dsv.scipro.springdata.services.UnitService;
import se.su.dsv.scipro.system.Unit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public abstract class EditUnitPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java b/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java
index 09c17e42e4..e7dff2d432 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ManualMatching.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.data.DetachableServiceModelCollection;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import static java.util.Comparator.comparing;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java
index 3ba3954502..a1d4fa13ba 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectAllSupervisorIdeasPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.match.Idea.Type;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class ProjectAllSupervisorIdeasPanel extends GenericPanel<ApplicationPeriod> {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java
index eafeec0aa4..d3a35640cc 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaDetailsPage.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightProjectMyIdeas;
import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ProjectIdeaDetailsPage extends AbstractIdeaProjectPage implements MenuHighlightProjectMyIdeas {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java
index c5ae70f3cf..22e7bbf687 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaStartPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
public class ProjectIdeaStartPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java
index fda91d02d7..cbcba793e7 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
@Authorization(authorizedRoles={Roles.AUTHOR})
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
index 5ab46740bf..ebc4a70d71 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectIdeaSubmissionPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java
index eb85bcfbb2..9841cbf78a 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectMyIdeasPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.profile.StudentProfileProgramPanel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java
index c9913f5cfc..a08d766b65 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/ProjectNewAllSupervisorIdeasPage.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
@Authorization(authorizedRoles={Roles.AUTHOR})
diff --git a/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java
index 786f68bf5f..481d21b47f 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/StudentApplicationPeriodInfoPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.components.AutoHidingListView;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class StudentApplicationPeriodInfoPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java b/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java
index 17ba3fa625..e079121202 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/StudentIdeaStatusColumnPanel.java
@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import se.su.dsv.scipro.match.Idea.Status;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
*
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java
index dc60f499c1..ad4a5f09b6 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAcceptIdeaDialogPanel.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorAcceptIdeaDialogPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java
index 225424a88d..6d772ad2f1 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSelectableStudentIdeasPanel.java
@@ -4,7 +4,7 @@ import org.apache.wicket.model.IModel;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java
index 0f89769594..6226e13614 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPage.java
@@ -7,7 +7,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorProjectIdea;
import se.su.dsv.scipro.data.DetachableServiceModel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class SupervisorAllStudentIdeasPage extends AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorProjectIdea {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java
index c4b10d41ba..bac156a2d1 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllStudentIdeasPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class SupervisorAllStudentIdeasPanel extends GenericPanel<ApplicationPeriod> {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java
index 3371b460c7..ab0c7b130b 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorAllSupervisorIdeasPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.dataproviders.FilteredDataProvider;
import se.su.dsv.scipro.match.Idea.Type;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class SupervisorAllSupervisorIdeasPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java
index ae5e0430ab..906f00321f 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorApplicationPeriodInfoPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.components.AutoHidingListView;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class SupervisorApplicationPeriodInfoPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
index b6fa2bf7cb..52ec0779c1 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorEditIdeaPanel.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.components.*;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
import static java.util.Arrays.asList;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java
index bb4d392311..ff64fc4edb 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorIdeaSubmissionPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorIdeaSubmissionPage extends AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorMyIdeas {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java
index be86f0d8cb..1382aa2a3c 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorMyIdeasPanel.java
@@ -31,7 +31,7 @@ import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java b/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java
index b630f13300..c31f81761d 100755
--- a/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/SupervisorSelectableStudentIdeasPage.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorMyIde
import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorSelectableStudentIdeasPage extends AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorMyIdeas {
diff --git a/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java b/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java
index 3bc48cb1bc..e5986be400 100644
--- a/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/match/UpdateResearchAreasPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserImportService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Set;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java
index 078a9a06a3..9e83e59b93 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/EditMileStonePhasePanel.java
@@ -12,7 +12,7 @@ import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
/**
* @author : emil-siv
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java
index e842947b1a..3bb5d88ea7 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/EditMilestoneActivityPanel.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.system.EventService;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
public class EditMilestoneActivityPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java
index 3bbf3488f3..c82b6581d5 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/MileStoneActivityAdminPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.milestones.service.MilestoneActivityTemplateService;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class MileStoneActivityAdminPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java
index 86ddd55ec3..490ba486d1 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/MileStonePhaseAdminPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.components.SortOrderPanel;
import se.su.dsv.scipro.milestones.dataobjects.MilestonePhaseTemplate;
import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class MileStonePhaseAdminPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java
index ab047490c8..60460fca59 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCheckBoxPanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.milestones.service.MileStoneService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class MileStoneCheckBoxPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCounterPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCounterPanel.java
index d97110ccca..9b82d8eae9 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCounterPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneCounterPanel.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.service.MilestoneActivityTemplateService;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class MileStoneCounterPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java
index ae1e0d2226..34b4c08c8a 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneOverviewPanel.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.milestones.service.MilestonePhaseTemplateService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java
index 50a0520513..52b5075319 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneProgressPanel.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.service.MilestoneActivityTemplateService;
import se.su.dsv.scipro.project.Project;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class MileStoneProgressPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java
index cc164977f4..935852b3dd 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MileStoneStatusPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.milestones.service.MileStoneService;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class MileStoneStatusPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java
index fa27cdb854..225cf7f1c1 100644
--- a/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/milestones/panels/MilestoneSummaryPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.security.auth.ProjectModuleComponent;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
@ProjectModuleComponent(ProjectModule.MILESTONES)
diff --git a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java
index 42649fb20f..f46fe4ca8a 100755
--- a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysCRUDPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.components.BootstrapDatePicker;
import se.su.dsv.scipro.nonworkperiod.NonWorkDayPeriod;
import se.su.dsv.scipro.nonworkperiod.NonWorkDayPeriodService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
public abstract class NonWorkDaysCRUDPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java
index fd17c7f900..1c26c2880b 100644
--- a/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/nonworkdays/NonWorkDaysPage.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.nonworkperiod.NonWorkDayPeriodService;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java b/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java
index 1bda5ab739..06e1b87fd0 100644
--- a/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/notes/NotesPage.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.data.enums.DateStyle;
import se.su.dsv.scipro.date.DateService;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class NotesPage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java b/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java
index 346dc0024a..b3b73a4bec 100644
--- a/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/pages/NotificationLandingPage.java
@@ -39,7 +39,7 @@ import se.su.dsv.scipro.supervisor.pages.*;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
import java.util.function.BiConsumer;
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java
index c6460e2990..8718550924 100755
--- a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationDataPanel.java
@@ -38,7 +38,7 @@ import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanel.java
index 91172e09c1..94654e3f1e 100755
--- a/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/panels/NotificationSettingsPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.settings.dataobjects.UserProfile;
import se.su.dsv.scipro.springdata.services.UserProfileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class NotificationSettingsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java
index 6dab6bde94..f53c221a00 100644
--- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/AbstractReceiverConfigurationPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.notifications.dataobject.Notification;
import se.su.dsv.scipro.notifications.settings.service.ReceiverConfigurationService;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanel.java
index 4b65b2c0e0..c7e47d6f74 100644
--- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/MemberDeliveryConfigurationPanel.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.notifications.settings.service.ReceiverConfigurationServ
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
public class MemberDeliveryConfigurationPanel extends DeliveryConfigurationPanel {
diff --git a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java
index 3ab3407a18..40209d1010 100644
--- a/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/notifications/settings/panels/TypeDeliveryConfigurationPanel.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.notifications.settings.service.DeliveryConfigurationServ
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java b/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java
index fc5819d8ad..823491477d 100644
--- a/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/oauth/CallbackPage.java
@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.util.Objects;
diff --git a/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java
index 8ef9c809a4..9c7a10dd5f 100755
--- a/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/panels/CommentThreadPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class CommentThreadPanel extends GenericPanel<PeerReview> {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java
index 70cf33bd4d..c1c5683a66 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerReviewPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.statistics.AbstractAdminStatisticsPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class AdminPeerReviewPage extends AbstractAdminStatisticsPage implements MenuHighlightAdminPeer {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java
index eba76b7269..2adb9c0302 100755
--- a/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/AdminPeerSettingsPage.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.ProjectTypeSettings;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class AdminPeerSettingsPage extends AbstractAdminSystemPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java
index 436ec6a11e..d84996354a 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/LatestReviewPanel.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.generalsystemsettings.GeneralSystemSettingsService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class LatestReviewPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java
index 9092e879be..7f72729491 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/MyPeerPanel.java
@@ -19,7 +19,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class MyPeerPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java
index 4da298f43e..d85bab95fd 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalHeader.java
@@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
public class PeerPortalHeader extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java
index 4bbc70d43e..7f0e8f9f69 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerPortalPage.java
@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightAuthorMyProjects;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class PeerPortalPage extends AbstractPeerPortalPage implements MenuHighlightAuthorMyProjects {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java
index a63e8159ae..5a26c1a899 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestListPanel.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.date.DatePickerPanel;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.sql.Date;
import java.time.Duration;
import java.time.Instant;
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java
index d0c63accc7..0fe3233fea 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSelectionPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeSettings;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Iterator;
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java
index 949ccc52ba..b6a11697fb 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerRequestSubmissionPanel.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.Language;
import se.su.dsv.scipro.util.AjaxConfirmationSubmitLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
index 15d368556b..bb15955b9f 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerReviewStatisticsPanel.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java
index 89899d7a1b..c6215d6f84 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PeerSummaryPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
@ProjectModuleComponent(ProjectModule.PEER)
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java
index 4d2dd043d4..35bf54d676 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/PerformReviewPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.files.WicketFileUpload;
import se.su.dsv.scipro.grading.ScrollingSaveButtonPanel;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
public class PerformReviewPanel extends GenericPanel<PeerReview> {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java
index 5dd604dd0c..54dfb905f6 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/RequestDetailsPanel.java
@@ -20,7 +20,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
import se.su.dsv.scipro.system.Language;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class RequestDetailsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java
index 97951c0853..c33375d935 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/ReviewPageRequestDetailsPanel.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.file.FileService;
import se.su.dsv.scipro.profile.UserLabel;
import se.su.dsv.scipro.repository.panels.ViewAttachmentPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ReviewPageRequestDetailsPanel extends Panel {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java
index 2b356ae5c2..87a17ff2c1 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewAllPeersPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorAllProjectsPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorViewPeerReviewAllPeersPage extends AbstractSupervisorAllProjectsPage implements MenuHighlightSupervisorAllPeers {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java
index f455d35505..a72f0b0217 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/SupervisorViewPeerReviewPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorViewPeerReviewPage extends AbstractSupervisorProjectDetailsPage implements MenuHighlightSupervisorOverview, MenuHighlightSupervisorMyProjects {
diff --git a/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java b/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java
index 6c97099590..6c484de948 100644
--- a/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/peer/ViewPeerReviewPage.java
@@ -1,6 +1,6 @@
package se.su.dsv.scipro.peer;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.model.IModel;
diff --git a/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java b/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java
index 34ae55d903..38be0ab5fb 100644
--- a/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/plagiarism/UrkundSubmissionPanel.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.file.FileDescription;
import se.su.dsv.scipro.plagiarism.PlagiarismControl.Status;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class UrkundSubmissionPanel extends GenericPanel<FileDescription> {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java
index 399525f833..465e62a974 100644
--- a/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java
+++ b/view/src/main/java/se/su/dsv/scipro/profile/DaisyPicture.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.project.ProjectTeamMemberRoles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
import java.time.Duration;
diff --git a/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java b/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java
index 8a6cfdf2c3..9b5f7f8652 100644
--- a/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/profile/DisplayUserProfilePanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.system.ResearchArea;
import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class DisplayUserProfilePanel extends GenericPanel<User> {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java
index 39e779963f..76ddd5cebd 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/AbstractProjectDetailsPage.java
@@ -18,8 +18,8 @@ import se.su.dsv.scipro.project.panels.ProjectSubTabMenuPanel;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.Cookie;
import static se.su.dsv.scipro.components.AbstractMenuPanel.MenuType.HORIZONTAL;
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
index 4f3674ed8b..33864f187d 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectDetailsPage.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.survey.SurveyService;
import se.su.dsv.scipro.thesislink.ExternalLinkPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ProjectDetailsPage extends AbstractProjectDetailsPage implements MenuHighlightAuthorMyProjects {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java
index 832ad2f605..4974bd22ee 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFinalSurveyPage.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.survey.Question;
import se.su.dsv.scipro.survey.Survey;
import se.su.dsv.scipro.survey.SurveyService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ProjectFinalSurveyPage extends AbstractProjectDetailsPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java
index 5d2689e77c..da3ade68e2 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectFirstMeetingPage.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.data.enums.DateStyle;
import se.su.dsv.scipro.firstmeeting.FirstMeetingService;
import se.su.dsv.scipro.firstmeeting.ProjectFirstMeeting;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Optional;
public class ProjectFirstMeetingPage extends AbstractProjectDetailsPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java
index a26cc5751f..54727ac570 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.AUTHOR})
public abstract class ProjectPage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectStartPage.java b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectStartPage.java
index c14ead736f..64afd911b6 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectStartPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/pages/ProjectStartPage.java
@@ -7,7 +7,7 @@ import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.project.panels.ProjectsOverviewPanel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java
index 6547386182..0e8c493b3a 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ExternalResourcesPanel.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.system.ExternalResource;
import se.su.dsv.scipro.system.ExternalResourceService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ExternalResourcesPanel extends GenericPanel<ProjectType> {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java
index 82224523a9..0283f15c13 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalStepsPanel.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.reflection.ReflectionService;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class FinalStepsPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java
index 4b05fe022e..c86cb81149 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/FinalThesisReflectionInstructionsPanel.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.reflection.ReflectionService;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class FinalThesisReflectionInstructionsPanel extends GenericPanel<Project> {
@Inject
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java
index 3ba2b45c3c..1a2be74a69 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/PartnerAdditionPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class PartnerAdditionPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java
index e3814ce843..d9b2cb547e 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectSubTabMenuPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.peer.PeerPortalPage;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.pages.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java
index b9d3e979e3..2f4456961a 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectTabMenuPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java
index 0d51de54b0..035e923bd6 100755
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/ProjectsOverviewPanel.java
@@ -23,7 +23,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git a/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java b/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java
index 865d345168..ae4659133a 100644
--- a/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/project/panels/SupervisorEditProjectPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.ResearchAreaService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.LocalDate;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPage.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPage.java
index ac23320d6e..76abb64658 100755
--- a/view/src/main/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/AdminProjectPartnerPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.match.AbstractAdminMatchPage;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.ADMIN})
public class AdminProjectPartnerPage extends AbstractAdminMatchPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java
index 5674812850..ffb39e325e 100755
--- a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPage.java
@@ -31,7 +31,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ProjectPartnerPage extends AbstractIdeaProjectPage implements MenuHighlightProjectIdeas {
diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java
index 58d97fbf37..123f641172 100755
--- a/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/ProjectPartnerPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ProjectPartnerPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java
index afdc34cd2b..d10654a5d0 100644
--- a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPage.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.match.ApplicationPeriodService;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Comparator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java
index faf769145b..929cc15045 100644
--- a/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectpartner/SinglesPanel.java
@@ -18,7 +18,7 @@ import se.su.dsv.scipro.match.ApplicationPeriod;
import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Objects;
diff --git a/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java b/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
index 93fd177588..7b1194cb48 100644
--- a/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/projectstate/ProjectStatePanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.security.auth.ProjectModuleComponent;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.ProjectModule;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
diff --git a/view/src/main/java/se/su/dsv/scipro/repository/LifecycleManagedWebApplication.java b/view/src/main/java/se/su/dsv/scipro/repository/LifecycleManagedWebApplication.java
index 61e65ae32f..2a2fd1d9ef 100755
--- a/view/src/main/java/se/su/dsv/scipro/repository/LifecycleManagedWebApplication.java
+++ b/view/src/main/java/se/su/dsv/scipro/repository/LifecycleManagedWebApplication.java
@@ -4,7 +4,7 @@ package se.su.dsv.scipro.repository;
import org.apache.wicket.protocol.http.WebApplication;
import se.su.dsv.scipro.system.Lifecycle;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java b/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java
index dc216578de..bfb6963bf9 100755
--- a/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/repository/panels/ProjectFilePanel.java
@@ -34,7 +34,7 @@ import se.su.dsv.scipro.repository.components.FileDownloadLink;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.session.SciProSession;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java
index 6b38791894..7ac0aa3c27 100644
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ApprovalReviewerPanel.java
@@ -25,7 +25,7 @@ import se.su.dsv.scipro.reviewing.ReviewerApproval;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java
index 4e96bd85f4..a583f1b6de 100644
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerInteractionPage.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.reviewing.ReviewerInteractionService;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class ReviewerInteractionPage extends ReviewerPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java
index cc56e28420..21849493b3 100755
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerPage.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.REVIEWER})
public abstract class ReviewerPage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java
index 121cc22bb2..b91ab3cd41 100644
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/ReviewerStartPage.java
@@ -39,7 +39,7 @@ import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java
index 139a3c52fe..b87df07354 100644
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/RoughDraftApprovalDecisionPage.java
@@ -39,7 +39,7 @@ import se.su.dsv.scipro.supervisor.panels.FinalSeminarApprovalProcessPanel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Either;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java
index 0d1b9c6a89..54ad1b4172 100644
--- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/TimelinePanel.java
@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.reviewing.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class TimelinePanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/security/auth/MockRemoteUserFilter.java b/view/src/main/java/se/su/dsv/scipro/security/auth/MockRemoteUserFilter.java
index 7b9897ae5d..b67ea8916d 100755
--- a/view/src/main/java/se/su/dsv/scipro/security/auth/MockRemoteUserFilter.java
+++ b/view/src/main/java/se/su/dsv/scipro/security/auth/MockRemoteUserFilter.java
@@ -3,9 +3,9 @@ package se.su.dsv.scipro.security.auth;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
/**
diff --git a/view/src/main/java/se/su/dsv/scipro/session/SciProSession.java b/view/src/main/java/se/su/dsv/scipro/session/SciProSession.java
index 47202274ed..6d7d573de8 100755
--- a/view/src/main/java/se/su/dsv/scipro/session/SciProSession.java
+++ b/view/src/main/java/se/su/dsv/scipro/session/SciProSession.java
@@ -12,7 +12,7 @@ import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
diff --git a/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java b/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java
index 9a9f2d2762..c5bd717e46 100755
--- a/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/settings/pages/BasicProfilePage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.settings.dataobjects.UserProfile;
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class BasicProfilePage extends AbstractSettingsPage {
static final String FEEDBACK = "feedback";
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java
index 84c98cf3eb..898868c9bb 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AbstractMilestoneDetailsPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.milestones.dataobjects.Milestone;
import se.su.dsv.scipro.milestones.dataobjects.MilestoneActivityTemplate;
import se.su.dsv.scipro.milestones.service.MileStoneService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPage.java
index fe4bdc7d2c..cbb39b626e 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminAuthorsStatisticsPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java
index 26c0693e24..c2cd216a39 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminFinalSeminarStatisticsPage.java
@@ -37,7 +37,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java
index 2eea74e171..df9527de1d 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMedianMilestonePage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java
index 2e08200f54..606d8e4298 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminMultipleAuthorsStatisticsPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java
index 1d1fc540ce..3b7b2fac39 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminPeopleStatisticsPage.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.system.DegreeType;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
public class AdminPeopleStatisticsPage extends AbstractAdminStatisticsPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java
index 6996942434..8a6c8fe8c0 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminReviewerDeadlinesPage.java
@@ -27,7 +27,7 @@ import se.su.dsv.scipro.system.Unit;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.util.Pair;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java
index 26626a3e2d..50b25612b1 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnfinishedFinalSeminarsPage.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java
index 4978e653c7..223958b911 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnitStatisticsPanel.java
@@ -29,7 +29,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.Unit;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java
index 3246f33c11..16bd405add 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/AdminUnmetTargetsStatisticsPage.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.profile.UserLinkPanel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java
index c2e528c96b..31851de7e1 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneFilterDetailsPanel.java
@@ -10,7 +10,7 @@ import se.su.dsv.scipro.date.DateService;
import se.su.dsv.scipro.milestones.service.MileStoneService;
import se.su.dsv.scipro.system.ProjectType;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.stream.Collectors;
public class MilestoneFilterDetailsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java
index e1db1d6709..bd744e40f4 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsPanel.java
@@ -28,7 +28,7 @@ import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.io.Serializable;
import java.time.ZonedDateTime;
import java.util.*;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java
index 4a89a66635..0fe0e4a954 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/MilestoneStatisticsProgressPanel.java
@@ -24,7 +24,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class MilestoneStatisticsProgressPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java
index bef439fda9..a4000f6aa5 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorApplicationPeriodStatisticsPanel.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.match.TargetService;
import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Objects;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java
index 87a1a89672..61603d207b 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorIdeaStatisticsPanel.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.match.IdeaParticipation;
import se.su.dsv.scipro.match.IdeaService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java
index 517203e05f..7c2b43500f 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorProjectStatisticsPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.project.ProjectTeamMemberRoles;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.*;
public class SupervisorProjectStatisticsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java
index 3cb7b3430a..e792588e31 100644
--- a/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/statistics/SupervisorStatisticsPanel.java
@@ -8,7 +8,7 @@ import se.su.dsv.scipro.data.DetachableServiceModel;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorStatisticsPanel extends Panel {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java
index ce184c1105..5fdd11f498 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorAllProjectsPage.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.peer.SupervisorPeersPage;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorGroupPage.java
index 4e595fe91f..c93e9a146a 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorGroupPage.java
@@ -21,8 +21,8 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.Cookie;
@SystemModuleComponent(SystemModule.GROUP)
public abstract class AbstractSupervisorGroupPage extends AbstractSupervisorPage implements MenuHighlightSupervisorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java
index f0dcd78376..47ae5ea786 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorPage.java
@@ -9,7 +9,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.springdata.services.UserProfileService;
import se.su.dsv.scipro.supervisor.panels.SupervisorTabMenuPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = {Roles.SUPERVISOR})
public abstract class AbstractSupervisorPage extends MenuPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java
index 9ea229d2a0..d435a71a71 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectDetailsPage.java
@@ -18,8 +18,8 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.supervisor.panels.SupervisorSubTabMenuPanel;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
+import jakarta.inject.Inject;
+import jakarta.servlet.http.Cookie;
public abstract class AbstractSupervisorProjectDetailsPage extends AbstractSupervisorPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java
index 447feee21d..168169319b 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorEditGroupPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@SystemModuleComponent(SystemModule.GROUP)
public class SupervisorEditGroupPage extends AbstractSupervisorPage implements MenuHighlightSupervisorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java
index 56477e453d..e811ce058b 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorFirstMeetingPage.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.notifications.NotificationController;
import se.su.dsv.scipro.notifications.dataobject.NotificationSource;
import se.su.dsv.scipro.notifications.dataobject.ProjectEvent;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Date;
public class SupervisorFirstMeetingPage extends AbstractSupervisorProjectDetailsPage {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java
index 88d31d1300..bc014061f9 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupCreateThreadPage.java
@@ -11,7 +11,7 @@ import se.su.dsv.scipro.group.Group;
import se.su.dsv.scipro.group.GroupForum;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorGroupCreateThreadPage extends AbstractSupervisorGroupPage implements MenuHighlightSupervisorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java
index 914fd6476f..1271727152 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorGroupPage.java
@@ -13,7 +13,7 @@ import se.su.dsv.scipro.forum.panels.threaded.ThreadsOverviewPanel;
import se.su.dsv.scipro.group.GroupThreadDiscussable;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java
index dd9e01b820..a20488c956 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorInteractWithReviewerPage.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.supervisor.panels.RoughDraftApprovalPanel;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
@Authorization(authorizedRoles = Roles.SUPERVISOR)
public class SupervisorInteractWithReviewerPage extends AbstractSupervisorProjectDetailsPage implements MenuHighlightSupervisorMyProjects {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java
index 4beb42681f..cb71b9101a 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyGroupsPage.java
@@ -26,7 +26,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.SystemModule;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java
index 1c7f3e3e12..5c9c645334 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProfilePage.java
@@ -16,7 +16,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.settings.pages.AbstractSettingsPage;
import se.su.dsv.scipro.system.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java
index ca12387c6f..840930e001 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorViewGroupThreadPage.java
@@ -15,7 +15,7 @@ import se.su.dsv.scipro.forum.panels.threaded.ViewForumThreadPanel;
import se.su.dsv.scipro.group.GroupForumThread;
import se.su.dsv.scipro.util.PageParameterKeys;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorViewGroupThreadPage extends AbstractSupervisorGroupPage implements MenuHighlightSupervisorMyGroups {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/RoughDraftApprovalPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/RoughDraftApprovalPanel.java
index 694c22c52e..617f935d66 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/RoughDraftApprovalPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/RoughDraftApprovalPanel.java
@@ -6,7 +6,7 @@ import se.su.dsv.scipro.reviewing.ReviewerApprovalService;
import se.su.dsv.scipro.reviewing.RoughDraftApproval;
import se.su.dsv.scipro.reviewing.RoughDraftApprovalService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class RoughDraftApprovalPanel extends SupervisorApprovalPanel<RoughDraftApproval> {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java
index c575240490..74a6fd113d 100644
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorExternalProjectPanel.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.project.ExternalOrganization;
import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.project.ProjectService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
public class SupervisorExternalProjectPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
index 0f09379c0f..00498cbd6b 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorMyProjectsPanel.java
@@ -30,7 +30,7 @@ import se.su.dsv.scipro.system.ProjectType;
import se.su.dsv.scipro.system.ProjectTypeService;
import se.su.dsv.scipro.system.User;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
index e891dae210..2aa29d72eb 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
@@ -17,7 +17,7 @@ import se.su.dsv.scipro.report.GradingReportService;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.supervisor.pages.*;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java
index 60b51e4be4..4c0077e763 100755
--- a/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.supervisor.pages.SupervisorStartPage;
import se.su.dsv.scipro.system.ProjectModule;
import se.su.dsv.scipro.system.ProjectTypeService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.ArrayList;
import java.util.List;
diff --git a/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java b/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java
index 32863f45db..ad9add6f42 100644
--- a/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/thesislink/ExternalLinkPanel.java
@@ -21,7 +21,7 @@ import se.su.dsv.scipro.project.Project;
import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.util.AjaxConfirmationLink;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.List;
public class ExternalLinkPanel extends GenericPanel<Project> {
diff --git a/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java b/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java
index 5db28bdc06..20f3c271aa 100644
--- a/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java
+++ b/view/src/main/java/se/su/dsv/scipro/user/AdminImportUserPage.java
@@ -14,7 +14,7 @@ import se.su.dsv.scipro.system.UserImportService;
import se.su.dsv.scipro.system.UserImportService.ImportableUser;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.util.Collections;
import java.util.List;
import java.util.Set;
diff --git a/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java b/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java
index a62114b933..8fb5140e04 100755
--- a/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java
+++ b/view/src/main/java/se/su/dsv/scipro/user/AdminRolePage.java
@@ -33,7 +33,7 @@ import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.system.User;
import se.su.dsv.scipro.system.UserService;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
import java.text.MessageFormat;
import java.time.Duration;
import java.util.*;