From 043ad13b663706bb51b887729502824e70859eaa Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Tue, 14 Nov 2017 08:12:29 +0100
Subject: [PATCH] added regular boot feature to product to include old
 properties editing support and removed boot-properties language server
 extension from distro

---
 .../org.springframework.boot.ide.product           |  5 +++--
 .../category.xml                                   | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

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 80fb4a8c8..40cc2636e 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
@@ -77,12 +77,13 @@ 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.feature" installMode="root"/>
       <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
 
       <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
-      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+<!--      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/> -->
 
-      <feature id="org.springframework.tooling.properties.ls.feature" installMode="root"/>
+<!--     <feature id="org.springframework.tooling.properties.ls.feature" installMode="root"/> -->
       <feature id="org.springframework.tooling.boot.java.ls.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index 33e644af3..119e99c6f 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -22,6 +22,11 @@
 	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
 	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
 
+<!--	<feature
+		id="org.springframework.boot.ide.main.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature> -->
+
 	<feature
 		id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
 		<category name="Extensions / Spring IDE" />
@@ -32,6 +37,11 @@
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
+<!--	<feature
+		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature> -->
+
 	<feature
 		id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
@@ -106,7 +116,7 @@
 	<bundle id="org.springsource.ide.eclipse.commons.livexp">
 		<category name="Core / Eclipse Integration Commons"/>
 	</bundle>
-
+<!--
 	<bundle id="io.projectreactor.reactor-core">
 		<category name="Uncategorized"/>
 	</bundle>
@@ -114,7 +124,7 @@
 	<bundle id="org.reactivestreams.reactive-streams">
 		<category name="Uncategorized"/>
 	</bundle>
-
+-->
 	<bundle id="org.dadacoalition.yedit">
 		<category name="Uncategorized"/>
 	</bundle>