From b6d146d4857bc2a28362bb97a19a0aeee465137e Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 17 Jun 2020 08:30:45 +0200
Subject: [PATCH 1/2] consume CI builds from spring-ide to get latest fixes in

---
 eclipse-distribution/pom.xml     |  8 +++----
 eclipse-language-servers/pom.xml | 36 ++++++++++++++++----------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index fc27e4171..bfa199e88 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -69,12 +69,12 @@
 		<dist.pathpostfix>nightly</dist.pathpostfix>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
 		
-<!--	    <eclipsecommons-p2-repo>https://dist.springsource.com/snapshot/TOOLS/eclipse-integration-commons/nightly</eclipsecommons-p2-repo>
-		<springide-p2-repo>https://dist.springframework.org/snapshot/IDE/nightly</springide-p2-repo> -->
+	    <eclipsecommons-p2-repo>https://dist.springsource.com/snapshot/TOOLS/eclipse-integration-commons/nightly</eclipsecommons-p2-repo>
+		<springide-p2-repo>https://dist.springframework.org/snapshot/IDE/nightly</springide-p2-repo>
 <!--		<eclipsecommons-p2-repo>https://dist.springsource.com/milestone/TOOLS/eclipse-integration-commons/3.9.7.RC1/</eclipsecommons-p2-repo>
 		<springide-p2-repo>https://dist.springframework.org/milestone/IDE/3.9.7.RC1</springide-p2-repo> -->
-		<eclipsecommons-p2-repo>https://dist.springsource.com/release/TOOLS/eclipse-integration-commons/3.9.13.RELEASE/</eclipsecommons-p2-repo>
-		<springide-p2-repo>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</springide-p2-repo>
+<!--		<eclipsecommons-p2-repo>https://dist.springsource.com/release/TOOLS/eclipse-integration-commons/3.9.13.RELEASE/</eclipsecommons-p2-repo>
+		<springide-p2-repo>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</springide-p2-repo> -->
 
 		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 4c4674a21..674841221 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -186,16 +186,16 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository</url>
 				</repository>
-				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
-				</repository>
 <!--				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
 				</repository> -->
+				<repository>
+					<id>e-i-commons</id>
+					<layout>p2</layout>
+					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+				</repository>
 				<repository>
 					<id>mylyn-markdown</id>
 					<layout>p2</layout>
@@ -236,16 +236,16 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository</url>
 				</repository>
-				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
-				</repository>
 <!--				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
 				</repository> -->
+				<repository>
+					<id>e-i-commons</id>
+					<layout>p2</layout>
+					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+				</repository>
 				<repository>
 					<id>mylyn-markdown</id>
 					<layout>p2</layout>
@@ -291,16 +291,16 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository</url>
 				</repository>
-				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
-				</repository>
 <!--				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
 				</repository> -->
+				<repository>
+					<id>e-i-commons</id>
+					<layout>p2</layout>
+					<url>https://dist.springframework.org/snapshot/IDE/nightly</url>
+				</repository>
 				<repository>
 					<id>mylyn-markdown</id>
 					<layout>p2</layout>

From f95d66842f3d1841febd5b0ec2a88b11eeab63e4 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Wed, 17 Jun 2020 17:24:58 +0200
Subject: [PATCH 2/2] removed staging repo for 2020-06-based release

---
 eclipse-distribution/pom.xml     | 4 ++--
 eclipse-language-servers/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index bfa199e88..a1e5abda0 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -416,11 +416,11 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/releases/2020-06/</url>
 				</repository>
-				<repository>
+<!--				<repository>
 					<id>2020-06-staging</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/staging/2020-06/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 674841221..4d521fe05 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -281,11 +281,11 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/releases/2020-06/</url>
 				</repository>
-				<repository>
+<!--				<repository>
 					<id>2020-06-staging</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/staging/2020-06/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>