diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index f32636938..fc238ef0a 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -142,665 +142,6 @@
 			</properties>
 		</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>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</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>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/</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://sidespin.github.io/m2e-chromatic/update/</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/</url>
-				</repository>
-<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository> -->
-				<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
-				</repository> -->
-<!--				<repository>
-					<id>chromium-binaries</id>
-					<layout>p2</layout>
-					<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
-				</repository> -->
-				<repository>
-					<id>justj</id>
-					<url>https://download.eclipse.org/justj/jres/15/updates/release/latest/</url>
-					<layout>p2</layout>
-				</repository>
-			</repositories>
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module> -->
-						
-				<module>org.springframework.boot.ide.product.e417</module>				
-			</modules>
-		</profile>
-
-		<profile>
-			<id>e418</id>
-			<properties>
-				<dist.target>e4.18.0</dist.target>
-				<dist.target.major>e4.18</dist.target.major>
-				<dist.platform.name>2020-12</dist.platform.name>
-				<dist.platform.name.long>2020-12 (4.18)</dist.platform.name.long>
-				<dist.platform.id>2020-12</dist.platform.id>
-				<dist.platform.version>4.18</dist.platform.version>
-				<package.qualifierPrefix>e418</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2020-12</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2020-12/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/snapshots/1.4/m2e-wtp/</url>
-				</repository>
-<!--				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/</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://sidespin.github.io/m2e-chromatic/update/</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/</url>
-				</repository>
-<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository> -->
-				<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
-				</repository> -->
-<!--				<repository>
-					<id>chromium-binaries</id>
-					<layout>p2</layout>
-					<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
-				</repository> -->
-				<repository>
-					<id>justj</id>
-					<url>https://download.eclipse.org/justj/jres/15/updates/release/latest/</url>
-					<layout>p2</layout>
-				</repository>
-			</repositories>
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module> -->
-				
-				<module>org.springframework.boot.ide.product.e418</module>				
-			</modules>
-		</profile>
-
-		<profile>
-			<id>e419</id>
-			<properties>
-				<dist.target>e4.19.0</dist.target>
-				<dist.target.major>e4.19</dist.target.major>
-				<dist.platform.name>2021-03</dist.platform.name>
-				<dist.platform.name.long>2021-03 (4.19)</dist.platform.name.long>
-				<dist.platform.id>2021-03</dist.platform.id>
-				<dist.platform.version>4.19</dist.platform.version>
-				<package.qualifierPrefix>e419</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2021-03</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2021-03/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/snapshots/1.4/m2e-wtp/</url>
-				</repository>
-<!--				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/</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://sidespin.github.io/m2e-chromatic/update/</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/</url>
-				</repository>
-<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository> -->
-				<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
-				</repository> -->
-<!--				<repository>
-					<id>chromium-binaries</id>
-					<layout>p2</layout>
-					<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
-				</repository> -->
-				<repository>
-					<id>justj</id>
-					<url>https://download.eclipse.org/justj/jres/15/updates/release/latest/</url>
-					<layout>p2</layout>
-				</repository>
-			</repositories>
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module> -->
-				
-				<module>org.springframework.boot.ide.product.e419</module>
-			</modules>
-		</profile>
-
-		<profile>
-			<id>e420</id>
-			<properties>
-				<dist.target>e4.20.0</dist.target>
-				<dist.target.major>e4.20</dist.target.major>
-				<dist.platform.name>2021-06</dist.platform.name>
-				<dist.platform.name.long>2021-06 (4.20)</dist.platform.name.long>
-				<dist.platform.id>2021-06</dist.platform.id>
-				<dist.platform.version>4.20</dist.platform.version>
-				<package.qualifierPrefix>e420</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2021-06</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2021-06/</url>
-				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository</url>
-				</repository>
-<!--				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
-				</repository> -->
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/snapshots/1.4/m2e-wtp/</url>
-				</repository>
-<!--				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/</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://sidespin.github.io/m2e-chromatic/update/</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/</url>
-				</repository>
-				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
-				</repository>
-				<!--				<repository>
-					<id>lsp4e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/lsp4e/releases/latest/</url>
-				</repository> -->
-<!--				<repository>
-					<id>chromium-binaries</id>
-					<layout>p2</layout>
-					<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
-				</repository> -->
-			</repositories> 
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
--->
-				<module>org.springframework.boot.ide.product.e420</module>		
-			</modules>
-
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<environments>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>aarch64</arch>
-									</environment>
-									<environment>
-										<os>win32</os>
-										<ws>win32</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>linux</os>
-										<ws>gtk</ws>
-										<arch>x86_64</arch>
-									</environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-				
-		</profile>
-
-		<profile>
-			<id>e421</id>
-			<properties>
-				<dist.target>e4.21.0</dist.target>
-				<dist.target.major>e4.21</dist.target.major>
-				<dist.platform.name>2021-09</dist.platform.name>
-				<dist.platform.name.long>2021-09 (4.21)</dist.platform.name.long>
-				<dist.platform.id>2021-09</dist.platform.id>
-				<dist.platform.version>4.21</dist.platform.version>
-				<package.qualifierPrefix>e421</package.qualifierPrefix>
-			</properties>
-			<repositories>
-				<repository>
-					<id>2021-09</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/releases/2021-09/</url>
-				</repository>
-<!--				<repository>
-					<id>2021-09-staging</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/staging/2021-09/</url>
-				</repository> -->
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository</url>
-				</repository>
-				<repository>
-					<id>m2e</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
-				</repository>
-				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/snapshots/1.4/m2e-wtp/</url>
-				</repository>
-<!--				<repository>
-					<id>latest-m2e-wtp</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/milestones/1.4/1.4.4.20200220-1005/</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://sidespin.github.io/m2e-chromatic/update/</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/</url>
-				</repository>
-				<repository>
-					<id>wildwebdeveloper</id>
-					<layout>p2</layout>
-					<url>https://download.eclipse.org/wildwebdeveloper/releases/0.13.1/</url>
-				</repository>
-			</repositories> 
-			<modules>
-				<!-- Xterm modules -->
-<!--				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
-				<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
--->
-				<module>org.springframework.boot.ide.product.e421</module>		
-			</modules>
-
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<environments>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>aarch64</arch>
-									</environment>
-									<environment>
-										<os>win32</os>
-										<ws>win32</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>linux</os>
-										<ws>gtk</ws>
-										<arch>x86_64</arch>
-									</environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-				
-		</profile>
-
 		<profile>
 			<id>e422</id>
 			<properties>
