root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 16 Packages Projects Releases Wiki Activity

Merge branch '1.2.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
This commit is contained in:
Andy Wilkinson 2015-04-14 09:50:05 +01:00
parent f480c0de2f 2d7c0c2f00
commit d5c0884d3d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,7 @@
<spring-boot.version>1.3.0.BUILD-SNAPSHOT</spring-boot.version>
<!-- Third Party -->
<activemq.version>5.11.1</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<aspectj.version>1.8.5</aspectj.version>
<atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version>
@ -422,6 +423,11 @@
</dependency>
<!-- Third Party -->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr2.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>