Upgrade from javax to jakarta

README.md

@@ -151,8 +151,6 @@ Clone the following projects to your Git folder or any other folder of your choi
 - https://github.com/wearefrank/frank-runner (building and running the test webapp with Ladybug)
 - https://github.com/frankframework/frankframework (in case you want to test your Ladybug changes with the Frank!Framework)
 
-Create skip-replace-inject.txt in checkout directory of the ladybug project. You do not have to give it any contents. If you want to understand the purpose of this file, then see `pom.xml`.
-
 Backend development
 -------------------
 

pom.xml

@@ -21,10 +21,6 @@
     <cxf.version>4.0.4</cxf.version>
     <jackson.version>2.17.1</jackson.version>
     <logback.version>1.5.6</logback.version>
-    <!-- Create skip-replace-inject.txt (replacement is only needed in the published jar by CI/CD) (more info in nl/nn/testtool/Inject.java -->
-    <inject.replace.include>**/*.java</inject.replace.include>
-    <inject.replace.from>javax.inject</inject.replace.from>
-    <inject.replace.to>nl.nn.testtool</inject.replace.to>
   </properties>
 
   <organization>
@@ -221,7 +217,7 @@
     <dependency>
       <groupId>jakarta.enterprise</groupId>
       <artifactId>jakarta.enterprise.cdi-api</artifactId>
-      <version>2.0.2</version>
+      <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
     <!-- Resolve @JsonbTransient -->
@@ -245,31 +241,6 @@
   <build>
     <defaultGoal>install</defaultGoal>
     <plugins>
-      <plugin>
-        <groupId>com.google.code.maven-replacer-plugin</groupId>
-          <artifactId>replacer</artifactId>
-          <version>1.5.3</version>
-          <executions>
-            <execution>
-                <phase>generate-resources</phase><!-- generate-resources instead of generate-sources to run after copyright check with <phase>process-sources</phase> -->
-                <goals>
-                  <goal>replace</goal>
-                </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <basedir>${basedir}</basedir>
-            <includes>
-              <include>${inject.replace.include}</include>
-            </includes>
-            <replacements>
-               <replacement>
-                 <token>import ${inject.replace.from}.Inject;</token>
-                 <value>import ${inject.replace.to}.Inject;</value>
-               </replacement>
-            </replacements>
-        </configuration>
-      </plugin>
       <!--
         Add META-INF/jandex.idx, see also:
           https://quarkus.io/guides/cdi-reference#how-to-generate-a-jandex-index
@@ -403,7 +374,7 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>3.12.1</version>
         <configuration>
-          <skip>true</skip><!-- Prevent copyright check running a second time and failing because of replacements by replacer-plugin. And speed up the build in Jenkins (generated site isn't used) -->
+          <skip>true</skip><!-- Speed up the build in Jenkins (generated site isn't used) -->
         </configuration>
       </plugin>
     </plugins>
@@ -489,17 +460,6 @@
   </scm>
 
   <profiles>
-    <profile>
-      <id>skip-replace-inject</id>
-      <activation>
-        <file>
-          <exists>skip-replace-inject.txt</exists>
-        </file>
-      </activation>
-      <properties>
-        <inject.replace.include>DISABLE</inject.replace.include>
-      </properties>
-    </profile>
     <profile>
       <id>skip-copyright</id>
       <activation>

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;
 
 /*

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;

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;

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;

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;

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;

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;