Phillip Webb 2cadf4165f Merge branch '1.0.x' ...

Conflicts:
	spring-boot-dependencies/pom.xml
	spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java

2014-05-16 14:53:32 +01:00

..

spring-boot-dependency-tools

Allow meta-data driven version overrides in Gradle

2014-05-08 14:37:42 +01:00

spring-boot-gradle-plugin

Require single main class

2014-05-16 10:45:17 +01:00

spring-boot-loader

Merge branch '1.0.x'

2014-05-16 14:53:32 +01:00

spring-boot-loader-tools

Require single main class

2014-05-16 10:45:17 +01:00

spring-boot-maven-plugin

Require single main class

2014-05-16 10:45:17 +01:00

pom.xml

Move master to 1.1.0.BUILD-SNAPSHOT

2014-04-24 12:45:20 +01:00