Skip to content

S
spring-boot
Commit 1bf0abc4 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.2.x'

parents 9d4382ca 8fe9fc25
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
View file @ 1bf0abc4
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<portNames> <portNames>
<portName>appserver.port</portName> <portName>appserver.port</portName>
<portName>appserver.ajp.port</portName> <portName>appserver.ajp.port</portName>
<portName>appserver.transaction.port</portName>
</portNames> </portNames>
</configuration> </configuration>
</execution> </execution>
...@@ -72,6 +73,9 @@ ...@@ -72,6 +73,9 @@
<properties> <properties>
<cargo.servlet.port>${appserver.port}</cargo.servlet.port> <cargo.servlet.port>${appserver.port}</cargo.servlet.port>
<cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port> <cargo.jboss.ajp.port>${appserver.ajp.port}</cargo.jboss.ajp.port>
<cargo.jboss.transaction.statusManager.port>
${appserver.transaction.port}
</cargo.jboss.transaction.statusManager.port>
<cargo.jboss.configuration>standalone-full</cargo.jboss.configuration> <cargo.jboss.configuration>standalone-full</cargo.jboss.configuration>
</properties> </properties>
</configuration> </configuration>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment