From f70d6fb411ee8d9349a01a5a0d3ca8429d9aa3e1 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Tue, 25 Mar 2014 16:00:55 -0700
Subject: [PATCH] Declare all repositories in build samples

Update Gradle and Ant samples to consistently declare all repositories
(local, central, release, snapshot, milestone).

Fixes gh-426
---
 .../spring-boot-sample-actuator/build.gradle  | 11 +++++--
 .../spring-boot-sample-actuator/ivy.xml       | 24 +++++++--------
 .../ivysettings.xml                           | 30 +++++++++----------
 .../spring-boot-sample-simple/build.gradle    | 11 +++++--
 .../build.gradle                              | 12 ++++++--
 .../spring-boot-sample-web-ui/build.gradle    | 12 ++++++--
 6 files changed, 65 insertions(+), 35 deletions(-)

diff --git a/spring-boot-samples/spring-boot-sample-actuator/build.gradle b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
index 1ea60f13ec7..a80348ec7b2 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-actuator/build.gradle
@@ -3,8 +3,12 @@ buildscript {
 		springBootVersion = '1.0.0.BUILD-SNAPSHOT'
 	}
 	repositories {
+		// NOTE: You should declare only repositories that you need here
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot" }
+		mavenCentral()
+		maven { url "http://repo.spring.io/release" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/snapshot" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -22,9 +26,12 @@ jar {
 }
 
 repositories {
+	// NOTE: You should declare only repositories that you need here
 	mavenLocal()
 	mavenCentral()
-	maven { url "http://repo.spring.io/libs-snapshot" }
+	maven { url "http://repo.spring.io/release" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/snapshot" }
 }
 
 dependencies {
diff --git a/spring-boot-samples/spring-boot-sample-actuator/ivy.xml b/spring-boot-samples/spring-boot-sample-actuator/ivy.xml
index dc5a06c65ad..0e3da0eefc5 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/ivy.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/ivy.xml
@@ -1,13 +1,13 @@
 <ivy-module version="2.0">
-    <info organisation="org.springframework.boot" module="spring-boot-sample-actuator"/>
-    <configurations>
-      <conf name="loader" description="helpers added to final jar" />
-      <conf name="compile" description="everything needed to compile this module" />
-      <conf name="runtime" extends="compile" description="everything needed to run this module" />
-    </configurations>
-    <dependencies>
-        <dependency org="org.springframework.boot" name="spring-boot-loader" rev="1.0.0.BUILD-SNAPSHOT" conf="loader->default"/>
-        <dependency org="org.springframework.boot" name="spring-boot-starter-web" rev="1.0.0.BUILD-SNAPSHOT" conf="compile"/>
-        <dependency org="org.springframework.boot" name="spring-boot-starter-actuator" rev="1.0.0.BUILD-SNAPSHOT" conf="runtime"/>
-    </dependencies>
-</ivy-module>
\ No newline at end of file
+	<info organisation="org.springframework.boot" module="spring-boot-sample-actuator" />
+	<configurations>
+		<conf name="loader" description="helpers added to final jar" />
+		<conf name="compile" description="everything needed to compile this module" />
+		<conf name="runtime" extends="compile" description="everything needed to run this module" />
+	</configurations>
+	<dependencies>
+		<dependency org="org.springframework.boot" name="spring-boot-loader" rev="1.0.0.BUILD-SNAPSHOT" conf="loader->default" />
+		<dependency org="org.springframework.boot" name="spring-boot-starter-web" rev="1.0.0.BUILD-SNAPSHOT" conf="compile" />
+		<dependency org="org.springframework.boot" name="spring-boot-starter-actuator" rev="1.0.0.BUILD-SNAPSHOT" conf="runtime" />
+	</dependencies>
+</ivy-module>
diff --git a/spring-boot-samples/spring-boot-sample-actuator/ivysettings.xml b/spring-boot-samples/spring-boot-sample-actuator/ivysettings.xml
index 864f9701262..72631b8ba83 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/ivysettings.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/ivysettings.xml
@@ -1,16 +1,16 @@
 <ivysettings>
-  <settings defaultResolver="chain"/>
-  <resolvers>
-    <chain name="chain">
-      <filesystem name="local" local="true" m2compatible="true">
-         <artifact
-                pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
-            <ivy
-                pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
-      </filesystem>
-      <ibiblio name="ibiblio" m2compatible="true" />
-      <ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/libs-milestone"/>
-      <ibiblio name="spring-snapshots" m2compatible="true" root="http://repo.spring.io/libs-snapshot"/>
-    </chain>
-  </resolvers>
-</ivysettings>
\ No newline at end of file
+	<settings defaultResolver="chain" />
+	<resolvers>
+		<chain name="chain">
+			<!-- NOTE: You should declare only repositories that you need here -->
+			<filesystem name="local" local="true" m2compatible="true">
+				<artifact pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].[ext]" />
+				<ivy pattern="${user.home}/.m2/[organisation]/[module]/[revision]/[module]-[revision].pom" />
+			</filesystem>
+			<ibiblio name="ibiblio" m2compatible="true" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/release" />
+			<ibiblio name="spring-milestones" m2compatible="true" root="http://repo.spring.io/milestone" />
+			<ibiblio name="spring-snapshots" m2compatible="true" root="http://repo.spring.io/snapshot" />
+		</chain>
+	</resolvers>
+</ivysettings>
diff --git a/spring-boot-samples/spring-boot-sample-simple/build.gradle b/spring-boot-samples/spring-boot-sample-simple/build.gradle
index a2c77e13dc8..f7fcf3c7041 100644
--- a/spring-boot-samples/spring-boot-sample-simple/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-simple/build.gradle
@@ -3,8 +3,12 @@ buildscript {
 		springBootVersion = '1.0.0.BUILD-SNAPSHOT'
 	}
 	repositories {
+		// NOTE: You should declare only repositories that you need here
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot" }
+		mavenCentral()
+		maven { url "http://repo.spring.io/release" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/snapshot" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -22,9 +26,12 @@ jar {
 }
 
 repositories {
+	// NOTE: You should declare only repositories that you need here
 	mavenLocal()
 	mavenCentral()
-	maven { url "http://repo.spring.io/libs-snapshot" }
+	maven { url "http://repo.spring.io/release" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/snapshot" }
 }
 
 dependencies {
diff --git a/spring-boot-samples/spring-boot-sample-web-static/build.gradle b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
index 805bc3c0982..cb44ff52df2 100644
--- a/spring-boot-samples/spring-boot-sample-web-static/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-static/build.gradle
@@ -3,8 +3,12 @@ buildscript {
 		springBootVersion = '1.0.0.BUILD-SNAPSHOT'
 	}
 	repositories {
+		// NOTE: You should declare only repositories that you need here
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot" }
+		mavenCentral()
+		maven { url "http://repo.spring.io/release" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/snapshot" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -26,8 +30,12 @@ war {
 }
 
 repositories {
+	// NOTE: You should declare only repositories that you need here
+	mavenLocal()
 	mavenCentral()
-	maven { url "http://repo.spring.io/libs-snapshot" }
+	maven { url "http://repo.spring.io/release" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/snapshot" }
 }
 
 configurations {
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
index 9f8b29d3ef2..316ed4b0388 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
+++ b/spring-boot-samples/spring-boot-sample-web-ui/build.gradle
@@ -4,8 +4,12 @@ buildscript {
 		springLoadedVersion = '1.1.5.RELEASE'
 	}
 	repositories {
+		// NOTE: You should declare only repositories that you need here
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot" }
+		mavenCentral()
+		maven { url "http://repo.spring.io/release" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/snapshot" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
@@ -27,8 +31,12 @@ jar {
 }
 
 repositories {
+	// NOTE: You should declare only repositories that you need here
+	mavenLocal()
 	mavenCentral()
-	maven { url "http://repo.spring.io/libs-snapshot" }
+	maven { url "http://repo.spring.io/release" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/snapshot" }
 }
 
 dependencies {