Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-04-22 17:29:36 +01:00
commit 615af0834f
1 changed files with 30 additions and 3 deletions

View File

@ -147,7 +147,16 @@ Maven, there is no "`super parent`" to import to share some configuration.
----
apply plugin: 'java'
repositories { jcenter() }
repositories {
ifeval::["{spring-boot-repo}" != "release"]
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
endif::[]
ifeval::["{spring-boot-repo}" == "release"]
jcenter()
endif::[]
}
dependencies {
compile("org.springframework.boot:spring-boot-starter-web:{spring-boot-version}")
}
@ -163,7 +172,16 @@ managed by Spring Boot:
[source,groovy,indent=0,subs="attributes"]
----
buildscript {
repositories { jcenter() }
repositories {
ifeval::["{spring-boot-repo}" != "release"]
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
endif::[]
ifeval::["{spring-boot-repo}" == "release"]
jcenter()
endif::[]
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-version}")
}
@ -172,7 +190,16 @@ managed by Spring Boot:
apply plugin: 'java'
apply plugin: 'spring-boot'
repositories { jcenter() }
repositories {
ifeval::["{spring-boot-repo}" != "release"]
maven { url "http://repo.spring.io/snapshot" }
maven { url "http://repo.spring.io/milestone" }
endif::[]
ifeval::["{spring-boot-repo}" == "release"]
jcenter()
endif::[]
}
dependencies {
compile("org.springframework.boot:spring-boot-starter-web")
testCompile("org.springframework.boot:spring-boot-starter-test")