Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#75 Update to LSP4J 0.9.0 #61

Merged
merged 1 commit into from
Jun 26, 2020
Merged

#75 Update to LSP4J 0.9.0 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.api/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Vendor: EclipseSource
Automatic-Module-Name: org.eclipse.glsp.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.8.0",
javax.websocket;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.glsp.graph;bundle-version="0.7.0";visibility:=reexport,
com.google.gson,
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j.jsonrpc</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server.websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<dependency>
<groupId>org.eclipse.lsp4j</groupId>
<artifactId>org.eclipse.lsp4j.websocket</artifactId>
<version>0.8.1</version>
<version>0.9.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.glsp.api;bundle-version="0.7.0";visibility:=reexport
org.apache.commons.io;bundle-version="2.2.0",
org.eclipse.emf.ecore.change;bundle-version="2.13.0",
com.google.gson;bundle-version="2.8.2",
org.eclipse.lsp4j,
org.eclipse.lsp4j;bundle-version="0.8.0",
org.eclipse.lsp4j.jsonrpc,
com.google.guava;bundle-version="21.0.0"
Import-Package: com.google.inject.multibindings;version="1.3.0"
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<artifact>
<groupId>org.eclipse.glsp</groupId>
<artifactId>org.eclipse.glsp.parent</artifactId>
<classifier>targetplatforms/r2019-12</classifier>
<classifier>targetplatforms/r2020-06</classifier>
<version>${target.version}</version>
</artifact>
</target>
Expand Down
16 changes: 8 additions & 8 deletions targetplatforms/r2019-12.target → targetplatforms/r2020-06.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="2019-12 - Release" sequenceNumber="1584016407">
<target name="2020-06 - Release" sequenceNumber="1593006377">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.400.v20191014-1907"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.20.0.v20191028-0905"/>
<repository location="http://download.eclipse.org/releases/2019-12"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.600.v20200521-1852"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.800.v20200514-1529"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135"/>
<repository location="http://download.eclipse.org/releases/2020-06"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
Expand All @@ -18,8 +18,8 @@
<unit id="com.google.inject.multibindings" version="3.0.0.v201605172100"/>
<unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.jupiter.api" version="5.5.1.v20190826-0900"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/"/>
<unit id="org.junit.jupiter.api" version="5.6.0.v20200203-2009"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.14.v20181113"/>
Expand All @@ -36,7 +36,7 @@
<unit id="org.eclipse.lsp4j" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
<unit id="org.eclipse.lsp4j.websocket" version="0.0.0"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.8.1/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.9.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.jasper" version="8.5.35"/>
Expand Down
10 changes: 5 additions & 5 deletions targetplatforms/r2019-12.tpd → targetplatforms/r2020-06.tpd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
target "2019-12 - Release" with source requirements
target "2020-06 - Release" with source requirements

location "http://download.eclipse.org/releases/2019-12" {
location "http://download.eclipse.org/releases/2020-06" {
org.eclipse.equinox.p2.discovery.feature.feature.group
org.eclipse.equinox.executable.feature.group
org.eclipse.emf.sdk.feature.group
}

location "https://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/" {
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/" {
org.apache.log4j
org.apache.commons.io
javax.servlet
Expand All @@ -15,7 +15,7 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R201911262232
com.google.inject.multibindings [3.0.0,3.0.1)
com.google.guava [27.1.0,27.1.1)
org.junit [4.12.0,4.13.0)
org.junit.jupiter.api [5.5.1,5.6.0)
org.junit.jupiter.api [5.6.0,5.6.1)
}

location "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181113/" {
Expand All @@ -29,7 +29,7 @@ location "https://download.eclipse.org/elk/updates/releases/0.6.0/" {
org.eclipse.elk.alg.layered
}

location "https://download.eclipse.org/lsp4j/updates/releases/0.8.1/" {
location "https://download.eclipse.org/lsp4j/updates/releases/0.9.0" {
org.eclipse.lsp4j lazy
org.eclipse.lsp4j.jsonrpc lazy
org.eclipse.lsp4j.websocket lazy
Expand Down