From 845348a029f609fe3b44e72ad35fd07a63ad4e89 Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Mon, 22 Jun 2020 10:12:03 +0200
Subject: [PATCH] update CI builds for Eclipse 2020-09 target and removed
 outdated e.14 entries from nightly download page

---
 .../common/html/nightly-distributions.html    | 16 ++--
 eclipse-distribution/pom.xml                  | 93 +++++++++++++++++++
 eclipse-language-servers/pom.xml              | 50 ++++++++++
 3 files changed, 151 insertions(+), 8 deletions(-)

diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html
index e51f81c9d..e17b3d001 100644
--- a/eclipse-distribution/common/html/nightly-distributions.html
+++ b/eclipse-distribution/common/html/nightly-distributions.html
@@ -23,9 +23,9 @@
 
 	<p><b>STS4 Distribution:</b>
 		<ul>
+			<li>for Eclipse 2020-09 (4.17): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.17">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.17</a></li>
 			<li>for Eclipse 2020-06 (4.16): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.16">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.16</a></li>
 			<li>for Eclipse 2020-03 (4.15): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.15">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.15</a></li>
-			<li>for Eclipse 2019-12 (4.14): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.14">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.14</a></li>
 		</ul>
 	</p>
 		
@@ -49,7 +49,13 @@
 				
 	<h2>Eclipse-based Distribution Builds</h2>
 
-	<h3>Spring Tool Suite 4 - based on Eclipse 2020-06 Milestone Builds (4.16.0)</h3>
+	<h3>Spring Tool Suite 4 - based on Eclipse 2020-09 Milestone Builds (4.17.0)</h3>
+	<div id="e417"></div>
+	<script type="text/javascript">
+	$('#e417').load('sts4-nightly-e4.17.html');
+	</script>
+	
+	<h3>Spring Tool Suite 4 - based on Eclipse 2020-06 Release (4.16.0)</h3>
 	<div id="e416"></div>
 	<script type="text/javascript">
 	$('#e416').load('sts4-nightly-e4.16.html');
@@ -61,12 +67,6 @@
 	$('#e415').load('sts4-nightly-e4.15.html');
 	</script>
 	
-	<h3>Spring Tool Suite 4 - based on Eclipse 2019-12 Release (4.14.0)</h3>
-	<div id="e414"></div>
-	<script type="text/javascript">
-	$('#e414').load('sts4-nightly-e4.14.html');
-	</script>
-	
 	<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
 
 	<div id="vsix"></div>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 8a8e5ca57..a12af37b5 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -311,6 +311,99 @@
 			</modules>
 		</profile>
 
+		<profile>
+			<id>e417</id>
+			<properties>
+				<dist.target>e4.17.0</dist.target>
+				<dist.target.major>e4.17</dist.target.major>
+				<dist.platform.name>2020-09</dist.platform.name>
+				<dist.platform.name.long>2020-09 (4.17)</dist.platform.name.long>
+				<dist.platform.id>2020-09</dist.platform.id>
+				<dist.platform.version>4.17</dist.platform.version>
+				<package.qualifierPrefix>e417</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2020-09</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/releases/2020-09/</url>
+				</repository>
+<!--				<repository>
+					<id>2020-06-staging</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2020-06/</url>
+				</repository> -->
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/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.e417</module>
+			</modules>
+		</profile>
+
 		<profile>
 			<id>build.springsource.com</id>
 			<activation>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index bd3dcaa4a..c79d20635 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -213,6 +213,56 @@
 			</repositories>
 		</profile>
 
+		<profile>
+			<id>e417</id>
+			<properties>
+				<dist.target>e4.17.0</dist.target>
+				<dist.target.major>e4.17</dist.target.major>
+				<dist.platform.name>2020-09</dist.platform.name>
+				<dist.platform.name.long>2020-09 (4.17)</dist.platform.name.long>
+				<dist.platform.id>2020-09</dist.platform.id>
+				<dist.platform.version>4.17</dist.platform.version>
+				<package.qualifierPrefix>e417</package.qualifierPrefix>
+			</properties>
+			<repositories>
+				<repository>
+					<id>2020-09</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/releases/2020-09/</url>
+				</repository>
+<!--				<repository>
+					<id>2020-06-staging</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/staging/2020-06/</url>
+				</repository> -->
+				<repository>
+					<id>orbit</id>
+					<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>${springide-p2-repo}</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>build.springsource.com</id>
 			<activation>