@@ -920,42 +261,6 @@
 				<module>org.springframework.boot.ide.product.e422</module>		
 			</modules>
 
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<environments>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>aarch64</arch>
-									</environment>
-									<environment>
-										<os>win32</os>
-										<ws>win32</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>linux</os>
-										<ws>gtk</ws>
-										<arch>x86_64</arch>
-									</environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-				
 		</profile>
 
 		<profile>
@@ -1077,42 +382,6 @@
 				<module>org.springframework.boot.ide.product.e423</module>		
 			</modules>
 
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<environments>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>aarch64</arch>
-									</environment>
-									<environment>
-										<os>win32</os>
-										<ws>win32</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>linux</os>
-										<ws>gtk</ws>
-										<arch>x86_64</arch>
-									</environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-				
 		</profile>
 
 		<profile>
@@ -1234,42 +503,6 @@
 				<module>org.springframework.boot.ide.product.e424</module>		
 			</modules>
 
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.tycho</groupId>
-							<artifactId>target-platform-configuration</artifactId>
-							<version>${tycho-version}</version>
-							<configuration>
-								<environments>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>macosx</os>
-										<ws>cocoa</ws>
-										<arch>aarch64</arch>
-									</environment>
-									<environment>
-										<os>win32</os>
-										<ws>win32</ws>
-										<arch>x86_64</arch>
-									</environment>
-									<environment>
-										<os>linux</os>
-										<ws>gtk</ws>
-										<arch>x86_64</arch>
-									</environment>
-								</environments>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-				
 		</profile>
 
 		<profile>
@@ -1519,6 +752,11 @@
 								<ws>cocoa</ws>
 								<arch>x86_64</arch>
 							</environment>
+							<environment>
+								<os>macosx</os>
+								<ws>cocoa</ws>
+								<arch>aarch64</arch>
+							</environment>
 							<environment>
 								<os>win32</os>
 								<ws>win32</ws>
@@ -1530,8 +768,9 @@
 								<arch>x86_64</arch>
 							</environment>
 						</environments>
-					</configuration>
+			</configuration>
 				</plugin>
+
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-packaging-plugin</artifactId>