From 31f80574f5f457e7f2a7eebc956d7536ce2bb665 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Fri, 19 Jun 2020 13:27:53 +0200
Subject: [PATCH] removed outdated target profiles and updated build to consume
 CI artifacts again

---
 eclipse-distribution/pom.xml     | 189 +------------------------------
 eclipse-language-servers/pom.xml | 118 +------------------
 2 files changed, 10 insertions(+), 297 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index b0e778aa4..8a8e5ca57 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>
 
@@ -120,187 +120,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e413</id>
-			<properties>
-				<dist.target>e4.13.0</dist.target>
-				<dist.target.major>e4.13</dist.target.major>
-				<dist.platform.name>2019-09</dist.platform.name>
-				<dist.platform.name.long>2019-09 (4.13.0)</dist.platform.name.long>
-				<dist.platform.id>2019-09</dist.platform.id>
-				<dist.platform.version>4.13</dist.platform.version>
-				<package.qualifierPrefix>e413</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2019-09</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2019-09/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
-				</repository>
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
-				</repository>
-				<!--				<repository>
-									<id>maven-wro4j</id>
-									<layout>p2</layout>
-									<url>https://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
-								</repository> -->
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-wro4j/1.1.0-2014-06-25_06-16-31-H26/</url>
-				</repository>
-				<repository>
-					<id>m2e-chromatic</id>
-					<layout>p2</layout>
-					<url>https://dl.bintray.com/sidespin/repo/m2e-chromatic/1.0.1/</url>
-				</repository>
-				<repository>
-					<id>maven-devtools</id>
-					<layout>p2</layout>
-					<url>https://dist.springsource.com/release/TOOLS/mavendevtools/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-				<repository>
-					<id>ansi-console</id>
-					<layout>p2</layout>
-					<url>https://www.mihai-nita.net/eclipse</url>
-				</repository>
-<!--				<repository>
-					<id>xtext-base</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
-				</repository> -->
-				<repository>
-					<id>mylyn-markdown</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.36/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-			</repositories>
-			<modules>
-				<module>org.springframework.boot.ide.product.e413</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>e414</id>
-			<properties>
-				<dist.target>e4.14.0</dist.target>
-				<dist.target.major>e4.14</dist.target.major>
-				<dist.platform.name>2019-12</dist.platform.name>
-				<dist.platform.name.long>2019-12 (4.14.0)</dist.platform.name.long>
-				<dist.platform.id>2019-12</dist.platform.id>
-				<dist.platform.version>4.14</dist.platform.version>
-				<package.qualifierPrefix>e414</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2019-12</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2019-12/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository</url>
-				</repository>
-				<repository>
-					<id>latest-m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/milestones/1.15/</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
-				</repository>
-				<repository>
-					<id>maven-extras-mirror</id>
-					<layout>p2</layout>
-					<url>https://download.springsource.com/release/TOOLS/third-party/m2e-sts310-signed/</url>
-				</repository>
-				<repository>
-					<id>maven-egit</id>
-					<layout>p2</layout>
-					<url>https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-egit/0.15.1/N/LATEST</url>
-				</repository>
-				<!--				<repository>
-									<id>maven-wro4j</id>
-									<layout>p2</layout>
-									<url>https://download.jboss.org/jbosstools/updates/m2e-wro4j/</url>
-								</repository> -->
-				<repository>
-					<id>maven-wro4j</id>
-					<layout>p2</layout>
-					<url>https://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-wro4j/1.1.0-2014-06-25_06-16-31-H26/</url>
-				</repository>
-				<repository>
-					<id>m2e-chromatic</id>
-					<layout>p2</layout>
-					<url>https://dl.bintray.com/sidespin/repo/m2e-chromatic/1.0.1/</url>
-				</repository>
-				<repository>
-					<id>maven-devtools</id>
-					<layout>p2</layout>
-					<url>https://dist.springsource.com/release/TOOLS/mavendevtools/</url>
-				</repository>
-				<repository>
-					<id>maven-dependency-support</id>
-					<layout>p2</layout>
-					<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
-				</repository>
-				<repository>
-					<id>ansi-console</id>
-					<layout>p2</layout>
-					<url>https://www.mihai-nita.net/eclipse</url>
-				</repository>
-<!--				<repository>
-					<id>xtext-base</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
-				</repository> -->
-				<repository>
-					<id>mylyn-markdown</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.36/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-			</repositories>
-			<modules>
-				<module>org.springframework.boot.ide.product.e414</module>
-			</modules>
-		</profile>
-
 		<profile>
 			<id>e415</id>
 			<properties>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index 4f514cd6b..bd3dcaa4a 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -86,6 +86,10 @@
 		<dist.key>TOOLS</dist.key>
 		<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.version}</dist.path>
 
+		<springide-p2-repo>https://dist.springframework.org/snapshot/IDE/nightly</springide-p2-repo>
+<!--		<springide-p2-repo>https://dist.springframework.org/milestone/IDE/3.9.7.RC1</springide-p2-repo> -->
+<!--		<springide-p2-repo>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</springide-p2-repo> -->
+
 	</properties>
 
 	<profiles>
@@ -114,106 +118,6 @@
 			</properties>
 		</profile>
 
-		<profile>
-			<id>e413</id>
-			<properties>
-				<dist.target>e4.13.0</dist.target>
-				<dist.target.major>e4.13</dist.target.major>
-				<dist.platform.name>2019-09</dist.platform.name>
-				<dist.platform.name.long>2019-09 (4.13)</dist.platform.name.long>
-				<dist.platform.id>2019-09</dist.platform.id>
-				<dist.platform.version>4.13</dist.platform.version>
-				<package.qualifierPrefix>e413</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2019-09</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2019-09/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository</url>
-				</repository>
-<!--				<repository>
-					<id>e-i-commons</id>
-					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.12.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>
-					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.36/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-				<repository>
-					<id>tm4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tm4e/snapshots/</url>
-				</repository>
-			</repositories>
-		</profile>
-
-		<profile>
-			<id>e414</id>
-			<properties>
-				<dist.target>e4.14.0</dist.target>
-				<dist.target.major>e4.14</dist.target.major>
-				<dist.platform.name>2019-12</dist.platform.name>
-				<dist.platform.name.long>2019-12 (4.14)</dist.platform.name.long>
-				<dist.platform.id>2019-12</dist.platform.id>
-				<dist.platform.version>4.14</dist.platform.version>
-				<package.qualifierPrefix>e414</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2019-12</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2019-12/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<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>
-				</repository> -->
-				<repository>
-					<id>mylyn-markdown</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/mylyn/docs/releases/3.0.36/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-				<repository>
-					<id>tm4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tm4e/snapshots/</url>
-				</repository>
-			</repositories>
-		</profile>
-
 		<profile>
 			<id>e415</id>
 			<properties>
@@ -239,13 +143,8 @@
 				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
+					<url>${springide-p2-repo}</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>
@@ -294,13 +193,8 @@
 				<repository>
 					<id>e-i-commons</id>
 					<layout>p2</layout>
-					<url>https://dist.springframework.org/release/IDE/3.9.13.RELEASE</url>
+					<url>${springide-p2-repo}</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>