From b54fed412c6e3c01df0154d573ac86d82faeb34e Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Mon, 8 Aug 2022 13:58:39 +0200
Subject: [PATCH] updated p2 repo URLs for upcoming Eclipse 2022-09 builds,
 especially around m2e 2.0 update-related items, and disabled a few
 non-compatible m2e connectors

---
 .../org.springframework.boot.ide.product            | 10 +++++-----
 eclipse-distribution/pom.xml                        | 13 +++++++++----
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e425/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e425/org.springframework.boot.ide.product
index 41be43e13..f6e2c838f 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e425/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e425/org.springframework.boot.ide.product
@@ -69,7 +69,7 @@
       <feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
 <!--      <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/> -->
 <!--      <feature id="org.eclipse.m2e.wtp.jsf.feature" installMode="root"/> -->
-      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/>
+<!--      <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/> -->
 
 <!--      <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/> -->
 <!--      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/> -->
@@ -92,11 +92,11 @@
 	  
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
 
-      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
-      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
+<!--      <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/> -->
+<!--      <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/> -->
 <!--      <feature id="org.sonatype.m2e.egit.feature" installMode="root"/> -->
-      <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
-      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
+<!--      <feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/> -->
+<!--      <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/> -->
       <feature id="m2e.chromatic.feature" installMode="root"/>
 
       <feature id="net.mihai-nita.ansicon" installMode="root"/>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 519ccae90..b09664022 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -417,9 +417,9 @@
 					<url>https://download.eclipse.org/technology/m2e/releases/1.20.1/</url>
 				</repository>
 				<repository>
-					<id>latest-m2e-wtp</id>
+					<id>latest-m2e-wtp-release</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/m2e-wtp/snapshots/1.4/m2e-wtp/</url>
+					<url>https://download.eclipse.org/m2e-wtp/releases/1.4/</url>
 				</repository>
 <!--				<repository>
 					<id>latest-m2e-wtp</id>
@@ -553,10 +553,15 @@
 					<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
 				</repository>
 				<repository>
+					<id>latest-m2e-wtp-release</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/m2e-wtp/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>
+					<url>https://download.eclipse.org/m2e-wtp/snapshots/</url>
+				</repository> -->
 <!--				<repository>
 					<id>latest-m2e-wtp</id>
 					<layout>p2</layout>