Open ranges to accept Guava 30
Change-Id: I790e0b5bf824a89728055566d968d473e8fbad23
diff --git a/plugins/org.eclipse.acceleo.common.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.acceleo.common.ide/META-INF/MANIFEST.MF
index 40b4d4a..a54c754 100644
--- a/plugins/org.eclipse.acceleo.common.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.acceleo.common.ide/META-INF/MANIFEST.MF
@@ -12,9 +12,9 @@
org.eclipse.acceleo.common;bundle-version="3.6.0",
org.eclipse.emf.ecore
Export-Package: org.eclipse.acceleo.common.ide.authoring
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
+ com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.io;version="[27.0.0,30.2.0)"
Bundle-Activator: org.eclipse.acceleo.common.ide.AcceleoCommonIDEPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.acceleo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.acceleo.common/META-INF/MANIFEST.MF
index 39576ab..913c6e1 100644
--- a/plugins/org.eclipse.acceleo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.acceleo.common/META-INF/MANIFEST.MF
@@ -49,6 +49,6 @@
org.eclipse.core.runtime;bundle-version="3.4.0";resolution:=optional,
org.eclipse.core.resources;bundle-version="3.3.0";resolution:=optional,
org.eclipse.core.filesystem;resolution:=optional
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
+ com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.io;version="[27.0.0,30.2.0)"
diff --git a/plugins/org.eclipse.acceleo.engine/META-INF/MANIFEST.MF b/plugins/org.eclipse.acceleo.engine/META-INF/MANIFEST.MF
index 6ed509c..2bcb7f3 100644
--- a/plugins/org.eclipse.acceleo.engine/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.acceleo.engine/META-INF/MANIFEST.MF
@@ -48,6 +48,6 @@
org.eclipse.acceleo.engine.generation.strategy",
org.eclipse.acceleo.engine.service.properties;uses:="org.osgi.framework,org.eclipse.acceleo.engine.service",
org.eclipse.acceleo.engine.utils;uses:="org.eclipse.acceleo.profiler,org.eclipse.emf.ecore.resource"
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
+ com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.io;version="[27.0.0,30.2.0)"
diff --git a/plugins/org.eclipse.acceleo.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.acceleo.ide.ui/META-INF/MANIFEST.MF
index 7b34fc4..f7391c4 100644
--- a/plugins/org.eclipse.acceleo.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.acceleo.ide.ui/META-INF/MANIFEST.MF
@@ -121,6 +121,6 @@
org.eclipse.acceleo.internal.ide.ui.wizards.newfile.main;x-internal:=true,
org.eclipse.acceleo.internal.ide.ui.wizards.newproject;x-friends:="org.eclipse.acceleo.parser.tests",
org.eclipse.acceleo.internal.ide.ui.wizards.project;x-friends:="org.eclipse.acceleo.ide.ui.tests"
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
+ com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.io;version="[27.0.0,30.2.0)"
diff --git a/plugins/org.eclipse.acceleo.parser/META-INF/MANIFEST.MF b/plugins/org.eclipse.acceleo.parser/META-INF/MANIFEST.MF
index 6ad170a..8a48b01 100644
--- a/plugins/org.eclipse.acceleo.parser/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.acceleo.parser/META-INF/MANIFEST.MF
@@ -44,5 +44,5 @@
org.eclipse.emf.ecore.resource,
org.eclipse.acceleo.common.interpreter,
com.google.common.collect"
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,30.2.0)",
+ com.google.common.collect;version="[27.0.0,30.2.0)"
diff --git a/query/plugins/org.eclipse.acceleo.query.doc/META-INF/MANIFEST.MF b/query/plugins/org.eclipse.acceleo.query.doc/META-INF/MANIFEST.MF
index 7114bb8..1f8f412 100644
--- a/query/plugins/org.eclipse.acceleo.query.doc/META-INF/MANIFEST.MF
+++ b/query/plugins/org.eclipse.acceleo.query.doc/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@
org.eclipse.acceleo.query;bundle-version="3.6.0",
org.eclipse.emf.ecore,
org.eclipse.help,
- com.google.guava;bundle-version="[27.0.0,28.0.0)"
+ com.google.guava;bundle-version="[27.0.0,30.2.0)"
diff --git a/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF b/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
index 22bf85d..c34e961 100644
--- a/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
+++ b/query/tests/org.eclipse.acceleo.query.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@
org.eclipse.uml2.uml;bundle-version="5.0.1",
org.eclipse.acceleo.annotations,
org.eclipse.acceleo.query.tests.nestedpackages,
- com.google.guava;bundle-version="[27.0.0,28.0.0)",
+ com.google.guava;bundle-version="[27.0.0,30.2.0)",
org.antlr.runtime;bundle-version="[4.7.2,4.7.3)"
Bundle-ActivationPolicy: lazy
Export-Package: nooperationreflection,
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
index 1655f99..7e1f2e1 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2019-09/acceleo-2019-09.target
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1585554212">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
- <unit id="org.junit" version="4.13.0.v20200204-1500"/>
- <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
- <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
- <repository location="http://download.eclipse.org/cbi/updates/license"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="lpg.runtime.java" version="0.0.0"/>
- <unit id="org.eclipse.ocl" version="0.0.0"/>
- <unit id="org.eclipse.ocl.ecore" version="0.0.0"/>
- <unit id="org.eclipse.ocl.common" version="0.0.0"/>
- <unit id="org.eclipse.ocl.examples.xtext.console" version="0.0.0"/>
- <unit id="org.eclipse.ocl.xtext.completeocl" version="0.0.0"/>
- <unit id="org.eclipse.ocl.xtext.completeocl.ui" version="0.0.0"/>
- <unit id="org.eclipse.ocl.pivot.uml" version="0.0.0"/>
- <unit id="org.eclipse.ocl.pivot.ui" version="0.0.0"/>
- <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
- <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/releases/2019-09"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1613726407">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+ <unit id="org.junit" version="4.13.0.v20200204-1500"/>
+ <unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="lpg.runtime.java" version="0.0.0"/>
+ <unit id="org.eclipse.ocl" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.ecore" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.common" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.examples.xtext.console" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.xtext.completeocl" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.xtext.completeocl.ui" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.pivot.uml" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.pivot.ui" version="0.0.0"/>
+ <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/2019-09"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/2020-12/acceleo-2020-12.target b/releng/org.eclipse.acceleo.targetplatforms/2020-12/acceleo-2020-12.target
index c07b468..76f775f 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2020-12/acceleo-2020-12.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2020-12/acceleo-2020-12.target
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Acceleo 2020-12 Target Platform" sequenceNumber="1613380528">
+<target name="Acceleo 2020-12 Target Platform" sequenceNumber="1613726793">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
+ <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
<unit id="org.junit" version="4.13.0.v20200204-1500"/>
<unit id="org.antlr.runtime" version="4.7.2.v20200218-0804"/>
<unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
diff --git a/releng/org.eclipse.acceleo.targetplatforms/common/orbit.tpd b/releng/org.eclipse.acceleo.targetplatforms/common/orbit.tpd
index 0d4ba84..9512c3a 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/common/orbit.tpd
+++ b/releng/org.eclipse.acceleo.targetplatforms/common/orbit.tpd
@@ -2,8 +2,8 @@
with source, requirements
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository" {
- com.google.guava [27.0.0,28.0.0)
+location "https://download.eclipse.org/tools/orbit/downloads/drops/S20210216215844/repository" {
+ com.google.guava [27.0.0,30.2.0)
org.junit [4,5)
org.antlr.runtime [4.7.2,4.7.3)
org.kohsuke.args4j [2.0.21,2.1.0)
diff --git a/tests/org.eclipse.acceleo.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.acceleo.common.tests/META-INF/MANIFEST.MF
index 329c074..e776ccd 100644
--- a/tests/org.eclipse.acceleo.common.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.acceleo.common.tests/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@
org.eclipse.emf.ecore,
org.eclipse.emf.ecore.xmi
Export-Package: org.eclipse.acceleo.common.tests.suite
-Import-Package: com.google.common.collect;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.collect;version="[27.0.0,30.2.0)"
diff --git a/tests/org.eclipse.acceleo.engine.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.acceleo.engine.tests/META-INF/MANIFEST.MF
index f75eb80..79135ea 100644
--- a/tests/org.eclipse.acceleo.engine.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.acceleo.engine.tests/META-INF/MANIFEST.MF
@@ -20,5 +20,5 @@
org.eclipse.acceleo.parser
Export-Package: org.eclipse.acceleo.engine.tests.mock;x-friends:="org.eclipse.acceleo.dynamic.tests",
org.eclipse.acceleo.engine.tests.suite;x-friends:="org.eclipse.acceleo.tests"
-Import-Package: com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.io;version="[27.0.0,30.2.0)"
diff --git a/tests/org.eclipse.acceleo.standalone.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.acceleo.standalone.tests/META-INF/MANIFEST.MF
index bab49ff..ff45943 100644
--- a/tests/org.eclipse.acceleo.standalone.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.acceleo.standalone.tests/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@
Require-Bundle: org.eclipse.acceleo.parser,
org.eclipse.acceleo.engine,
org.junit;bundle-version="4.11.0",
- com.google.guava;bundle-version="[27.0.0,28.0.0)"
+ com.google.guava;bundle-version="[27.0.0,30.2.0)"
