Make ls.eclipse.gotosymbol plugin part of boot.java.ls.feature

eclipse-distribution/pom.xml

@@ -28,7 +28,6 @@
 
 	<modules>
 		<module>../eclipse-extensions/org.springframework.boot.ide.main.feature</module>
-		<module>../eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol</module>
 		
 		<module>org.springframework.boot.ide.branding</module>
 		<module>org.springframework.boot.ide.branding.feature</module>

eclipse-language-servers/local-build.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+cd ../headless-services
+mvn clean install -Dmaven.test.skip=true
+
+cd $workdir
+mvn -Pe47 clean install

eclipse-language-servers/org.springframework.tooling.boot.java.ls.feature/feature.xml

@@ -18,4 +18,12 @@
 		unpack="false">
 	</plugin>
 
+	<plugin
+		id="org.springframework.tooling.ls.eclipse.gotosymbol"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
+
 </feature>

eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.project

@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>

eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

eclipse-language-servers/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml

@@ -4,9 +4,9 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot.ide</groupId>
-		<artifactId>org.springframework.boot.ide</artifactId>
+		<artifactId>org.springframework.boot.ide.servers</artifactId>
 		<version>4.0.0-SNAPSHOT</version>
-		<relativePath>../../eclipse-distribution/pom.xml</relativePath>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
 	<artifactId>org.springframework.tooling.ls.eclipse.gotosymbol</artifactId>

eclipse-language-servers/pom.xml

@@ -36,7 +36,8 @@
 
 		<module>org.springframework.tooling.properties.ls</module>
 		<module>org.springframework.tooling.properties.ls.feature</module>
-
+		
+		<module>org.springframework.tooling.ls.eclipse.gotosymbol</module>
 		<module>org.springframework.tooling.boot.java.ls</module>
 		<module>org.springframework.tooling.boot.java.ls.feature</module>
 
@@ -100,6 +101,11 @@
 					<layout>p2</layout>
 					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastStableBuild/artifact/build/p2-repository/</url>
 				</repository>
+				<repository>
+					<id>e-i-commons</id>
+					<layout>p2</layout>
+					<url>http://dist.springframework.org/snapshot/IDE/nightly</url>
+				</repository>
 				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>