Skip to content

Commit 8bbcda2

Browse files
committed
Closes #2486 : Upgrade to Wildfly 31.0.1.Final to make it work with SB 3.2
1 parent f0f607d commit 8bbcda2

File tree

12 files changed

+275
-244
lines changed

12 files changed

+275
-244
lines changed

lib/taskana-cdi-example/src/test/java/pro/taskana/example/ExampleBootstrapTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ private Connection getConnection() throws Exception {
8989
"jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
9090
+ "IGNORECASE=TRUE;LOCK_MODE=0",
9191
"sa",
92-
"");
92+
"sa");
9393
}
9494

9595
private int countTasksByName(String taskName) throws Exception {

lib/taskana-cdi-example/src/test/resources/arquillian.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<defaultProtocol type="Servlet 6.0"/>
66
<container qualifier="wildfly" default="true">
77
<configuration>
8-
<property name="jbossHome">target/wildfly-27.0.1.Final</property>
8+
<property name="jbossHome">target/wildfly-31.0.1.Final</property>
99
<property name="serverConfig">int-test-standalone.xml</property>
1010
<!-- <property name="javaVmArguments">-->
1111
<!-- -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->

lib/taskana-cdi-example/src/test/resources/int-test-standalone.xml

Lines changed: 102 additions & 72 deletions
Large diffs are not rendered by default.

lib/taskana-cdi/src/test/java/pro/taskana/common/internal/TaskanaProducersTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private Connection getConnection() throws Exception {
111111
"jdbc:h2:~/taskana-h2-data/testdb;NON_KEYWORDS=KEY,VALUE;AUTO_SERVER=TRUE;"
112112
+ "IGNORECASE=TRUE;LOCK_MODE=0",
113113
"sa",
114-
"");
114+
"sa");
115115
}
116116

117117
private int countTasksByName(String taskName) throws Exception {

lib/taskana-cdi/src/test/resources/arquillian.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<defaultProtocol type="Servlet 6.0"/>
66
<container qualifier="wildfly" default="true">
77
<configuration>
8-
<property name="jbossHome">target/wildfly-27.0.1.Final</property>
8+
<property name="jbossHome">target/wildfly-31.0.1.Final</property>
99
<property name="serverConfig">int-test-standalone.xml</property>
1010
<!-- <property name="javaVmArguments">-->
1111
<!-- -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y-->

lib/taskana-cdi/src/test/resources/int-test-standalone.xml

Lines changed: 102 additions & 72 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<version.spring.mybatis>3.0.2</version.spring.mybatis>
7171

7272
<!-- wildfly dependencies -->
73-
<version.wildfly>27.0.1.Final</version.wildfly>
73+
<version.wildfly>31.0.1.Final</version.wildfly>
7474

7575
<!-- camunda dependencies -->
7676
<version.camunda.dmn>7.21.0</version.camunda.dmn>

rest/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
<module>../web</module>
2222
<module>taskana-rest-spring-example-common</module>
2323
<module>taskana-rest-spring-example-boot</module>
24-
<!-- enable it, when decission is made how to proceed
2524
<module>taskana-rest-spring-example-wildfly</module>
26-
-->
2725
<module>taskana-rest-spring-test-lib</module>
2826
</modules>
2927

rest/taskana-rest-spring-example-wildfly/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -239,25 +239,6 @@
239239
</resources>
240240
</configuration>
241241
</execution>
242-
<execution>
243-
<id>copy-documentation-to-static-folder</id>
244-
<phase>prepare-package</phase>
245-
<goals>
246-
<goal>copy-resources</goal>
247-
</goals>
248-
<configuration>
249-
<outputDirectory>
250-
${project.build.outputDirectory}/static/docs/rest
251-
</outputDirectory>
252-
<resources>
253-
<resource>
254-
<directory>
255-
../taskana-rest-spring/target/generated-docs
256-
</directory>
257-
</resource>
258-
</resources>
259-
</configuration>
260-
</execution>
261242
</executions>
262243
</plugin>
263244
</plugins>

rest/taskana-rest-spring-example-wildfly/src/test/java/pro/taskana/example/wildfly/AbstractAccTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected ResponseEntity<TaskRepresentationModel> performCreateTaskRestCall() {
7777
protected String parseServerLog() throws Exception {
7878

7979
// TO-DO: make log4j log into rollingFile from log4j.xml
80-
File file = new File("target/wildfly-27.0.1.Final/standalone/log/server.log");
80+
File file = new File("target/wildfly-31.0.1.Final/standalone/log/server.log");
8181

8282
BufferedReader br = new BufferedReader(new FileReader(file));
8383

rest/taskana-rest-spring-example-wildfly/src/test/resources/arquillian.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<defaultProtocol type="Servlet 6.0"/>
66
<container qualifier="wildfly" default="true">
77
<configuration>
8-
<property name="jbossHome">target/wildfly-27.0.1.Final</property>
8+
<property name="jbossHome">target/wildfly-31.0.1.Final</property>
99
<property name="serverConfig">int-test-standalone.xml</property>
1010
<!-- <property name="javaVmArguments">-->
1111
<!-- &#45;&#45;add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED-->

0 commit comments

Comments
 (0)