From 8517d91a63cba7635b3ee324302c0d583c2546ac Mon Sep 17 00:00:00 2001 From: "Kellner, Niklas" Date: Tue, 4 Jul 2023 07:09:21 +0200 Subject: [PATCH] Adding max version requirements for guava to prevent version conflicts closes https://github.com/eclipse-glsp/glsp/issues/1046 --- plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index d7c9754e..eb6068fe 100644 --- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0", com.google.gson;bundle-version="2.8.7", org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport, - com.google.guava;bundle-version="30.1.0";visibility:=reexport + com.google.guava;bundle-version="[30.1.0,31.0.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 a2aa03ba..caccbce0 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.elk.core;bundle-version="0.8.1", org.eclipse.elk.graph;bundle-version="0.8.1", - com.google.guava;bundle-version="30.1.0" + com.google.guava;bundle-version="[30.1.0,31.0.0]" Export-Package: org.eclipse.glsp.layout diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index f2de91a4..a869994d 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0", org.eclipse.lsp4j;bundle-version="0.11.0", org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0", org.apache.commons.cli;bundle-version="1.4.0";visibility:=reexport, - com.google.inject;bundle-version="5.0.1";visibility:=reexport, + com.google.inject;bundle-version="[5.0.1,6.0.0)";visibility:=reexport, org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)";visibility:=reexport Export-Package: org.eclipse.glsp.server.actions, org.eclipse.glsp.server.di,