From 4317b1e66355f4672101753df906b20ec9bb86ab Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 2 May 2019 16:30:00 -0700
Subject: [PATCH] Fix eclipse-ls bundles to work with new fatjar setup

---
 .../pom.xml                                   |  1 +
 .../pom.xml                                   | 18 ++++-------------
 .../pom.xml                                   | 12 ++++-------
 .../pom.xml                                   | 20 +++++--------------
 ...4LanguageServerProcessStreamConnector.java |  2 +-
 5 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
index a0c15c763..65755ce8e 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
@@ -33,6 +33,7 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>spring-boot-language-server</artifactId>
+									<classifier>exec</classifier>
 									<version>1.7.0-SNAPSHOT</version>
 									<overWrite>true</overWrite>
 								</artifactItem>
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
index 27e8f8f5a..b404eec35 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
@@ -15,20 +15,6 @@
 	<version>1.7.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>bosh-language-server</artifactId>
-			<version>1.7.0-SNAPSHOT</version>
-		    <exclusions>
-		        <exclusion>
-		            <groupId>org.springframework.ide.eclipse</groupId>
-		            <artifactId>org.json</artifactId>
-		        </exclusion>
-		    </exclusions>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -47,6 +33,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>bosh-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
@@ -67,6 +55,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>bosh-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<!-- <includes>META-INF/third-party-open-source-licenses*</includes> -->
 								</artifactItem>
 							</artifactItems>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
index d60ca720d..f32c7ee6e 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
@@ -15,14 +15,6 @@
 	<version>1.7.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>manifest-yaml-language-server</artifactId>
-			<version>1.7.0-SNAPSHOT</version>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -41,6 +33,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>manifest-yaml-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
@@ -61,6 +55,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>manifest-yaml-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<!-- <includes>META-INF/third-party-open-source-licenses*</includes> -->
 								</artifactItem>
 							</artifactItems>
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
index f7de54f55..5fd4b80c7 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
@@ -15,20 +15,6 @@
 	<version>1.7.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>concourse-language-server</artifactId>
-			<version>1.7.0-SNAPSHOT</version>
-		    <exclusions>
-		        <exclusion>
-		            <groupId>org.springframework.ide.eclipse</groupId>
-		            <artifactId>org.json</artifactId>
-		        </exclusion>
-		    </exclusions>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -47,6 +33,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>concourse-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<overWrite>true</overWrite>
 									<outputDirectory>${project.build.directory}/../servers</outputDirectory>
 								</artifactItem>
@@ -55,7 +43,7 @@
 							<overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
-					
+
 					<execution>
 						<id>unpack</id>
 						<phase>prepare-package</phase>
@@ -67,6 +55,8 @@
 								<artifactItem>
 									<groupId>org.springframework.ide.vscode</groupId>
 									<artifactId>concourse-language-server</artifactId>
+									<version>${project.version}</version>
+									<classifier>exec</classifier>
 									<!-- <includes>META-INF/third-party-open-source-licenses*</includes> -->
 								</artifactItem>
 							</artifactItems>
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
index 8bacdb316..1606d6ae5 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
@@ -139,7 +139,7 @@ public abstract class STS4LanguageServerProcessStreamConnector extends ProcessSt
 	}
 
 	final protected String getLanguageServerJARLocation() {
-		String languageServer = getLanguageServerArtifactId() +"-" + getLanguageServerArtifactVersion() +".jar";
+		String languageServer = getLanguageServerArtifactId() +"-" + getLanguageServerArtifactVersion() +"-exec.jar";
 		Bundle bundle = getBundle();
 		String bundleVersion = bundle.getVersion().toString();
 		String languageServerLocalCopy = bundleVersion + "-" + languageServer;