Closes #2486 : Upgrade to Wildfly 31.0.1.Final to make it work with S…

…B 3.2
Taskana · Aug 6, 2024 · 440ef6c · 440ef6c
1 parent 8a8d2f8
commit 440ef6c
Show file tree

Hide file tree

Showing 12 changed files with 275 additions and 244 deletions.
diff --git a/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java b/lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java
@@ -89,7 +89,7 @@ private Connection getConnection() throws Exception {
         "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
             + "IGNORECASE=TRUE;LOCK_MODE=0",
         "sa",
-        "");
+        "sa");
   }
 
   private int countTasksByName(String taskName) throws Exception {

diff --git a/lib/taskana-cdi-example/src/test/resources/arquillian.xml b/lib/taskana-cdi-example/src/test/resources/arquillian.xml
@@ -5,7 +5,7 @@
   <defaultProtocol type="Servlet 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
       <!--      <property name="javaVmArguments">-->
       <!--        -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->

diff --git a/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml b/lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java
@@ -111,7 +111,7 @@ private Connection getConnection() throws Exception {
         "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
             + "IGNORECASE=TRUE;LOCK_MODE=0",
         "sa",
-        "");
+        "sa");
   }
 
   private int countTasksByName(String taskName) throws Exception {

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 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
       <!--      <property name="javaVmArguments">-->
       <!--        -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->

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
@@ -70,7 +70,7 @@
     <version.spring.mybatis>3.0.2</version.spring.mybatis>
 
     <!-- wildfly dependencies -->
-    <version.wildfly>27.0.1.Final</version.wildfly>
+    <version.wildfly>31.0.1.Final</version.wildfly>
 
     <!-- camunda dependencies -->
     <version.camunda.dmn>7.21.0</version.camunda.dmn>

diff --git a/rest/pom.xml b/rest/pom.xml
@@ -21,9 +21,7 @@
     <module>../web</module>
     <module>taskana-rest-spring-example-common</module>
     <module>taskana-rest-spring-example-boot</module>
-<!-- enable it, when decission is made how to proceed
     <module>taskana-rest-spring-example-wildfly</module>
-    -->
     <module>taskana-rest-spring-test-lib</module>
   </modules>
 

diff --git a/rest/taskana-rest-spring-example-wildfly/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml
@@ -239,25 +239,6 @@
               </resources>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-documentation-to-static-folder</id>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.outputDirectory}/static/docs/rest
-              </outputDirectory>
-              <resources>
-                <resource>
-                  <directory>
-                    ../taskana-rest-spring/target/generated-docs
-                  </directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
     </plugins>

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
@@ -78,7 +78,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-27.0.1.Final/standalone/log/server.log");
+    File file = new File("target/wildfly-31.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 6.0"/>
   <container qualifier="wildfly" default="true">
     <configuration>
-      <property name="jbossHome">target/wildfly-27.0.1.Final</property>
+      <property name="jbossHome">target/wildfly-31.0.1.Final</property>
       <property name="serverConfig">int-test-standalone.xml</property>
 <!--            <property name="javaVmArguments">-->
 <!--              &#45;&#45;add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED-->
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ private Connection getConnection() throws Exception { @@
             "jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
                 + "IGNORECASE=TRUE;LOCK_MODE=0",
             "sa",
-            "");
+            "sa");
       }
       private int countTasksByName(String taskName) throws Exception {
@@ Expand Down @@