diff --git a/src/main/java/nl/nn/testtool/Config.java b/src/main/java/nl/nn/testtool/Config.java
index 8467c33c..b971fa05 100644
--- a/src/main/java/nl/nn/testtool/Config.java
+++ b/src/main/java/nl/nn/testtool/Config.java
@@ -18,8 +18,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.inject.Produces;
-import javax.inject.Singleton;
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,6 +30,8 @@
import org.springframework.transaction.TransactionManager;
import io.quarkus.arc.DefaultBean;
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
import nl.nn.testtool.echo2.ComparePane;
import nl.nn.testtool.echo2.DebugPane;
import nl.nn.testtool.echo2.Echo2Application;
diff --git a/src/main/java/nl/nn/testtool/Inject.java b/src/main/java/nl/nn/testtool/Inject.java
deleted file mode 100644
index b35569c2..00000000
--- a/src/main/java/nl/nn/testtool/Inject.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- Copyright 2023-2024 WeAreFrank!
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-package nl.nn.testtool;
-
-/**
- * The pom.xml will replace javax.inject.Inject to this dummy to prevent problems with WebSphere when Enable-CDI is not
- * set to false (see also: https://github.com/frankframework/frankframework/pull/4211/files):
- *
- * com.ibm.ws.exception.RuntimeWarning: com.ibm.ws.exception.RuntimeError: com.ibm.ws.exception.RuntimeError: java.lang.RuntimeException: com.ibm.ws.cdi.CDIRuntimeException: com.ibm.ws.cdi.CDIDeploymentRuntimeException: org.jboss.weld.exceptions.DeploymentException: Exception List with 6 exceptions:
- * Exception 0 :
- * org.jboss.weld.exceptions.DeploymentException: WELD-001408: Unsatisfied dependencies for type List<String> with qualifiers @Default
- * at injection point [BackedAnnotatedField] @Inject @Autowired private nl.nn.testtool.filter.View.metadataNames
- * at nl.nn.testtool.filter.View.metadataNames(View.java:0)
- * at org.jboss.weld.bootstrap.Validator.validateInjectionPointForDeploymentProblems(Validator.java:362)
- * at org.jboss.weld.bootstrap.Validator.validateInjectionPoint(Validator.java:284)
- * at org.jboss.weld.bootstrap.Validator.validateGeneralBean(Validator.java:137)
- * at org.jboss.weld.bootstrap.Validator.validateRIBean(Validator.java:158)
- * at org.jboss.weld.bootstrap.Validator.validateBean(Validator.java:501)
- * at org.jboss.weld.bootstrap.ConcurrentValidator$1.doWork(ConcurrentValidator.java:61)
- * at org.jboss.weld.bootstrap.ConcurrentValidator$1.doWork(ConcurrentValidator.java:59)
- * at org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:62)
- * at org.jboss.weld.executor.IterativeWorkerTaskFactory$1.call(IterativeWorkerTaskFactory.java:55)
- * at java.util.concurrent.FutureTask.run(FutureTask.java:277)
- * at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1160)
- * at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
- * at java.lang.Thread.run(Thread.java:825)
- *
- *
- * @author Jaco de Groot
- */
-public @interface Inject {
-
-}
\ No newline at end of file
diff --git a/src/main/java/nl/nn/testtool/TestTool.java b/src/main/java/nl/nn/testtool/TestTool.java
index 79d453b2..18d86eb6 100644
--- a/src/main/java/nl/nn/testtool/TestTool.java
+++ b/src/main/java/nl/nn/testtool/TestTool.java
@@ -25,15 +25,14 @@
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
diff --git a/src/main/java/nl/nn/testtool/echo2/ComparePane.java b/src/main/java/nl/nn/testtool/echo2/ComparePane.java
index 217499c1..2f366eaf 100644
--- a/src/main/java/nl/nn/testtool/echo2/ComparePane.java
+++ b/src/main/java/nl/nn/testtool/echo2/ComparePane.java
@@ -18,13 +18,12 @@
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
import nextapp.echo2.app.Extent;
import nextapp.echo2.app.SplitPane;
import nextapp.echo2.extras.app.layout.TabPaneLayoutData;
diff --git a/src/main/java/nl/nn/testtool/echo2/ContentPane.java b/src/main/java/nl/nn/testtool/echo2/ContentPane.java
index b2390691..e3371692 100644
--- a/src/main/java/nl/nn/testtool/echo2/ContentPane.java
+++ b/src/main/java/nl/nn/testtool/echo2/ContentPane.java
@@ -1,5 +1,5 @@
/*
- Copyright 2022 WeAreFrank!
+ Copyright 2022, 2024 WeAreFrank!
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
*/
package nl.nn.testtool.echo2;
-import javax.enterprise.context.Dependent;
+import jakarta.enterprise.context.Dependent;
@Dependent
public class ContentPane extends nextapp.echo2.app.ContentPane {
diff --git a/src/main/java/nl/nn/testtool/echo2/DebugPane.java b/src/main/java/nl/nn/testtool/echo2/DebugPane.java
index ecc7bbc3..d8e7627b 100644
--- a/src/main/java/nl/nn/testtool/echo2/DebugPane.java
+++ b/src/main/java/nl/nn/testtool/echo2/DebugPane.java
@@ -17,13 +17,12 @@
import java.util.List;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
import nextapp.echo2.app.Extent;
import nextapp.echo2.app.SplitPane;
import nextapp.echo2.extras.app.layout.TabPaneLayoutData;
diff --git a/src/main/java/nl/nn/testtool/echo2/Echo2Application.java b/src/main/java/nl/nn/testtool/echo2/Echo2Application.java
index 022d5e2e..2df0e7f3 100644
--- a/src/main/java/nl/nn/testtool/echo2/Echo2Application.java
+++ b/src/main/java/nl/nn/testtool/echo2/Echo2Application.java
@@ -20,9 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -32,6 +29,8 @@
import echopointng.tree.DefaultMutableTreeNode;
import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
import nextapp.echo2.app.ApplicationInstance;
import nextapp.echo2.app.Border;
import nextapp.echo2.app.Button;
diff --git a/src/main/java/nl/nn/testtool/echo2/TestPane.java b/src/main/java/nl/nn/testtool/echo2/TestPane.java
index a06ce465..ce2dfb4b 100644
--- a/src/main/java/nl/nn/testtool/echo2/TestPane.java
+++ b/src/main/java/nl/nn/testtool/echo2/TestPane.java
@@ -15,12 +15,11 @@
*/
package nl.nn.testtool.echo2;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
import nextapp.echo2.app.Extent;
import nextapp.echo2.app.SplitPane;
import nextapp.echo2.extras.app.layout.TabPaneLayoutData;
diff --git a/src/main/java/nl/nn/testtool/filter/View.java b/src/main/java/nl/nn/testtool/filter/View.java
index 1d71db07..e4ec561d 100644
--- a/src/main/java/nl/nn/testtool/filter/View.java
+++ b/src/main/java/nl/nn/testtool/filter/View.java
@@ -1,5 +1,5 @@
/*
- Copyright 2020, 2022-2023 WeAreFrank!, 2018, 2019 Nationale-Nederlanden
+ Copyright 2020, 2022-2024 WeAreFrank!, 2018, 2019 Nationale-Nederlanden
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,11 +18,10 @@
import java.util.List;
import java.util.Map;
-import javax.enterprise.context.Dependent;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.enterprise.context.Dependent;
+import jakarta.inject.Inject;
import lombok.Getter;
import lombok.Setter;
import nl.nn.testtool.Checkpoint;
diff --git a/src/main/java/nl/nn/testtool/storage/database/DatabaseStorage.java b/src/main/java/nl/nn/testtool/storage/database/DatabaseStorage.java
index 7a8b426d..df9361ac 100644
--- a/src/main/java/nl/nn/testtool/storage/database/DatabaseStorage.java
+++ b/src/main/java/nl/nn/testtool/storage/database/DatabaseStorage.java
@@ -30,7 +30,6 @@
import java.util.GregorianCalendar;
import java.util.List;
-import javax.inject.Inject;
import javax.sql.DataSource;
import org.apache.commons.lang3.StringUtils;
@@ -45,6 +44,7 @@
import org.springframework.transaction.annotation.Transactional;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
diff --git a/src/main/java/nl/nn/testtool/storage/database/DbmsSupport.java b/src/main/java/nl/nn/testtool/storage/database/DbmsSupport.java
index b6e7d658..9c1e04c1 100644
--- a/src/main/java/nl/nn/testtool/storage/database/DbmsSupport.java
+++ b/src/main/java/nl/nn/testtool/storage/database/DbmsSupport.java
@@ -17,14 +17,13 @@
import java.sql.SQLException;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.support.JdbcUtils;
import org.springframework.jdbc.support.MetaDataAccessException;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import lombok.Setter;
/*
diff --git a/src/main/java/nl/nn/testtool/storage/file/Storage.java b/src/main/java/nl/nn/testtool/storage/file/Storage.java
index d4ee02e4..3f8b2af5 100644
--- a/src/main/java/nl/nn/testtool/storage/file/Storage.java
+++ b/src/main/java/nl/nn/testtool/storage/file/Storage.java
@@ -17,11 +17,10 @@
import java.util.List;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import nl.nn.testtool.MetadataExtractor;
import nl.nn.testtool.Report;
import nl.nn.testtool.storage.StorageException;
diff --git a/src/main/java/nl/nn/testtool/storage/file/TestStorage.java b/src/main/java/nl/nn/testtool/storage/file/TestStorage.java
index 34d06e0d..70f2ba06 100644
--- a/src/main/java/nl/nn/testtool/storage/file/TestStorage.java
+++ b/src/main/java/nl/nn/testtool/storage/file/TestStorage.java
@@ -20,11 +20,10 @@
import java.util.Iterator;
import java.util.List;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import nl.nn.testtool.MetadataExtractor;
import nl.nn.testtool.Report;
import nl.nn.testtool.storage.StorageException;
diff --git a/src/main/java/nl/nn/testtool/storage/memory/Storage.java b/src/main/java/nl/nn/testtool/storage/memory/Storage.java
index d9cbce6a..edbceadc 100644
--- a/src/main/java/nl/nn/testtool/storage/memory/Storage.java
+++ b/src/main/java/nl/nn/testtool/storage/memory/Storage.java
@@ -21,11 +21,10 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import nl.nn.testtool.MetadataExtractor;
import nl.nn.testtool.Report;
import nl.nn.testtool.storage.CrudStorage;
diff --git a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationErrorsView.java b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationErrorsView.java
index 241a5267..f8549e93 100644
--- a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationErrorsView.java
+++ b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationErrorsView.java
@@ -1,5 +1,5 @@
/*
- Copyright 2022 WeAreFrank!
+ Copyright 2022, 2024 WeAreFrank!
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
import java.util.List;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import lombok.Setter;
import nl.nn.testtool.filter.View;
import nl.nn.testtool.storage.LogStorage;
diff --git a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationStorage.java b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationStorage.java
index 1e93696c..2bea4bef 100644
--- a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationStorage.java
+++ b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationStorage.java
@@ -21,12 +21,11 @@
import java.util.Arrays;
import java.util.List;
-import javax.inject.Inject;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import lombok.Setter;
import nl.nn.testtool.Checkpoint;
import nl.nn.testtool.Report;
diff --git a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationView.java b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationView.java
index 7fbe377d..3a6383a7 100644
--- a/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationView.java
+++ b/src/main/java/nl/nn/testtool/storage/proofofmigration/ProofOfMigrationView.java
@@ -1,5 +1,5 @@
/*
- Copyright 2022-2023 WeAreFrank!
+ Copyright 2022-2024 WeAreFrank!
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@
import java.util.List;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import lombok.Setter;
import nl.nn.testtool.filter.View;
import nl.nn.testtool.storage.LogStorage;
diff --git a/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java b/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java
index 62bf617f..1ec3d4a3 100644
--- a/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java
+++ b/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java
@@ -23,8 +23,6 @@
import java.io.UnsupportedEncodingException;
import java.lang.invoke.MethodHandles;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.xml.transform.ErrorListener;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerConfigurationException;
@@ -38,6 +36,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import lombok.Setter;
import nl.nn.testtool.util.XmlUtil;
diff --git a/src/main/java/nl/nn/testtool/web/Echo2Servlet.java b/src/main/java/nl/nn/testtool/web/Echo2Servlet.java
index a6ff0b46..11b88f35 100644
--- a/src/main/java/nl/nn/testtool/web/Echo2Servlet.java
+++ b/src/main/java/nl/nn/testtool/web/Echo2Servlet.java
@@ -1,5 +1,5 @@
/*
- Copyright 2022 WeAreFrank!
+ Copyright 2022, 2024 WeAreFrank!
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
*/
package nl.nn.testtool.web;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import nextapp.echo2.app.ApplicationInstance;
import nextapp.echo2.webcontainer.WebContainerServlet;
import nl.nn.testtool.echo2.Echo2Application;
diff --git a/src/main/java/nl/nn/testtool/web/api/MetadataApi.java b/src/main/java/nl/nn/testtool/web/api/MetadataApi.java
index aa5216d4..9581a7a9 100644
--- a/src/main/java/nl/nn/testtool/web/api/MetadataApi.java
+++ b/src/main/java/nl/nn/testtool/web/api/MetadataApi.java
@@ -22,10 +22,9 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
diff --git a/src/main/java/nl/nn/testtool/web/api/ReportApi.java b/src/main/java/nl/nn/testtool/web/api/ReportApi.java
index 37f2b154..059a8689 100644
--- a/src/main/java/nl/nn/testtool/web/api/ReportApi.java
+++ b/src/main/java/nl/nn/testtool/web/api/ReportApi.java
@@ -27,8 +27,6 @@
import java.util.Map;
import java.util.Scanner;
-import javax.inject.Inject;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
@@ -36,6 +34,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.DefaultValue;
diff --git a/src/main/java/nl/nn/testtool/web/api/RunApi.java b/src/main/java/nl/nn/testtool/web/api/RunApi.java
index e29ba5c9..3a2f0c9a 100644
--- a/src/main/java/nl/nn/testtool/web/api/RunApi.java
+++ b/src/main/java/nl/nn/testtool/web/api/RunApi.java
@@ -23,12 +23,11 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.PUT;
diff --git a/src/main/java/nl/nn/testtool/web/api/TestToolApi.java b/src/main/java/nl/nn/testtool/web/api/TestToolApi.java
index 834c461d..c692cad8 100644
--- a/src/main/java/nl/nn/testtool/web/api/TestToolApi.java
+++ b/src/main/java/nl/nn/testtool/web/api/TestToolApi.java
@@ -22,12 +22,11 @@
import java.util.List;
import java.util.Map;
-import javax.inject.Inject;
-
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;