From 410628c874b107c85648bf90bad36a2878d3252b Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Mon, 23 Apr 2018 12:29:17 +0200
Subject: [PATCH] adding jdt.ls.commons to update sites and eclipse-ls-builds

---
 .../org.springframework.boot.ide.repository.e48/category.xml  | 4 ++++
 .../category.xml                                              | 4 ++++
 .../org.springframework.tooling.ls.repository/category.xml    | 4 ++++
 eclipse-language-servers/pom.xml                              | 3 ++-
 headless-services/jdt-ls-extension/pom.xml                    | 4 ++--
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml
index 6cc4f5f16..44eb0a254 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e48/category.xml
@@ -92,6 +92,10 @@
 		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.jdt.ls.commons">
+		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
+	</bundle>
+
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
 		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 	</bundle>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
index 8bf9ca993..45c384f28 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/category.xml
@@ -28,6 +28,10 @@
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.jdt.ls.commons">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.springframework.tooling.ls.eclipse.gotosymbol">
 		<category name="deps"/>
 	</bundle>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
index 0f3869f25..2e63eea3c 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.tooling.ls.repository/category.xml
@@ -12,6 +12,10 @@
 		<category name="deps"/>
 	</bundle>
 
+	<bundle id="org.springframework.tooling.jdt.ls.commons">
+		<category name="deps"/>
+	</bundle>
+
 	<bundle id="org.eclipse.lsp4e">
 		<category name="deps"/>
 	</bundle>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index be4d962b7..0d162187d 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -27,6 +27,7 @@
 	</licenses>
 
 	<modules>
+		<module>../headless-services/jdt-ls-extension</module>
 		<module>org.springframework.tooling.ls.eclipse.commons</module>
 	
 		<module>org.springframework.tooling.cloudfoundry.manifest.ls</module>
@@ -63,7 +64,7 @@
 		<!-- OSX app signing -->
 		<skip.osx.signing>true</skip.osx.signing>
 
-		<tycho-version>0.26.0</tycho-version>
+		<tycho-version>1.1.0</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<dist.accessKey>${accessKey}</dist.accessKey>
diff --git a/headless-services/jdt-ls-extension/pom.xml b/headless-services/jdt-ls-extension/pom.xml
index 4ca5c3dda..702e40683 100644
--- a/headless-services/jdt-ls-extension/pom.xml
+++ b/headless-services/jdt-ls-extension/pom.xml
@@ -20,9 +20,9 @@
 	</properties>
 	<repositories>
 		<repository>
-			<id>eclipse-oxygen</id>
+			<id>eclipse-photon</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/oxygen</url>
+			<url>http://download.eclipse.org/releases/photon</url>
 		</repository>
 		<repository>
 			<id>JDT.LS</id>