Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

Browse Source
This commit is contained in:
Andy Wilkinson 2015-02-17 10:01:39 +00:00
commit d87bf707a7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@
<spring-boot.version>1.2.2.BUILD-SNAPSHOT</spring-boot.version>
<!-- Third Party -->
<activemq.version>5.10.0</activemq.version>
<aspectj.version>1.8.4</aspectj.version>
<aspectj.version>1.8.5</aspectj.version>
<atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version>
<commons-beanutils.version>1.9.2</commons-beanutils.version>
@ -66,7 +66,7 @@
<gemfire.version>7.0.2</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.6</gradle.version>
<groovy.version>2.3.8</groovy.version>
<groovy.version>2.3.9</groovy.version>
<gson.version>2.3.1</gson.version>
<h2.version>1.4.184</h2.version>
<hamcrest.version>1.3</hamcrest.version>
@ -85,7 +85,7 @@
<javax-mail.version>1.5.2</javax-mail.version>
<javax-transaction.version>1.2</javax-transaction.version>
<jaxen.version>1.1.6</jaxen.version>
<jdom2.version>2.0.5</jdom2.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.5.2</jedis.version>
<jersey.version>2.14</jersey.version>
<jetty.version>9.2.4.v20141103</jetty.version>
@ -101,7 +101,7 @@
<log4j2.version>2.1</log4j2.version>
<logback.version>1.1.2</logback.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>2.12.4</mongodb.version>
<mongodb.version>2.12.5</mongodb.version>
<mysql.version>5.1.34</mysql.version>
<reactor.version>1.1.5.RELEASE</reactor.version>
<reactor-spring.version>1.1.3.RELEASE</reactor-spring.version>
@ -114,7 +114,7 @@
<spring.version>4.1.5.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.4.3.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.1.1.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.2.RELEASE</spring-batch.version>
<spring-batch.version>3.0.3.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Evans-SR2</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.1.2.RELEASE</spring-integration.version>
@ -122,7 +122,7 @@
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
<spring-plugin.version>1.1.0.RELEASE</spring-plugin.version>
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
<spring-security-jwt.version>1.0.3.RELEASE</spring-security-jwt.version>
<spring-social.version>1.1.0.RELEASE</spring-social.version>
<spring-social-facebook.version>1.1.1.RELEASE</spring-social-facebook.version>
<spring-social-linkedin.version>1.0.1.RELEASE</spring-social-linkedin.version>

4
spring-boot-docs/src/main/asciidoc/howto.adoc
View File

@ -685,7 +685,7 @@ property, e.g. for a simple webapp or service:
[source,xml,indent=0,subs="verbatim,quotes,attributes"]
----
<properties>
<tomcat.version>7.0.57</tomcat.version>
<tomcat.version>7.0.59</tomcat.version>
</properties>
<dependencies>
...
@ -711,7 +711,7 @@ e.g. for a simple webapp or service:
resolutionStrategy {
eachDependency {
if (it.requested.group == 'org.apache.tomcat.embed') {
it.useVersion '7.0.57'
it.useVersion '7.0.59'
}
}
}

2
spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
View File

@ -19,7 +19,7 @@
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
<tomcat.version>7.0.57</tomcat.version>
<tomcat.version>7.0.59</tomcat.version>
<java.version>1.7</java.version>
</properties>
<dependencies>