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

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-10-29 17:47:28 +00:00
parent 8a1e010d0a 9a491013c3
commit c8d7a6dc24
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -25,7 +25,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
@ -35,7 +35,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>

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

@ -26,7 +26,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
@ -36,7 +36,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>

4
spring-boot-full-build/pom.xml
View File

@ -25,7 +25,7 @@
<developer> <developer>
<id>pwebb</id> <id>pwebb</id>
<name>Phillip Webb</name> <name>Phillip Webb</name>
<email>pwebb at gopivotal.com</email> <email>pwebb at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>
@ -35,7 +35,7 @@
<developer> <developer>
<id>dsyer</id> <id>dsyer</id>
<name>Dave Syer</name> <name>Dave Syer</name>
<email>dsyer at gopivotal.com</email> <email>dsyer at pivotal.io</email>
<organization>Pivotal Software, Inc.</organization> <organization>Pivotal Software, Inc.</organization>
<organizationUrl>http://www.spring.io</organizationUrl> <organizationUrl>http://www.spring.io</organizationUrl>
<roles> <roles>