From 55f20d7d997b83dcfa7aeb7614ee4ba570fc7997 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 6 Sep 2018 11:23:14 -0700
Subject: [PATCH] Attempt to add m2e-apt to STS 4 and enable by default

---
 .../plugin_customization.ini                                 | 4 ++++
 .../org.springframework.boot.ide.product                     | 2 ++
 .../org.springframework.boot.ide.product                     | 1 +
 .../org.springframework.boot.ide.product                     | 1 +
 eclipse-distribution/pom.xml                                 | 5 +++++
 5 files changed, 13 insertions(+)

diff --git a/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini b/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini
index b440c52fb..2da68adcb 100644
--- a/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini
+++ b/eclipse-distribution/org.springframework.boot.ide.branding/plugin_customization.ini
@@ -52,3 +52,7 @@ org.eclipse.equinox.p2.ui.sdk.scheduler/download=false
 # disable the Oomph preference recorder - bug 470430
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=470430
 org.eclipse.oomph.setup.ui/enable.preference.recorder=false
+
+# Enable m2e APT. See: https://www.pivotaltracker.com/story/show/160300760
+org.jboss.tools.maven.apt/org.jboss.tools.maven.apt.aptProcessDuringReconcile=true
+org.jboss.tools.maven.apt/org.jboss.tools.maven.apt.mode=jdt_apt
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 5c5de4e9f..e2ebd0cde 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -58,6 +58,7 @@ openFile</programArgs>
       <feature id="org.eclipse.jgit" installMode="root"/>
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.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"/>
@@ -76,6 +77,7 @@ openFile</programArgs>
 
       <feature id="net.mihai-nita.ansicon" installMode="root"/>
 
+
       <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
       <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product
index 867949d75..d3fe3947e 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e48/org.springframework.boot.ide.product
@@ -60,6 +60,7 @@ openFile</programArgs>
 
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.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"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
index 867949d75..d3fe3947e 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e49/org.springframework.boot.ide.product
@@ -60,6 +60,7 @@ openFile</programArgs>
 
       <feature id="org.eclipse.m2e.feature" installMode="root"/>
       <feature id="org.eclipse.m2e.logback.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"/>
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 962210bc8..71ad40bc0 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -426,6 +426,11 @@
 			<layout>p2</layout>
 			<url>http://download.eclipse.org/egit/github/updates</url>
 		</repository>
+		<repository>
+			<id>m2e-apt</id>
+			<layout>p2</layout>
+			<url>http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-apt</url>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>