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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-11-29 11:11:45 +00:00
parent e8d476dbca 0265a05dc9
commit 82a847c8b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@
<properties>
<activemq.version>5.13.4</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine.version>1.9.44</appengine.version>
<appengine-sdk.version>1.9.44</appengine-sdk.version>
<artemis.version>1.5.0</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<assertj.version>2.5.0</assertj.version>
@@ -693,7 +693,7 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>${appengine.version}</version>
<version>${appengine-sdk.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>