Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix eclipse-ls bundles to work with new fatjar setup

Browse Source
This commit is contained in:
Kris De Volder
2019-05-02 16:30:00 -07:00
parent 3f93616970
commit 4317b1e663
5 changed files with 15 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eclipse-language-servers/org.springframework.tooling.boot.ls/pom.xml
View File

@@ -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>

18
eclipse-language-servers/org.springframework.tooling.bosh.ls/pom.xml
View File

@@ -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>

12
eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/pom.xml
View File

@@ -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>

20
eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
View File

@@ -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>

2
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
View File

@@ -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;