Skip to content

Commit

Permalink
Update to Java 11
Browse files Browse the repository at this point in the history
- 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 <[email protected]>
  • Loading branch information
datho7561 committed Jan 9, 2025
1 parent e507183 commit 89fa2bb
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 458 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- name: Check out code
- name: Check out code
uses: actions/checkout@v4
- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'
architecture: ${{ matrix.os == 'macos-latest' && 'x64' || '' }}
cache: 'maven'
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline{
agent any
tools {
jdk 'adoptopenjdk-hotspot-jdk8-latest'
jdk 'adoptopenjdk-hotspot-jdk11-latest'
}
environment {
MAVEN_HOME = "$WORKSPACE/.m2/"
Expand Down
2 changes: 1 addition & 1 deletion Release.jenkins
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline{
agent any
tools {
jdk 'adoptopenjdk-hotspot-jdk8-latest'
jdk 'adoptopenjdk-hotspot-jdk11-latest'
}
environment {
MAVEN_HOME = "$WORKSPACE/.m2/"
Expand Down
12 changes: 3 additions & 9 deletions org.eclipse.lemminx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.lemminx</groupId>
<artifactId>lemminx-parent</artifactId>
<version>0.29.1-SNAPSHOT</version>
<version>0.30.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.lemminx</artifactId>
<properties>
Expand Down Expand Up @@ -217,12 +217,6 @@
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
Expand Down Expand Up @@ -291,8 +285,8 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<!-- Need to stick to 9.x as long as build is running with Java 1.8-->
<version>9.4.53.v20231009</version>
<!-- Need to stick to 11.x as long as build is running with Java 11. It's EOL but only used in tests -->
<version>11.0.24</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

import java.util.List;

import org.eclipse.lemminx.utils.ToStringBuilder;
import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;

/**
* Specific capabilities for the `CodeLensKind`.
*
*
* @see https://github.com/microsoft/language-server-protocol/issues/788
*/
@SuppressWarnings("all")
Expand All @@ -26,7 +26,7 @@ public class CodeLensKindCapabilities {
* The codeLens kind values the client supports. When this property exists the
* client also guarantees that it will handle values outside its set gracefully
* and falls back to a default value when unknown.
*
*
* If this property is not present the client only supports the codeLens kinds
* from `File` to `Array` as defined in the initial version of the protocol.
*/
Expand All @@ -43,7 +43,7 @@ public CodeLensKindCapabilities(final List<String> valueSet) {
* The codeLens kind values the client supports. When this property exists the
* client also guarantees that it will handle values outside its set gracefully
* and falls back to a default value when unknown.
*
*
* If this property is not present the client only supports the codeLens kinds
* from `File` to `Array` as defined in the initial version of the protocol.
*/
Expand All @@ -55,7 +55,7 @@ public List<String> getValueSet() {
* The codeLens kind values the client supports. When this property exists the
* client also guarantees that it will handle values outside its set gracefully
* and falls back to a default value when unknown.
*
*
* If this property is not present the client only supports the codeLens kinds
* from `File` to `Array` as defined in the initial version of the protocol.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
*******************************************************************************/
package org.eclipse.lemminx.client;

import org.eclipse.lemminx.utils.ToStringBuilder;
import org.eclipse.lsp4j.jsonrpc.util.ToStringBuilder;
import org.eclipse.lsp4j.DynamicRegistrationCapabilities;

/**
* Extended capabilities specific to the `textDocument/codeLens` request. This capability doesn't belong to LSP specification. See proposal at
* Extended capabilities specific to the `textDocument/codeLens` request. This capability doesn't belong to LSP specification. See proposal at
* https://github.com/microsoft/language-server-protocol/issues/788
*
*
* @author Angelo ZERR
*
*
* @see https://github.com/microsoft/language-server-protocol/issues/788
*/
@SuppressWarnings("all")
Expand Down
Loading

0 comments on commit 89fa2bb

Please sign in to comment.