From 6b352d3e8fc76c5494894c92d3d6661759ea020a Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Fri, 29 Jun 2018 10:53:50 +0200
Subject: [PATCH] updated dependencies and update urls to limit the scope of
 updated to e48 based installs

---
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../feature.xml                               | 45 +++++++++----------
 .../p2.inf                                    | 10 +++--
 .../META-INF/MANIFEST.MF                      |  2 +-
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index 4b87c8f29..3ab43af3d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.jdt.ui;bundle-version="3.13.0",
  org.eclipse.tm4e.core;bundle-version="0.1.0",
  org.eclipse.tm4e.ui;bundle-version="0.1.0",
- org.eclipse.lsp4e;bundle-version="0.5.0",
+ org.eclipse.lsp4e;bundle-version="0.6.0",
  org.eclipse.lsp4j;bundle-version="0.4.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.4.0",
  org.eclipse.ui.workbench,
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
index 8b8e6e650..f86e8af21 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/feature.xml
@@ -1,32 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-	id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
-	label="%featureName"
-	version="4.0.0.qualifier"
-	provider-name="%providerName">
+      id="org.springframework.tooling.cloudfoundry.manifest.ls.feature"
+      label="%featureName"
+      version="4.0.0.qualifier"
+      provider-name="%providerName">
 
-    <description>
-       %description
-    </description>
+   <description>
+      %description
+   </description>
 
-    <copyright>
-       %copyright
-    </copyright>
+   <copyright>
+      %copyright
+   </copyright>
 
-    <license url="%licenseUrl">
-       %license
-    </license>
+   <license url="%licenseUrl">
+      %license
+   </license>
 
-	<requires>
-		<import plugin="org.eclipse.lsp4e"/>
-	</requires>
+   <requires>
+      <import plugin="org.eclipse.lsp4e" version="0.6.0" match="greaterOrEqual"/>
+   </requires>
 
-	<plugin
-		id="org.springframework.tooling.cloudfoundry.manifest.ls"
-		download-size="0"
-		install-size="0"
-		version="0.0.0"
-		unpack="false">
-	</plugin>
+   <plugin
+         id="org.springframework.tooling.cloudfoundry.manifest.ls"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf
index 8519b654b..2005f2b2b 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.feature/p2.inf
@@ -1,7 +1,9 @@
 instructions.configure=\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers,name:Spring Tooling Language Servers for Eclipse);\
- org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers,name:Spring Tooling Language Servers for Eclipse);
-
-instructions.unconfigure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers/e4.8,name:Spring Tooling Language Servers for Eclipse);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers/e4.8,name:Spring Tooling Language Servers for Eclipse);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers);\
  org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers)
+
+instructions.unconfigure=\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers/e4.8);\
+ org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.springsource.com/release/TOOLS/sts4-language-servers/e4.8)
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
index 6fa7001eb..e71c0d208 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.3.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.lsp4e;bundle-version="0.5.0",
+ org.eclipse.lsp4e;bundle-version="0.6.0",
  org.eclipse.lsp4j;bundle-version="0.4.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.4.0",
  org.springframework.tooling.ls.eclipse.commons;bundle-version="4.0.0",