From ab03f57c8723adb7e7e196bdbc4da26fe2353ee2 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Tue, 3 Aug 2021 17:29:23 +0200 Subject: [PATCH] #260 Update to Guice 5.0.1 (#119) Update the dependencies to use the latest Guice version available in Orbit (5.0.1) and update the target platform definition to Eclipse 2021-03 to be in line with the TPD of the eclipse-integration. This indirectly also enforces updates of jupiter, elk and guava dependencies. This PR contains a workaround to bypass the guava version restriction for elk maven dependencies. This can be removed once ELK 0.8.0 is released (this is tracked in eclipse-glsp/glsp/issues/#265) Resolves eclipse-glsp/glsp/issues/260 --- .../org.eclipse.glsp.example.workflow/pom.xml | 17 ++++++++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++-- plugins/org.eclipse.glsp.layout/pom.xml | 13 ++++++-- .../META-INF/MANIFEST.MF | 3 +- plugins/org.eclipse.glsp.server/pom.xml | 7 +---- pom.xml | 5 ++- releng/org.eclipse.glsp.feature/feature.xml | 16 +++++----- targetplatforms/.project | 6 ++++ .../{r2020-06.target => r2021-03.target} | 31 +++++++++---------- .../{r2020-06.tpd => r2021-03.tpd} | 13 ++++---- tests/org.eclipse.glsp.graph.test/pom.xml | 2 +- tests/org.eclipse.glsp.server.test/pom.xml | 2 +- 13 files changed, 72 insertions(+), 51 deletions(-) rename targetplatforms/{r2020-06.target => r2021-03.target} (72%) rename targetplatforms/{r2020-06.tpd => r2021-03.tpd} (72%) diff --git a/examples/org.eclipse.glsp.example.workflow/pom.xml b/examples/org.eclipse.glsp.example.workflow/pom.xml index e849bf7e..eb0f428f 100644 --- a/examples/org.eclipse.glsp.example.workflow/pom.xml +++ b/examples/org.eclipse.glsp.example.workflow/pom.xml @@ -46,7 +46,7 @@ com.google.inject guice - 3.0 + 5.0.1 org.eclipse.glsp @@ -66,7 +66,20 @@ org.eclipse.elk org.eclipse.elk.alg.layered - 0.5.0 + 0.7.1 + + + + com.google.guava + guava + + + + + com.google.guava + guava + 27.1-jre diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index 3bed56a6..607bf3e9 100644 --- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.emf.common;bundle-version="2.15.0", com.google.gson, org.eclipse.emf.ecore;bundle-version="2.15.0";visibility:=reexport, org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, - com.google.guava;bundle-version="21.0.0";visibility:=reexport + com.google.guava;bundle-version="27.1.0";visibility:=reexport Export-Package: org.eclipse.glsp.graph, org.eclipse.glsp.graph, org.eclipse.glsp.graph.builder, diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index 73149df9..096159cb 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.glsp.server;bundle-version="0.9.0", - org.eclipse.elk.core;bundle-version="0.5.0", - org.eclipse.elk.graph;bundle-version="0.5.0", - com.google.guava;bundle-version="21.0.0" + org.eclipse.elk.core;bundle-version="0.7.1", + org.eclipse.elk.graph;bundle-version="0.7.1", + com.google.guava;bundle-version="27.1.0" Export-Package: org.eclipse.glsp.layout diff --git a/plugins/org.eclipse.glsp.layout/pom.xml b/plugins/org.eclipse.glsp.layout/pom.xml index 5603f56a..9115fbc6 100644 --- a/plugins/org.eclipse.glsp.layout/pom.xml +++ b/plugins/org.eclipse.glsp.layout/pom.xml @@ -50,12 +50,21 @@ org.eclipse.elk org.eclipse.elk.core - 0.5.0 + 0.7.1 + + + + com.google.guava + guava + + + org.eclipse.elk org.eclipse.elk.graph.text - 0.5.0 + 0.7.1 diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index a856f1f8..753bd0aa 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -12,10 +12,9 @@ Require-Bundle: org.apache.commons.io;bundle-version="2.2.0", org.eclipse.lsp4j;bundle-version="0.9.0", org.eclipse.lsp4j.jsonrpc, org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport, - com.google.inject;bundle-version="3.0.0";visibility:=reexport, + com.google.inject;bundle-version="5.0.1";visibility:=reexport, javax.websocket;bundle-version="1.0.0";visibility:=reexport, org.eclipse.glsp.graph;bundle-version="[0.9.0,1.0.0)";visibility:=reexport -Import-Package: com.google.inject.multibindings;version="1.3.0" Export-Package: org.eclipse.glsp.server.actions, org.eclipse.glsp.server.di, org.eclipse.glsp.server.diagram, diff --git a/plugins/org.eclipse.glsp.server/pom.xml b/plugins/org.eclipse.glsp.server/pom.xml index 7865ea31..0ec1aba9 100644 --- a/plugins/org.eclipse.glsp.server/pom.xml +++ b/plugins/org.eclipse.glsp.server/pom.xml @@ -45,12 +45,7 @@ com.google.inject guice - 3.0 - - - com.google.inject.extensions - guice-multibindings - 3.0 + 5.0.1 org.eclipse.emf diff --git a/pom.xml b/pom.xml index e1c5b6a9..c99d96c4 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ com.google.guava guava - 21.0 + 27.1-jre @@ -166,7 +166,6 @@ org.eclipse.tycho tycho-versions-plugin - ${tycho-version} org.eclipse.tycho @@ -195,7 +194,7 @@ org.eclipse.glsp org.eclipse.glsp.parent - targetplatforms/r2020-06 + targetplatforms/r2021-03 ${project.version} diff --git a/releng/org.eclipse.glsp.feature/feature.xml b/releng/org.eclipse.glsp.feature/feature.xml index 7c0c1fba..f599621f 100644 --- a/releng/org.eclipse.glsp.feature/feature.xml +++ b/releng/org.eclipse.glsp.feature/feature.xml @@ -312,19 +312,21 @@ version(s), and exceptions or additional permissions here}." - - - - - - - + + + + + + + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + org.eclipse.jdt.core.javabuilder @@ -19,5 +24,6 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + org.eclipse.xtext.ui.shared.xtextNature diff --git a/targetplatforms/r2020-06.target b/targetplatforms/r2021-03.target similarity index 72% rename from targetplatforms/r2020-06.target rename to targetplatforms/r2021-03.target index 2df077d8..56737f0a 100644 --- a/targetplatforms/r2020-06.target +++ b/targetplatforms/r2021-03.target @@ -1,37 +1,36 @@ - + - - - - + + + + - + - - - + + - - + + - - - - - + + + + + diff --git a/targetplatforms/r2020-06.tpd b/targetplatforms/r2021-03.tpd similarity index 72% rename from targetplatforms/r2020-06.tpd rename to targetplatforms/r2021-03.tpd index b95a1aec..427fd438 100644 --- a/targetplatforms/r2020-06.tpd +++ b/targetplatforms/r2021-03.tpd @@ -1,29 +1,28 @@ -target "2020-06 - Release" with source requirements +target "2021-03 - Release" with source requirements -location "http://download.eclipse.org/releases/2020-06" { +location "http://download.eclipse.org/releases/2021-03" { 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/R20200529191137/repository/" { +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository/" { org.apache.log4j org.apache.commons.cli org.apache.commons.io javax.servlet com.google.gson [2.8.2,3.0.0) - com.google.inject [3.0.0,3.0.1) - com.google.inject.multibindings [3.0.0,3.0.1) + com.google.inject [5.0.1,5.0.2) com.google.guava [27.1.0,27.1.1) org.junit [4.12.0,4.13.0) - org.junit.jupiter.api [5.6.0,5.6.1) + org.junit.jupiter.api [5.7.1,5.7.2) } location "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.14.v20181113/" { org.eclipse.jetty.bundles.f.feature.group } -location "https://download.eclipse.org/elk/updates/releases/0.6.0/" { +location "https://download.eclipse.org/elk/updates/releases/0.7.1/" { org.eclipse.elk.core org.eclipse.elk.graph org.eclipse.elk.graph.text diff --git a/tests/org.eclipse.glsp.graph.test/pom.xml b/tests/org.eclipse.glsp.graph.test/pom.xml index 4ff8ce20..ac97864e 100644 --- a/tests/org.eclipse.glsp.graph.test/pom.xml +++ b/tests/org.eclipse.glsp.graph.test/pom.xml @@ -28,7 +28,7 @@ org.junit.jupiter junit-jupiter-engine - 5.4.2 + 5.7.1 diff --git a/tests/org.eclipse.glsp.server.test/pom.xml b/tests/org.eclipse.glsp.server.test/pom.xml index 644efcb9..d68803c4 100644 --- a/tests/org.eclipse.glsp.server.test/pom.xml +++ b/tests/org.eclipse.glsp.server.test/pom.xml @@ -28,7 +28,7 @@ org.junit.jupiter junit-jupiter-engine - 5.4.2 + 5.7.1