From 8f5ac005c31fb594ac61624b00d132993e5781fc Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Mon, 25 Jul 2016 13:00:49 +0200
Subject: [PATCH] Fixed complex pom repositories

---
 samples/standalone/http-client/build.gradle   | 15 +++++-------
 samples/standalone/http-client/pom.xml        | 22 ++++++-----------
 samples/standalone/http-server/build.gradle   | 12 ++++------
 samples/standalone/http-server/pom.xml        | 22 ++++++-----------
 samples/standalone/stream-sink/build.gradle   | 15 +++++-------
 samples/standalone/stream-sink/pom.xml        | 24 ++++++-------------
 samples/standalone/stream-source/build.gradle |  6 ++---
 samples/standalone/stream-source/pom.xml      | 24 ++++++-------------
 8 files changed, 46 insertions(+), 94 deletions(-)

diff --git a/samples/standalone/http-client/build.gradle b/samples/standalone/http-client/build.gradle
index 4db1443b15..47600cdecf 100644
--- a/samples/standalone/http-client/build.gradle
+++ b/samples/standalone/http-client/build.gradle
@@ -2,12 +2,9 @@ buildscript {
 	repositories {
 		mavenCentral()
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot-local" }
-		maven { url "http://repo.spring.io/libs-release-local" }
-		maven { url "http://repo.spring.io/libs-staging-local" }
-		maven { url 'http://repo.spring.io/plugins-snapshot' }
-		maven { url "http://repo.spring.io/plugins-release-local" }
-		maven { url "http://repo.spring.io/plugins-staging-local/" }
+		maven { url "http://repo.spring.io/snapshot" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
@@ -20,9 +17,9 @@ version = '0.0.1-SNAPSHOT'
 repositories {
 	mavenCentral()
 	mavenLocal()
-	maven { url "http://repo.spring.io/libs-release-local" }
-	maven { url "http://repo.spring.io/libs-snapshot-local/" }
-	maven { url "http://repo.spring.io/libs-milestone-local/" }
+	maven { url "http://repo.spring.io/snapshot" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/release" }
 }
 
 apply plugin: 'groovy'
diff --git a/samples/standalone/http-client/pom.xml b/samples/standalone/http-client/pom.xml
index 9529065a77..40caed598f 100644
--- a/samples/standalone/http-client/pom.xml
+++ b/samples/standalone/http-client/pom.xml
@@ -86,7 +86,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -94,7 +94,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -112,7 +112,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -120,23 +120,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 				<pluginRepository>
-					<id>spring-plugin-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/plugins-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-plugin-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/plugins-milestone-local</url>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
diff --git a/samples/standalone/http-server/build.gradle b/samples/standalone/http-server/build.gradle
index 6279c4264c..68857fc07a 100644
--- a/samples/standalone/http-server/build.gradle
+++ b/samples/standalone/http-server/build.gradle
@@ -2,12 +2,9 @@ buildscript {
 	repositories {
 		mavenCentral()
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot-local" }
-		maven { url "http://repo.spring.io/libs-release-local" }
-		maven { url "http://repo.spring.io/libs-staging-local/" }
-		maven { url 'http://repo.spring.io/plugins-snapshot' }
-		maven { url "http://repo.spring.io/plugins-release-local" }
-		maven { url "http://repo.spring.io/plugins-staging-local/" }
+		maven { url "http://repo.spring.io/snapshot" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
@@ -23,8 +20,7 @@ repositories {
 	mavenLocal()
 	maven { url "http://repo.spring.io/snapshot" }
 	maven { url "http://repo.spring.io/milestone" }
-	maven { url "http://repo.spring.io/libs-release-local" }
-	maven { url "http://repo.spring.io/libs-staging-local/" }
+	maven { url "http://repo.spring.io/release" }
 }
 
 apply plugin: 'groovy'
diff --git a/samples/standalone/http-server/pom.xml b/samples/standalone/http-server/pom.xml
index bf5c9a1a9f..4eb230194e 100644
--- a/samples/standalone/http-server/pom.xml
+++ b/samples/standalone/http-server/pom.xml
@@ -128,7 +128,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -136,7 +136,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -154,7 +154,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -162,23 +162,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 				<pluginRepository>
-					<id>spring-plugin-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/plugins-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-plugin-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/plugins-milestone-local</url>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
diff --git a/samples/standalone/stream-sink/build.gradle b/samples/standalone/stream-sink/build.gradle
index de3a0db9f0..bce74b0836 100644
--- a/samples/standalone/stream-sink/build.gradle
+++ b/samples/standalone/stream-sink/build.gradle
@@ -2,12 +2,9 @@ buildscript {
 	repositories {
 		mavenCentral()
 		mavenLocal()
-		maven { url "http://repo.spring.io/libs-snapshot-local" }
-		maven { url "http://repo.spring.io/libs-release-local" }
-		maven { url "http://repo.spring.io/libs-staging-local" }
-		maven { url 'http://repo.spring.io/plugins-snapshot' }
-		maven { url "http://repo.spring.io/plugins-release-local" }
-		maven { url "http://repo.spring.io/plugins-staging-local/" }
+		maven { url "http://repo.spring.io/snapshot" }
+		maven { url "http://repo.spring.io/milestone" }
+		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
@@ -20,9 +17,9 @@ version = '0.0.1-SNAPSHOT'
 repositories {
 	mavenCentral()
 	mavenLocal()
-	maven { url "http://repo.spring.io/libs-release-local" }
-	maven { url "http://repo.spring.io/libs-snapshot-local/" }
-	maven { url "http://repo.spring.io/libs-milestone-local/" }
+	maven { url "http://repo.spring.io/snapshot" }
+	maven { url "http://repo.spring.io/milestone" }
+	maven { url "http://repo.spring.io/release" }
 }
 
 apply plugin: 'groovy'
diff --git a/samples/standalone/stream-sink/pom.xml b/samples/standalone/stream-sink/pom.xml
index b1d7ab4fd5..33f5c10f1e 100644
--- a/samples/standalone/stream-sink/pom.xml
+++ b/samples/standalone/stream-sink/pom.xml
@@ -91,7 +91,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -99,7 +99,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -117,7 +117,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -125,23 +125,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 				<pluginRepository>
-					<id>spring-plugin-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/plugins-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-plugin-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/plugins-milestone-local</url>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -149,6 +141,4 @@
 			</pluginRepositories>
 		</profile>
 	</profiles>
-
-
 </project>
diff --git a/samples/standalone/stream-source/build.gradle b/samples/standalone/stream-source/build.gradle
index 4a71def335..70d2512bd5 100644
--- a/samples/standalone/stream-source/build.gradle
+++ b/samples/standalone/stream-source/build.gradle
@@ -4,8 +4,7 @@ buildscript {
 		mavenLocal()
 		maven { url "http://repo.spring.io/snapshot" }
 		maven { url "http://repo.spring.io/milestone" }
-		maven { url "http://repo.spring.io/plugins-release-local" }
-		maven { url "http://repo.spring.io/plugins-staging-local/" }
+		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:1.4.0.BUILD-SNAPSHOT"
@@ -21,8 +20,7 @@ repositories {
 	mavenLocal()
 	maven { url "http://repo.spring.io/snapshot" }
 	maven { url "http://repo.spring.io/milestone" }
-	maven { url "http://repo.spring.io/libs-release-local" }
-	maven { url "http://repo.spring.io/libs-staging-local/" }
+	maven { url "http://repo.spring.io/release" }
 }
 
 apply plugin: 'groovy'
diff --git a/samples/standalone/stream-source/pom.xml b/samples/standalone/stream-source/pom.xml
index f01ce2efec..e4994c48bd 100644
--- a/samples/standalone/stream-source/pom.xml
+++ b/samples/standalone/stream-source/pom.xml
@@ -129,7 +129,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -137,7 +137,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -155,7 +155,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/libs-snapshot-local</url>
+					<url>http://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -163,23 +163,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/libs-milestone-local</url>
+					<url>http://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 				<pluginRepository>
-					<id>spring-plugin-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>http://repo.spring.io/plugins-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-plugin-milestones</id>
-					<name>Spring Milestones</name>
-					<url>http://repo.spring.io/plugins-milestone-local</url>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>http://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -187,6 +179,4 @@
 			</pluginRepositories>
 		</profile>
 	</profiles>
-
-
 </project>