Skip to content

Commit 89fa2bb

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 - Use Java 11 in the GitHub Actions - 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 89fa2bb

File tree

12 files changed

+43
-458
lines changed

12 files changed

+43
-458
lines changed

.github/workflows/pr-verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
matrix:
1919
os: [ubuntu-latest, windows-latest, macos-latest]
2020
steps:
21-
- name: Check out code
21+
- name: Check out code
2222
uses: actions/checkout@v4
23-
- name: Set up JDK 8
23+
- name: Set up JDK 11
2424
uses: actions/setup-java@v4
2525
with:
26-
java-version: '8'
26+
java-version: '11'
2727
distribution: 'temurin'
2828
architecture: ${{ matrix.os == 'macos-latest' && 'x64' || '' }}
2929
cache: 'maven'

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: 3 additions & 9 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>
@@ -291,8 +285,8 @@
291285
<dependency>
292286
<groupId>org.eclipse.jetty</groupId>
293287
<artifactId>jetty-server</artifactId>
294-
<!-- Need to stick to 9.x as long as build is running with Java 1.8-->
295-
<version>9.4.53.v20231009</version>
288+
<!-- Need to stick to 11.x as long as build is running with Java 11. It's EOL but only used in tests -->
289+
<version>11.0.24</version>
296290
<scope>test</scope>
297291
</dependency>
298292
</dependencies>

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/client/CodeLensKindCapabilities.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
import java.util.List;
1515

16-
import org.eclipse.lemminx.utils.ToStringBuilder;
16+
import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
1717

1818
/**
1919
* Specific capabilities for the `CodeLensKind`.
20-
*
20+
*
2121
* @see https://github.com/microsoft/language-server-protocol/issues/788
2222
*/
2323
@SuppressWarnings("all")
@@ -26,7 +26,7 @@ public class CodeLensKindCapabilities {
2626
* The codeLens kind values the client supports. When this property exists the
2727
* client also guarantees that it will handle values outside its set gracefully
2828
* and falls back to a default value when unknown.
29-
*
29+
*
3030
* If this property is not present the client only supports the codeLens kinds
3131
* from `File` to `Array` as defined in the initial version of the protocol.
3232
*/
@@ -43,7 +43,7 @@ public CodeLensKindCapabilities(final List<String> valueSet) {
4343
* The codeLens kind values the client supports. When this property exists the
4444
* client also guarantees that it will handle values outside its set gracefully
4545
* and falls back to a default value when unknown.
46-
*
46+
*
4747
* If this property is not present the client only supports the codeLens kinds
4848
* from `File` to `Array` as defined in the initial version of the protocol.
4949
*/
@@ -55,7 +55,7 @@ public List<String> getValueSet() {
5555
* The codeLens kind values the client supports. When this property exists the
5656
* client also guarantees that it will handle values outside its set gracefully
5757
* and falls back to a default value when unknown.
58-
*
58+
*
5959
* If this property is not present the client only supports the codeLens kinds
6060
* from `File` to `Array` as defined in the initial version of the protocol.
6161
*/

org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/client/ExtendedCodeLensCapabilities.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
*******************************************************************************/
1212
package org.eclipse.lemminx.client;
1313

14-
import org.eclipse.lemminx.utils.ToStringBuilder;
14+
import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
1515
import org.eclipse.lsp4j.DynamicRegistrationCapabilities;
1616

1717
/**
18-
* Extended capabilities specific to the `textDocument/codeLens` request. This capability doesn't belong to LSP specification. See proposal at
18+
* Extended capabilities specific to the `textDocument/codeLens` request. This capability doesn't belong to LSP specification. See proposal at
1919
* https://github.com/microsoft/language-server-protocol/issues/788
20-
*
20+
*
2121
* @author Angelo ZERR
22-
*
22+
*
2323
* @see https://github.com/microsoft/language-server-protocol/issues/788
2424
*/
2525
@SuppressWarnings("all")

0 commit comments

Comments
 (0)