upgrading dependencies to jakarta and removing thorntail

microprofile · Nov 12, 2024 · 4f67f02 · 4f67f02
1 parent 09ddc62
commit 4f67f02
Show file tree

Hide file tree

Showing 75 changed files with 272 additions and 355 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,6 @@
     <inceptionYear>2017</inceptionYear>
 
     <properties>
-        <version.thorntail>2.6.0.Final</version.thorntail>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <maven.exec.plugin.version>1.6.0</maven.exec.plugin.version>
@@ -48,8 +47,8 @@
         <maven.model.builder.version>3.3.9</maven.model.builder.version>
         <commons.compress.version>1.20</commons.compress.version>
         <jackson.dataformat.yaml.version>2.10.5</jackson.dataformat.yaml.version>
-        <jackson.databind.version>2.12.7.1</jackson.databind.version>
-        <primefaces.version>8.0</primefaces.version>
+        <jackson.databind.version>2.10.5.1</jackson.databind.version>
+        <primefaces.version>14.0.6</primefaces.version>
         <thymeleaf.version>3.0.10.RELEASE</thymeleaf.version>
         <junit.version>4.12</junit.version>
         <resteasy.version>4.3.0.Final</resteasy.version>
@@ -58,19 +57,32 @@
         <checkstyle.version>2.17</checkstyle.version>
         <checkstyle.methodNameFormat>^_?[a-z][a-zA-Z0-9]*$</checkstyle.methodNameFormat>
     </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>1.9.1.Final</version>
+                <type>pom</type>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>javax</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>8.0</version>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.primefaces</groupId>
             <artifactId>primefaces</artifactId>
             <version>${primefaces.version}</version>
+            <classifier>jakarta</classifier>
         </dependency>
 
         <dependency>
@@ -111,6 +123,28 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <version>1.9.1.Final</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jboss.shrinkwrap.resolver</groupId>
+            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+            <version>3.3.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.openliberty.arquillian</groupId>
+            <artifactId>arquillian-liberty-managed-jakarta-junit</artifactId>
+            <version>2.1.4</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -172,7 +206,7 @@
                                 </module>
                                 <module name="AvoidStarImport">
                                     <property name="excludes"
-                                              value="java.io,java.net,java.util,javax.enterprise.inject.spi,javax.enterprise.context"/>
+                                              value="java.io,java.net,java.util,jakarta.enterprise.inject.spi,jakarta.enterprise.context"/>
                                 </module>
                                 <module name="IllegalImport"/>
                                 <module name="RedundantImport"/>
@@ -294,78 +328,6 @@
                 <script.extension>sh</script.extension>
             </properties>
         </profile>
-        <profile>
-            <id>thorntail</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>io.thorntail</groupId>
-                    <artifactId>jsf</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>io.thorntail</groupId>
-                    <artifactId>cdi</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>io.thorntail</groupId>
-                    <artifactId>jaxrs</artifactId>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.jboss.resteasy</groupId>
-                    <artifactId>resteasy-client</artifactId>
-                    <version>${resteasy.version}</version>
-                    <scope>test</scope>
-                </dependency>
-
-                <dependency>
-                    <groupId>io.thorntail</groupId>
-                    <artifactId>arquillian</artifactId>
-                    <scope>test</scope>
-                </dependency>
-
-            </dependencies>
-
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>io.thorntail</groupId>
-                        <artifactId>bom</artifactId>
-                        <version>${version.thorntail}</version>
-                        <type>pom</type>
-                        <scope>import</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-
-            <build>
-                <finalName>mp-starter</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>io.thorntail</groupId>
-                        <artifactId>thorntail-maven-plugin</artifactId>
-                        <version>${version.thorntail}</version>
-                        <configuration>
-                            <!-- Since Thorntail 4 https://docs.thorntail.io/4.0.0-SNAPSHOT/#_modes
-                            <mode>thin</mode>
-                            <format>dir</format>-->
-                            <hollow>true</hollow>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>package</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>liberty</id>
             <activation>
@@ -414,13 +376,13 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
                     <artifactId>arquillian-container-test-api</artifactId>
-                    <version>1.6.0.Final</version>
+                    <version>1.9.1.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.junit</groupId>
                     <artifactId>arquillian-junit-container</artifactId>
-                    <version>1.6.0.Final</version>
+                    <version>1.9.1.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>

diff --git a/src/it/java/org/eclipse/microprofile/starter/APITest.java b/src/it/java/org/eclipse/microprofile/starter/APITest.java
@@ -24,11 +24,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wildfly.swarm.arquillian.DefaultDeployment;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.nio.charset.StandardCharsets;
@@ -44,7 +43,6 @@
  * @author Michal Karm Babacek <[email protected]>
  */
 @RunWith(Arquillian.class)
