Open ranges to accept Guava 30
Change-Id: I9381709056e0ed2528b96c4b025ddeb2863eced8
diff --git a/query/tests/org.eclipse.acceleo.query.compat.tests/META-INF/MANIFEST.MF b/query/tests/org.eclipse.acceleo.query.compat.tests/META-INF/MANIFEST.MF
index 49b10be..35446b1 100644
--- a/query/tests/org.eclipse.acceleo.query.compat.tests/META-INF/MANIFEST.MF
+++ b/query/tests/org.eclipse.acceleo.query.compat.tests/META-INF/MANIFEST.MF
@@ -23,6 +23,6 @@
org.eclipse.acceleo.query.tests.qmodel
Export-Package: org.eclipse.acceleo.query.compat.tests,
org.eclipse.acceleo.query.compat.tests.unit
-Import-Package: com.google.common.collect;version="[22.0.0,28.0.0)"
+Import-Package: com.google.common.collect;version="[22.0.0,30.2.0)"
Automatic-Module-Name: org.eclipse.acceleo.query.compat.tests
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 5046271..2eca219 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
@@ -40,5 +40,5 @@
org.eclipse.acceleo.query.tests.services,
org.eclipse.acceleo.query.tests.unit,
org.eclipse.acceleo.query.tests.validation.types
-Import-Package: com.google.common.collect;version="[22.0.0,28.0.0)",
- com.google.common.base;version="[22.0.0,28.0.0)"
+Import-Package: com.google.common.collect;version="[27.0.0,30.2.0)",
+ com.google.common.base;version="[27.0.0,30.2.0)"
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 f6fdf8b..a39aadf 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,51 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Acceleo 2019-09 Target Platform" sequenceNumber="1591363289">
- <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.lsp4j" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
- <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
- <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
- <unit id="org.eclipse.lsp4e" version="0.0.0"/>
- <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
- <unit id="a.jre.javase" version="0.0.0"/>
- <unit id="config.a.jre.javase" version="0.0.0"/>
- <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.core.runtime" version="0.0.0"/>
- <unit id="org.eclipse.ui" version="0.0.0"/>
- <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
- <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.ds" 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"/>
- <unit id="org.eclipse.jface" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
- <unit id="org.eclipse.tm4e.languageconfiguration" 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="1613728831">
+ <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.lsp4j" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.debug" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4j.jsonrpc.debug" version="0.0.0"/>
+ <unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4e" version="0.0.0"/>
+ <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
+ <unit id="a.jre.javase" version="0.0.0"/>
+ <unit id="config.a.jre.javase" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/lsp4e/releases/0.13.0/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <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.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.core.runtime" version="0.0.0"/>
+ <unit id="org.eclipse.ui" version="0.0.0"/>
+ <unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+ <unit id="org.eclipse.epp.mpc.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"/>
+ <unit id="org.eclipse.jface" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.core" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.ui" version="0.0.0"/>
+ <unit id="org.eclipse.tm4e.languageconfiguration" 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-09/acceleo-2020-09.target b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
index 19039d5..21ac835 100644
--- a/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.target
+++ b/releng/org.eclipse.acceleo.targetplatforms/2020-09/acceleo-2020-09.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-09 Target Platform" sequenceNumber="1598259491">
+<target name="Acceleo 2020-09 Target Platform" sequenceNumber="1613728858">
<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)
