Skip to content

Commit 51b3a1d

Browse files
committed
Update to Java 11
- Bump to 0.30.0-SNPASHOT, since updating to Java 11 breaks API - Use `--release 11` in maven compiler plugin - Use Java 11 in the Jenkinsfiles - Update tycho to 2.7.5 (the newest version that supports Java 11) - Update to the latest lsp4j, adapt to the API changes, and remove the guava exclusion (lsp4j no longer ships with guava, so we don't need to exclude it) Signed-off-by: David Thompson <davthomp@redhat.com>
1 parent e507183 commit 51b3a1d

File tree

5 files changed

+9
-16
lines changed

5 files changed

+9
-16
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pipeline{
22
agent any
33
tools {
4-
jdk 'adoptopenjdk-hotspot-jdk8-latest'
4+
jdk 'adoptopenjdk-hotspot-jdk11-latest'
55
}
66
environment {
77
MAVEN_HOME = "$WORKSPACE/.m2/"

Release.jenkins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pipeline{
22
agent any
33
tools {
4-
jdk 'adoptopenjdk-hotspot-jdk8-latest'
4+
jdk 'adoptopenjdk-hotspot-jdk11-latest'
55
}
66
environment {
77
MAVEN_HOME = "$WORKSPACE/.m2/"

org.eclipse.lemminx/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.eclipse.lemminx</groupId>
55
<artifactId>lemminx-parent</artifactId>
6-
<version>0.29.1-SNAPSHOT</version>
6+
<version>0.30.0-SNAPSHOT</version>
77
</parent>
88
<artifactId>org.eclipse.lemminx</artifactId>
99
<properties>
@@ -217,12 +217,6 @@
217217
<dependency>
218218
<groupId>org.eclipse.lsp4j</groupId>
219219
<artifactId>org.eclipse.lsp4j</artifactId>
220-
<exclusions>
221-
<exclusion>
222-
<groupId>com.google.guava</groupId>
223-
<artifactId>guava</artifactId>
224-
</exclusion>
225-
</exclusions>
226220
</dependency>
227221
<dependency>
228222
<groupId>org.eclipse.lsp4j</groupId>

org.eclipse.lemminx/src/test/java/org/eclipse/lemminx/services/extensions/WorkspaceServiceParticipantTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void initializeLanguageService() {
5151

5252
@Test
5353
public void testWorkspaceFolders() {
54-
DidChangeWorkspaceFoldersParams params = new DidChangeWorkspaceFoldersParams(new WorkspaceFoldersChangeEvent(Collections.singletonList(new WorkspaceFolder("added")), Collections.singletonList(new WorkspaceFolder("removed"))));
54+
DidChangeWorkspaceFoldersParams params = new DidChangeWorkspaceFoldersParams(new WorkspaceFoldersChangeEvent(Collections.singletonList(new WorkspaceFolder("added", "added")), Collections.singletonList(new WorkspaceFolder("removed", "removed"))));
5555
server.getWorkspaceService().didChangeWorkspaceFolders(params);
5656
assertArrayEquals(new String[] { "added" }, workspaceServiceParticipant.didChangeWorkspaceFolders.getEvent().getAdded().stream().map(WorkspaceFolder::getUri).toArray(String[]::new));
5757
assertArrayEquals(new String[] { "removed" }, workspaceServiceParticipant.didChangeWorkspaceFolders.getEvent().getRemoved().stream().map(WorkspaceFolder::getUri).toArray(String[]::new));

pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.eclipse.lemminx</groupId>
44
<artifactId>lemminx-parent</artifactId>
5-
<version>0.29.1-SNAPSHOT</version>
5+
<version>0.30.0-SNAPSHOT</version>
66
<packaging>pom</packaging>
77
<name>Eclipse LemMinX</name>
88
<description>LemMinX is a XML Language Server Protocol (LSP), and can be used with any editor that supports LSP, to offer an outstanding XML editing experience</description>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<lsp4j.version>0.20.1</lsp4j.version>
11+
<lsp4j.version>0.23.1</lsp4j.version>
1212
<junit.version>5.10.1</junit.version>
1313
</properties>
1414
<url>https://github.com/eclipse/lemminx</url>
@@ -118,8 +118,7 @@
118118
<artifactId>maven-compiler-plugin</artifactId>
119119
<version>3.11.0</version>
120120
<configuration>
121-
<source>1.8</source>
122-
<target>1.8</target>
121+
<release>11</release>
123122
</configuration>
124123
</plugin>
125124
<plugin>
@@ -248,7 +247,7 @@
248247
<plugin>
249248
<groupId>org.eclipse.tycho.extras</groupId>
250249
<artifactId>tycho-eclipserun-plugin</artifactId>
251-
<version>1.3.0</version>
250+
<version>2.7.5</version>
252251
<executions>
253252
<execution>
254253
<id>generate-p2-site</id>
@@ -257,7 +256,7 @@
257256
<goal>eclipse-run</goal>
258257
</goals>
259258
<configuration>
260-
<executionEnvironment>JavaSE-1.8</executionEnvironment>
259+
<executionEnvironment>JavaSE-11</executionEnvironment>
261260
<repositories>
262261
<repository>
263262
<id>eclipse-4.10</id>

0 commit comments

Comments
 (0)