-@DefaultDeployment(type = DefaultDeployment.Type.WAR)
     public class APITest {
 
     public static final String API_URL = "http://127.0.0.1:9090/api";

diff --git a/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java b/src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java
@@ -32,12 +32,11 @@
 import org.junit.Test;
 import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
-import org.wildfly.swarm.arquillian.DefaultDeployment;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
@@ -70,7 +69,6 @@
  * @author Michal Karm Babacek <[email protected]>
  */
 @RunWith(Arquillian.class)
-@DefaultDeployment(type = DefaultDeployment.Type.WAR)
 public class TestMatrixTest {
 
     private static final Logger LOGGER = Logger.getLogger(TestMatrixTest.class.getName());

diff --git a/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java b/src/it/java/org/eclipse/microprofile/starter/utils/Commands.java
@@ -19,13 +19,14 @@
  */
 package org.eclipse.microprofile.starter.utils;
 
-import org.apache.commons.io.FileUtils;
+
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.codehaus.plexus.util.FileUtils;
 import org.eclipse.microprofile.starter.core.model.BuildTool;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.core.Response;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/src/main/java/org/eclipse/microprofile/starter/DataBean.java b/src/main/java/org/eclipse/microprofile/starter/DataBean.java
@@ -25,10 +25,10 @@
 import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer;
 import org.eclipse.microprofile.starter.core.model.MicroProfileVersion;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.faces.model.SelectItem;
-import javax.inject.Named;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.faces.model.SelectItem;
+import jakarta.inject.Named;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

diff --git a/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java b/src/main/java/org/eclipse/microprofile/starter/FakeDirectoryCreator.java
@@ -24,8 +24,8 @@
 
 import org.eclipse.microprofile.starter.core.artifacts.DirectoryCreator;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 
 @ApplicationScoped
 public class FakeDirectoryCreator extends DirectoryCreator {

diff --git a/src/main/java/org/eclipse/microprofile/starter/Version.java b/src/main/java/org/eclipse/microprofile/starter/Version.java
@@ -21,8 +21,8 @@
 
 import org.eclipse.microprofile.starter.core.files.FilesLocator;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.Scanner;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java b/src/main/java/org/eclipse/microprofile/starter/ZipFileCreator.java
@@ -27,7 +27,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.eclipse.microprofile.starter.core.artifacts.FileCreator;
 
-import javax.enterprise.context.SessionScoped;
+import jakarta.enterprise.context.SessionScoped;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;

diff --git a/...rg/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java b/...rg/eclipse/microprofile/starter/addon/microprofile/servers/AbstractMicroprofileAddon.java
@@ -24,7 +24,7 @@
 import org.eclipse.microprofile.starter.spi.JessieAddon;
 import org.eclipse.microprofile.starter.spi.MavenHelper;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import java.util.*;
 
 public abstract class AbstractMicroprofileAddon extends AbstractAddon {

diff --git a/...org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java b/...org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java
@@ -35,9 +35,9 @@
 import org.eclipse.microprofile.starter.core.model.OptionValue;
 import org.eclipse.microprofile.starter.spi.MavenHelper;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;

diff --git a/...n/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java b/...n/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/JDKSelector.java
@@ -22,8 +22,8 @@
 import org.eclipse.microprofile.starter.core.model.JavaSEVersion;
 import org.eclipse.microprofile.starter.core.model.MicroProfileVersion;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.List;

diff --git a/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java b/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/HelidonServer.java
@@ -29,9 +29,9 @@
 import org.eclipse.microprofile.starter.core.artifacts.MavenCreator;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;

diff --git a/...a/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java b/...a/org/eclipse/microprofile/starter/addon/microprofile/servers/server/KumuluzeeServer.java
@@ -26,9 +26,9 @@
 import org.eclipse.microprofile.starter.core.artifacts.MavenCreator;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

diff --git a/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java b/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/LibertyServer.java
@@ -25,8 +25,8 @@
 import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/...org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java b/...org/eclipse/microprofile/starter/addon/microprofile/servers/server/PayaraMicroServer.java
@@ -25,8 +25,8 @@
 import org.eclipse.microprofile.starter.addon.microprofile.servers.model.SupportedServer;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

diff --git a/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java b/...ava/org/eclipse/microprofile/starter/addon/microprofile/servers/server/QuarkusServer.java
@@ -26,8 +26,8 @@
 import org.eclipse.microprofile.starter.core.artifacts.MavenCreator;
 import org.eclipse.microprofile.starter.core.model.JessieModel;
 
-import javax.annotation.PostConstruct;
-import javax.enterprise.context.ApplicationScoped;
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.ApplicationScoped;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;