Upgrade from javax to jakarta

wearefrank · May 24, 2024 · 03691aa · 03691aa
1 parent 7cef92e
commit 03691aa
Show file tree

Hide file tree

Showing 31 changed files with 148 additions and 150 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -3,9 +3,16 @@ Ladybug Test Tool release notes
 
 
 
-Upcoming (2.3)
+Upcoming (3.0)
 --------------
 
+- Upgrade from javax to jakarta
+
+
+
+2.2
+---
+
 - Ignore first checkpoint when report created with other thread
 - Add Liquibase xml files (remove experimental version from test jar)
 - Add alternative destination to proxy storage

diff --git a/pom.xml b/pom.xml
@@ -14,15 +14,13 @@
   <url>https://github.com/wearefrank/ladybug</url>
 
   <properties>
-    <revision>2.3-SNAPSHOT</revision>
+    <revision>3.0-SNAPSHOT</revision>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring.version>5.3.34</spring.version>
-    <cxf.version>3.5.5</cxf.version>
-    <!-- The line below is parsed by the GitHub actions test that triggers the ladybug-frontend Cypress test -->
-
-    <frontend.version>0.0.54</frontend.version>
-    <!-- Logback 1.3 requires slf4j-api 2.0. Logback is used with scope test so ignore https://github.com/wearefrank/ladybug/security/dependabot until Frank!Framework starts using slf4j-api 2.0 -->
-    <logback.version>1.2.13</logback.version>
+    <frontend.version>0.0.54</frontend.version><!-- Is parsed by the GitHub actions test that triggers the ladybug-frontend Cypress test -->
+    <spring.version>6.1.7</spring.version>
+    <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>
@@ -74,32 +72,30 @@
       <version>${cxf.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.jaxrs</groupId>
-      <artifactId>jackson-jaxrs-json-provider</artifactId>
-      <version>2.13.4</version>
-      <exclusions>
-        <!-- Copied exclusion from iaf-core/pom.xml -->
-        <exclusion>
-          <groupId>jakarta.activation</groupId>
-          <artifactId>jakarta.activation-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-features-logging</artifactId>
+      <version>${cxf.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+      <artifactId>jackson-jakarta-rs-json-provider</artifactId>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.ibissource</groupId>
       <artifactId>ibis-echo2</artifactId>
-      <version>2.0.5-20240507.172631</version>
+      <version>2.0.5-20240524.095615</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
+      <version>2.0.13</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -201,6 +197,12 @@
       <version>2.11.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.transaction</groupId>
+      <artifactId>jakarta.transaction-api</artifactId>
+      <version>2.0.1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>io.quarkus.arc</groupId>
       <artifactId>arc</artifactId>

diff --git a/src/main/java/nl/nn/testtool/Config.java b/src/main/java/nl/nn/testtool/Config.java
@@ -22,6 +22,7 @@
 import javax.inject.Singleton;
 import javax.sql.DataSource;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -142,7 +143,7 @@ ComparePane comparePane() {
 	@DefaultBean
 	@Bean
 	@Scope("singleton")
-	Views views(View view, LogStorage debugStorage) {
+	Views views(@Qualifier("view") View view, @Qualifier("debugStorage") LogStorage debugStorage) {
 		view.setName("Default");
 		List<View> list = new ArrayList<View>();
 		list.add(view);

diff --git a/src/main/java/nl/nn/testtool/MetadataExtractor.java b/src/main/java/nl/nn/testtool/MetadataExtractor.java
@@ -21,8 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import nl.nn.testtool.metadata.StatusMetadataFieldExtractor;

diff --git a/src/main/java/nl/nn/testtool/TestTool.java b/src/main/java/nl/nn/testtool/TestTool.java
@@ -25,7 +25,6 @@
 import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
@@ -34,6 +33,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 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
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020, 2022-2023 WeAreFrank!, 2018 Nationale-Nederlanden
+   Copyright 2020, 2022-2024 WeAreFrank!, 2018 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,13 +18,13 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 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 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/DebugPane.java b/src/main/java/nl/nn/testtool/echo2/DebugPane.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020, 2022-2023 WeAreFrank!, 2018 Nationale-Nederlanden
+   Copyright 2020, 2022-2024 WeAreFrank!, 2018 Nationale-Nederlanden
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 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 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
@@ -20,7 +20,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
@@ -32,6 +31,7 @@
 import org.springframework.context.ApplicationContextAware;
 
 import echopointng.tree.DefaultMutableTreeNode;
+import jakarta.annotation.PostConstruct;
 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
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020-2023 WeAreFrank!, 2018 Nationale-Nederlanden
+   Copyright 2020-2024 WeAreFrank!, 2018 Nationale-Nederlanden
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
 */
 package nl.nn.testtool.echo2;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 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/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.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.sql.DataSource;
 
@@ -45,6 +44,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.SneakyThrows;

diff --git a/src/main/java/nl/nn/testtool/storage/database/DatabaseTestStorage.java b/src/main/java/nl/nn/testtool/storage/database/DatabaseTestStorage.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2023 WeAreFrank!
+   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.
@@ -19,8 +19,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
+import jakarta.annotation.PostConstruct;
 import nl.nn.testtool.storage.StorageException;
 
 public class DatabaseTestStorage extends DatabaseStorage {

diff --git 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,14 @@
 
 import java.sql.SQLException;
 
-import javax.annotation.PostConstruct;
 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 lombok.Setter;
 
 /*

diff --git a/src/main/java/nl/nn/testtool/storage/diff/Storage.java b/src/main/java/nl/nn/testtool/storage/diff/Storage.java
@@ -21,16 +21,11 @@
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import jakarta.annotation.PostConstruct;
 import nl.nn.testtool.Report;
 import nl.nn.testtool.storage.StorageException;
 

diff --git a/src/main/java/nl/nn/testtool/storage/file/Storage.java b/src/main/java/nl/nn/testtool/storage/file/Storage.java
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020-2022 WeAreFrank!, 2018 Nationale-Nederlanden
+   Copyright 2020-2022, 2024 WeAreFrank!, 2018 Nationale-Nederlanden
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 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
@@ -20,11 +20,11 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 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
@@ -1,5 +1,5 @@
 /*
-   Copyright 2020-2023 WeAreFrank!, 2018 Nationale-Nederlanden
+   Copyright 2020-2024 WeAreFrank!, 2018 Nationale-Nederlanden
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 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/proxy/ProxyStorage.java b/src/main/java/nl/nn/testtool/storage/proxy/ProxyStorage.java
@@ -18,11 +18,10 @@
 import java.lang.invoke.MethodHandles;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
 import lombok.Getter;
 import lombok.Setter;
 import nl.nn.testtool.Report;

diff --git a/src/main/java/nl/nn/testtool/storage/xml/XmlStorage.java b/src/main/java/nl/nn/testtool/storage/xml/XmlStorage.java
@@ -26,12 +26,11 @@
 import java.lang.invoke.MethodHandles;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import jakarta.annotation.PostConstruct;
 import nl.nn.testtool.Report;
 import nl.nn.testtool.storage.CrudStorage;
 import nl.nn.testtool.storage.StorageException;

diff --git a/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java b/src/main/java/nl/nn/testtool/transform/ReportXmlTransformer.java
@@ -23,7 +23,6 @@
 import java.io.UnsupportedEncodingException;
 import java.lang.invoke.MethodHandles;
 
-import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.xml.transform.ErrorListener;
@@ -38,6 +37,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import jakarta.annotation.PostConstruct;
 import lombok.Setter;
 import nl.nn.testtool.util.XmlUtil;