Closes #2206: Wildfly migration from 15 to 25

Taskana · Apr 7, 2023 · 08219b7 · 08219b7
1 parent 4ca3987
commit 08219b7
Show file tree

Hide file tree

Showing 8 changed files with 659 additions and 920 deletions.
diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
@@ -18,7 +18,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-javaee8</artifactId>
+        <artifactId>wildfly-jakartaee8</artifactId>
         <version>${version.wildfly}</version>
         <scope>import</scope>
         <type>pom</type>

diff --git a/lib/taskana-cdi/src/test/resources/arquillian.xml b/lib/taskana-cdi/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 3.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-15.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-25.0.1.Final</property>
       <property
         name="serverConfig">../../../../src/test/resources/int-test-standalone.xml
       </property>

diff --git a/lib/taskana-cdi/src/test/resources/int-test-standalone.xml b/lib/taskana-cdi/src/test/resources/int-test-standalone.xml
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
     <version.spring.mybatis>2.1.0</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
-    <version.wildfly>15.0.1.Final</version.wildfly>
+    <version.wildfly>25.0.1.Final</version.wildfly>
 
     <!-- camunda dependencies -->
     <version.camunda.dmn>7.18.0</version.camunda.dmn>

diff --git a/rest/taskana-rest-spring-example-wildfly/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml
@@ -19,7 +19,7 @@
     <dependencies>
       <dependency>
         <groupId>org.wildfly.bom</groupId>
-        <artifactId>wildfly-javaee8</artifactId>
+        <artifactId>wildfly-jakartaee8</artifactId>
         <version>${version.wildfly}</version>
         <scope>import</scope>
         <type>pom</type>

diff --git a/...est-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java b/...est-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java
@@ -77,7 +77,7 @@ protected ResponseEntity<TaskRepresentationModel> performCreateTaskRestCall() {
   protected String parseServerLog() throws Exception {
 
     // TO-DO: make log4j log into rollingFile from log4j.xml
-    File file = new File("target/wildfly-15.0.1.Final/standalone/log/server.log");
+    File file = new File("target/wildfly-25.0.1.Final/standalone/log/server.log");
 
     BufferedReader br = new BufferedReader(new FileReader(file));
 

diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml b/rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 3.0"/>
   <container qualifier="jboss" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-15.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-25.0.1.Final</property>
       <property
         name="serverConfig">../../../../src/test/resources/int-test-standalone.xml
       </property>

diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml b/rest/taskana-rest-spring-example-wildfly/src/test/resources/int-test-standalone.xml