Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2017-02-22 11:43:33 +00:00
parent 0f42c5dd94 99683dff6f
commit f4eb45ac6d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@@ -128,7 +128,7 @@
<junit.version>4.12</junit.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.jre7</mssql-jdbc.version>

4
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
View File

@@ -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>