Merge branch '1.5.x'

pull/8228/merge
Andy Wilkinson 8 years ago
commit 5e6ff9a855

@ -126,7 +126,7 @@
<lettuce.version>5.0.0.Beta1</lettuce.version>
<liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.9</logback.version>
<logback.version>1.1.10</logback.version>
<lombok.version>1.16.14</lombok.version>
<mariadb.version>1.5.7</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>

@ -17,8 +17,8 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<wildfly.version>8.2.0.Final</wildfly.version>
<cargo.container.id>wildfly8x</cargo.container.id>
<wildfly.version>9.0.2.Final</wildfly.version>
<cargo.container.id>wildfly9x</cargo.container.id>
<cargo.container.url>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
</cargo.container.url>
</properties>

Loading…
Cancel
Save