Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF2
-rw-r--r--extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF2
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF2
-rw-r--r--plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF3
-rw-r--r--plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java1
-rw-r--r--plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java2
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java2
-rw-r--r--plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java4
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java15
-rw-r--r--plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF2
-rw-r--r--releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target17
-rw-r--r--releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target17
-rw-r--r--releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd2
-rw-r--r--releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target16
-rw-r--r--releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target16
-rw-r--r--releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target6
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target6
-rw-r--r--releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd2
-rw-r--r--releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target17
-rw-r--r--releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target17
-rw-r--r--releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target7
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target7
-rw-r--r--releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd7
-rw-r--r--releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target6
-rw-r--r--releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target6
-rw-r--r--tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF3
-rw-r--r--tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java2
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java4
-rw-r--r--tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF2
-rwxr-xr-x[-rw-r--r--]tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java3
-rw-r--r--tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java6
-rwxr-xr-xtests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF2
62 files changed, 162 insertions, 105 deletions
diff --git a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
index 645a5eb9d47..117c2b073a0 100644
--- a/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
+++ b/extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ocl.ecore,
org.eclipse.emf.validation;bundle-version="1.4.0",
org.eclipse.papyrus.dsml.validation.model;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF
index bd3e59389d4..f8c44a0bc0c 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.swt,
org.eclipse.ui.workbench,
org.eclipse.ui.navigator;bundle-version="3.5.500",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0",
org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0"
diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF
index d2dcd499dc0..d6c41071a4a 100644
--- a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF
+++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.emf.ecore.editor,
org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index fce87a981b5..296c540d44f 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -178,7 +178,7 @@ http://www.eclipse.org/legal/epl-v10.html
id="com.google.guava"
download-size="0"
install-size="0"
- version="15.0.0.v201403281430"
+ version="21.0.0.v20170206-1425"
unpack="false"/>
<plugin
diff --git a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
index cf700faecae..431d632fa29 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
+++ b/plugins/developer/org.eclipse.papyrus.dev.project.management/src/org/eclipse/papyrus/dev/project/management/internal/operations/VersionRules.java
@@ -36,7 +36,7 @@ public class VersionRules {
new CurrentVersionRule(), // The default behaviour
new FixedRangeRule(dep -> dep.startsWith("org.apache.batik"), "[1.6.0,1.7.0)"), //$NON-NLS-1$//$NON-NLS-2$
new SkipRule("com.ibm.icu"), //$NON-NLS-1$
- new FixedRangeRule("com.google.guava", "11.0.0") //$NON-NLS-1$
+ new FixedRangeRule("com.google.guava", "21.0.0") //$NON-NLS-1$
);
public VersionRules() {
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
index 51ed057b920..46e3c4a8b6a 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)",
org.eclipse.papyrus.dev.tests.framework;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
diff --git a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
index 2d08ad4a6cb..d8939b1eab5 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.tests.framework/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.jdt.launching;bundle-version="[3.8.0,4.0.0)",
org.eclipse.jdt.core;bundle-version="[3.12.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)"
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
index f4e1d4ae2ea..484f599f05b 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
org.eclipse.xtext.xbase.lib;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport
+ org.eclipse.emf.mwe.utils;bundle-version="[1.3.0,2.0.0)";visibility:=reexport,
+ com.google.guava;bundle-version="21.0.0"
Export-Package: org.eclipse.papyrus.mwe2.utils,
org.eclipse.papyrus.mwe2.utils.components,
org.eclipse.papyrus.mwe2.utils.messages
diff --git a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
index ed376e5fbcf..66276e05b71 100644
--- a/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
+++ b/plugins/developer/org.eclipse.papyrus.mwe2.utils/src/org/eclipse/papyrus/mwe2/utils/XtendWorkflow.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.mwe2.runtime.workflow.Workflow;
import com.google.common.collect.Lists;
+
/**
* A workflow for Xtend transformations. Primarily, it provides Xtend-compatible access to
* the collections manipulated by the inherited {@link Workflow#addBean(Object)} and
diff --git a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
index 200d6270381..d28ea9d4442 100644
--- a/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.releng.tools/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.oomph.setup.targlets;bundle-version="[1.3.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.oomph.setup.workingsets;bundle-version="[1.3.0,2.0.0)",
fr.obeo.releng.targetplatform;bundle-version="2.1.1";resolution:=optional,
org.eclipse.cbi.p2repo.aggregator;bundle-version="1.0.0",
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
index 5394f74e043..056d5172e97 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.tools/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Export-Package: org.eclipse.papyrus.infra.tools,
org.eclipse.papyrus.infra.tools.spi,
org.eclipse.papyrus.infra.tools.util
Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- com.google.guava;bundle-version="15.0.0";visibility:=reexport,
+ com.google.guava;bundle-version="21.0.0";visibility:=reexport,
org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.11.0"
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
index f3b80534b50..dab1bab3b7f 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/internal/resource/index/InternalModelIndex.java
@@ -98,7 +98,7 @@ public abstract class InternalModelIndex {
*/
protected <V> ListenableFuture<V> afterIndex(final Callable<V> callable) {
AsyncFunction<IndexManager, V> indexFunction = mgr -> mgr.afterIndex(this, callable);
- return Futures.transform(manager, indexFunction);
+ return Futures.transformAsync(manager, indexFunction);
}
/**
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
index 683640b4112..0bdc4499708 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=re
org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)",
- org.antlr.runtime;bundle-version="[3.2.0,4.0.0)"
+ org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",
+ com.google.guava;bundle-version="21.0.0"
Export-Package: org.eclipse.papyrus.infra.gmfdiag.css3,
org.eclipse.papyrus.infra.gmfdiag.css3.services,
org.eclipse.papyrus.infra.gmfdiag.css3.cSS,
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
index 0915d4b672d..b0f8bf8314c 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css3.xtext/src/org/eclipse/papyrus/infra/gmfdiag/css3/formatting2/AbstractCSSFormatter.java
@@ -24,6 +24,8 @@ import org.eclipse.xtext.formatting2.regionaccess.internal.TextRegions;
import com.google.common.collect.Lists;
+
+
/**
* Workaround for Bug 493257: Override the default behavior for postProcess()
*
diff --git a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
index 1d461d6f1a1..c21dbe7ee86 100644
--- a/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
+++ b/plugins/infra/misc/org.eclipse.papyrus.infra.sync/src/org/eclipse/papyrus/infra/sync/internal/SyncService.java
@@ -59,7 +59,7 @@ import com.google.common.util.concurrent.MoreExecutors;
*/
public class SyncService implements ISyncService {
- private static final ThreadLocal<SyncService> currentService = new ThreadLocal<SyncService>();
+ private static final ThreadLocal<SyncService> currentService = new ThreadLocal<>();
private ServicesRegistry services;
@@ -94,7 +94,7 @@ public class SyncService implements ISyncService {
public void startService() throws ServiceException {
editingDomain = ServiceUtils.getInstance().getTransactionalEditingDomain(services);
- setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.sameThreadExecutor()));
+ setAsyncExecutor(TransactionHelper.createTransactionExecutor(editingDomain, MoreExecutors.directExecutor()));
policy = new SyncServiceOperation<ISyncPolicy>(this) {
@Override
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
index 1c4c074654f..48adc46aef7 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/src/org/eclipse/papyrus/infra/ui/util/UIUtil.java
@@ -17,6 +17,7 @@ package org.eclipse.papyrus.infra.ui.util;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.LinkedList;
@@ -126,7 +127,7 @@ public class UIUtil {
* @see #createUIExecutor(Display)
*/
public static <V> Future<V> syncCall(Display display, Callable<V> callable) {
- final FutureTask<V> result = new FutureTask<V>(callable);
+ final FutureTask<V> result = new FutureTask<>(callable);
display.syncExec(result);
return result;
}
@@ -159,7 +160,7 @@ public class UIUtil {
* @see #createUIExecutor(Display)
*/
public static <V> Future<V> asyncCall(Display display, Callable<V> callable) {
- final FutureTask<V> result = new FutureTask<V>(callable);
+ final FutureTask<V> result = new FutureTask<>(callable);
display.asyncExec(result);
return result;
}
@@ -289,7 +290,7 @@ public class UIUtil {
@Override
protected Iterator<? extends Control> getChildren(Object object) {
- return (object instanceof Composite) ? Iterators.forArray(((Composite) object).getChildren()) : Iterators.<Control> emptyIterator();
+ return (object instanceof Composite) ? Iterators.forArray(((Composite) object).getChildren()) : Collections.emptyIterator();
}
};
}
@@ -318,7 +319,7 @@ public class UIUtil {
private final Condition emptyCond = lock.newCondition();
- private final Queue<RunnableWrapper> pending = new LinkedList<RunnableWrapper>();
+ private final Queue<RunnableWrapper> pending = new LinkedList<>();
private volatile boolean shutdown;
@@ -367,7 +368,7 @@ public class UIUtil {
@Override
public List<Runnable> shutdownNow() {
- List<Runnable> result = new ArrayList<Runnable>();
+ List<Runnable> result = new ArrayList<>();
shutdown();
@@ -613,7 +614,7 @@ public class UIUtil {
@Override
public <V> Future<V> submit(IProgressCallable<V> callable) {
// No place to report progress in this case
- FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+ FutureTask<V> result = new FutureTask<>(() -> callable.call(new NullProgressMonitor()));
asyncExec(result);
return result;
}
@@ -621,7 +622,7 @@ public class UIUtil {
@Override
public <V> V syncCall(IProgressCallable<V> callable) throws InterruptedException, ExecutionException {
// No place to report progress in this case
- FutureTask<V> result = new FutureTask<V>(() -> callable.call(new NullProgressMonitor()));
+ FutureTask<V> result = new FutureTask<>(() -> callable.call(new NullProgressMonitor()));
syncExec(result);
return result.get(); // It really should be completed, by now
}
diff --git a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
index b438d6d87d4..c8bc03fe579 100644
--- a/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
+++ b/plugins/team/org.eclipse.papyrus.team.svn/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.papyrus.infra.onefile;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
org.eclipse.emf.edit,
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.team.core;bundle-version="3.7.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
index 3f2e801dc0e..da7e0e7fcae 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/internal/properties/constraints/HasExternalizedProfileApplicationsConstraint.java
@@ -57,7 +57,7 @@ public class HasExternalizedProfileApplicationsConstraint extends AbstractConstr
ListenableFuture<SetMultimap<URI, URI>> appliedProfiles = DecoratorModelIndex.getInstance().getAllAppliedProfilesAsync(EcoreUtil.getURI(package_));
// Optimistic enablement for responsiveness
- result = !appliedProfiles.isDone() || !Futures.get(appliedProfiles, CoreException.class).isEmpty();
+ result = !appliedProfiles.isDone() || !Futures.getChecked(appliedProfiles, CoreException.class).isEmpty();
}
} catch (CoreException e) {
// Oh, well. I guess we won't show this property
diff --git a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
index 9b25173b560..094b9310063 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.filters/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility
org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
org.eclipse.uml2.common;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.papyrus.infra.filters.internal;x-internal:=true,
org.eclipse.papyrus.uml.filters,
diff --git a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
index 356e8dc3860..5470ea44094 100644
--- a/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
+++ b/releng/dev/targetPlatform/eclipse/org.eclipse.papyrus.dev.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1490107457">
+<target name="Papyrus Dev" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -112,15 +117,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
index f724adefebc..55f543119b8 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Dev" sequenceNumber="1490107457">
+<target name="Papyrus Dev" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -112,15 +117,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
diff --git a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
index 14dea17bfa8..2e1afc60a7c 100644
--- a/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
+++ b/releng/dev/targetPlatform/portable/org.eclipse.papyrus.dev.portable.target.tpd
@@ -18,7 +18,7 @@ location upr "http://download.eclipse.org/upr/0.9RC1/update/" {
//updateFrom("oomph",0)
-location oomph "http://download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1" {
+location oomph "http://download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4" {
org.eclipse.oomph.version.feature.group
org.eclipse.oomph.setup.workingsets.feature.group
org.eclipse.oomph.projectconfig.feature.group
diff --git a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
index 90d4ad59b50..aff647356a2 100644
--- a/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
+++ b/releng/extra-tests/targetPlatform/eclipse/org.eclipse.papyrus.extra.tests.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra Tests" sequenceNumber="1490107457">
+<target name="Papyrus Extra Tests" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
@@ -18,15 +18,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
@@ -157,7 +157,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
index b34ae460023..123e3712cdb 100644
--- a/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
+++ b/releng/extra-tests/targetPlatform/portable/org.eclipse.papyrus.extra.tests.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra Tests" sequenceNumber="1490107457">
+<target name="Papyrus Extra Tests" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group" version="0.0.0"/>
@@ -18,15 +18,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.obeo.releng.targetplatform-feature.feature.group" version="2.1.1.201410251450"/>
@@ -157,7 +157,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
index 396778729d1..2ec693d5126 100644
--- a/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
+++ b/releng/extra/targetPlatform/eclipse/org.eclipse.papyrus.extra.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1490107457">
+<target name="Papyrus Extra" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -122,7 +122,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
index cb05f418306..411c0c6bd84 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Extra" sequenceNumber="1490107457">
+<target name="Papyrus Extra" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -122,7 +122,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
index 50a4e6f3369..ee2b504cf69 100644
--- a/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
+++ b/releng/extra/targetPlatform/portable/org.eclipse.papyrus.extra.portable.target.tpd
@@ -44,7 +44,7 @@ location rmf "http://download.eclipse.org/rmf/updates/releases" {
//manualUpdate
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository" {
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
org.apache.commons.io
org.apache.commons.io.source
}
diff --git a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
index 816bdfafbad..331de4ef5b2 100644
--- a/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
+++ b/releng/main-tests/targetPlatform/eclipse/org.eclipse.papyrus.main.tests.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1490107457">
+<target name="Papyrus Tests" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -112,15 +117,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="file:/home/data/httpd/download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
diff --git a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
index 502facc4e9f..da9ab2a8658 100644
--- a/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
+++ b/releng/main-tests/targetPlatform/portable/org.eclipse.papyrus.main.tests.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Tests" sequenceNumber="1490107457">
+<target name="Papyrus Tests" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -112,15 +117,15 @@
<unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170201-1645"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170104-1401"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.7.0.v20170302-1014"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.git.feature.group" version="1.7.0.v20170104-1401"/>
<unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170104-1401"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170201-1648"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.7.0.v20170228-1751"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.7.0.v20170305-1123"/>
<unit id="org.eclipse.oomph.preferences.feature.group" version="1.7.0.v20170104-1401"/>
- <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170201-120440-1.7.0-M1"/>
+ <repository id="oomph" location="http://download.eclipse.org/oomph/drops/milestone/S20170307-122318-1.7.0-M4"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.tooling.feature.group" version="3.3.1.201509291144"/>
diff --git a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
index 892780f2155..85fc55186ed 100644
--- a/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
+++ b/releng/main/targetPlatform/eclipse/org.eclipse.papyrus.main.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1490107457">
+<target name="Papyrus Main" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="file:/home/data/httpd/download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="file:/home/data/httpd/download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
</locations>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
index 2b01fd4650b..75d445ad6ce 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Main" sequenceNumber="1490107457">
+<target name="Papyrus Main" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -91,6 +91,11 @@
<repository id="gef" location="http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="mylyn" location="http://download.eclipse.org/mylyn/drops/3.22.0/v20170124-1946"/>
</location>
</locations>
diff --git a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
index 3b896c3efaf..7cb1cb0d679 100644
--- a/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
+++ b/releng/main/targetPlatform/portable/org.eclipse.papyrus.main.portable.target.tpd
@@ -126,6 +126,13 @@ location gef "http://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.
org.eclipse.gef.feature.group
}
+//manualUpdate (Needed by infra.tools and other plugins)
+
+location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
+ com.google.guava 21.0.0
+ com.google.guava.source 21.0.0
+}
+
//Transitive dependencies
//updateFrom("Mylyn",0)
diff --git a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
index 3d529808d5d..2ab99d38a79 100644
--- a/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
+++ b/releng/rcp/targetPlatform/eclipse/org.eclipse.papyrus.rcp.eclipse.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1490107458">
+<target name="Papyrus RCP" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -97,7 +97,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="file:/home/data/httpd/download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
index 20ecb02c125..610974f8460 100644
--- a/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
+++ b/releng/rcp/targetPlatform/portable/org.eclipse.papyrus.rcp.portable.target.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus RCP" sequenceNumber="1490107458">
+<target name="Papyrus RCP" sequenceNumber="1490192428">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.7.0.v20170201-0226"/>
@@ -97,7 +97,9 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
- <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.guava.source" version="21.0.0.v20170206-1425"/>
+ <repository id="orbit" location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.eef.sdk-feature.feature.group" version="1.5.1.201601141612"/>
diff --git a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
index fcfe5d0fcd8..0bb944a131e 100644
--- a/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
+++ b/tests/framework/org.eclipse.papyrus.tests.framework/META-INF/MANIFEST.MF
@@ -34,7 +34,8 @@ Require-Bundle: org.junit;bundle-version="[4.12.0,5.0.0)";visibility:=reexport,
org.eclipse.papyrus.tests.framework.annotations;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
com.google.inject;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)"
+ org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)",
+ com.google.guava;bundle-version="21.0.0"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
Bundle-Version: 1.2.0.qualifier
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index c696f0f97c0..4b3edff14b5 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -219,7 +219,7 @@ public class BundlesTests extends AbstractPapyrusTest {
@Test
public void guavaDependencyVersionText() {
- testPapyrusDependencies2("com.google.guava", "11.0.0");//$NON-NLS-1$ //$NON-NLS-2$
+ testPapyrusDependencies2("com.google.guava", "21.0.0");//$NON-NLS-1$ //$NON-NLS-2$
}
public final static String REGEX_PACKAGE_WORD = "\\w(?:\\w|\\d)*";// match a //$NON-NLS-1$
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
index 0ab3387c0db..f827b91b90e 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/resources/manifest_project/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.papyrus.junit.utils;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="3.6.0";resolution:=optional,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.resources;visibility:=reexport
Import-Package: com.ibm.icu.text;resolution:=optional,
org.eclipse.emf.ecore;version="2.10.0"
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
index bbf4199d68b..b21b030ff26 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/src/org/eclipse/papyrus/eclipse/project/editors/tests/ManifestEditorTest.java
@@ -72,7 +72,7 @@ public class ManifestEditorTest {
assertThat(one(manifest, "org.eclipse.jface"), not(containsString(";")));
// And still just the one one Guava with its version
- assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"15.0.0\""));
+ assertThat(one(manifest, "com.google.guava"), containsString(";bundle-version=\"21.0.0\""));
}
@WithResource("manifest_project/META-INF/MANIFEST.MF")
@@ -434,7 +434,7 @@ public class ManifestEditorTest {
assertThat(manifest, hasItem(" org.eclipse.papyrus.eclipse.project.editors;bundle-version=\"[2.0.0,3.0.0)\","));
// This is now the last one (no trailing comma)
- assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"15.0.0\""));
+ assertThat(manifest, hasItem(" com.google.guava;bundle-version=\"21.0.0\""));
}
@WithResource("manifest_project/META-INF/MANIFEST.MF")
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index 1ba9ca7d298..f4e4a3a353a 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.navigator;bundle-version="3.5.0",
org.eclipse.papyrus.infra.services.validation;bundle-version="1.2.0",
org.eclipse.papyrus.uml.service.validation;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
org.eclipse.papyrus.infra.nattable;bundle-version="1.2.0",
org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
index c2eefe80cdb..8f709996fef 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.readonly.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.uml2.uml;bundle-version="5.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
index fec2a248413..4e8d7e99ffa 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.ui.emf.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.uml2.uml;bundle-version="5.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
index 779184bd316..b50b6875d07 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.gef;bundle-version="3.10.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
index 8ea57812a98..934fe3397fe 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
index 80a33aacacb..6cca8baab4e 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.junit;bundle-version="4.10.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.emf.readonly;bundle-version="1.2.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
index d7a64ad0cf3..9b4b15e1e82 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.tools.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.core.databinding;bundle-version="1.4.0",
org.eclipse.core.databinding.beans;bundle-version="1.2.0",
org.eclipse.core.databinding.property;bundle-version="1.4.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.infra.tools.databinding,
org.eclipse.papyrus.infra.tools.tests
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
index 0e985bc4e56..a477dc913e7 100644
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.ui;bundle-version="3.100.0",
org.eclipse.core.runtime;bundle-version="3.10.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
index 48b5faa5282..e8a63ac6f24 100644
--- a/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/properties/org.eclipse.papyrus.infra.properties.ui.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.junit.utils;bundle-version="2.0.0",
org.eclipse.papyrus.infra.properties.ui;bundle-version="2.0.0",
org.eclipse.uml2.uml;bundle-version="5.2.0"
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index b2f32a896ef..4dc67eee7bd 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.3.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
org.eclipse.ui.navigator;bundle-version="3.5.500",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0",
org.eclipse.papyrus.infra.emf.gmf;bundle-version="1.2.0"
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
index f2d977d579c..f220d1d9088 100644..100755
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/AbstractModelFixture.java
@@ -79,6 +79,7 @@ import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import com.google.common.io.ByteSource;
import com.google.common.io.ByteStreams;
import com.google.common.io.CharStreams;
import com.google.common.io.Resources;
@@ -453,7 +454,7 @@ public abstract class AbstractModelFixture<T extends EditingDomain> extends Test
private Map<IPath, Boolean> parseManifest(IPath baseResourcePath, URL manifestURL) throws IOException {
Map<IPath, Boolean> result = Maps.newLinkedHashMap();
- List<String> lines = CharStreams.readLines(CharStreams.newReaderSupplier(Resources.newInputStreamSupplier(manifestURL), Charsets.UTF_8));
+ List<String> lines = Resources.asByteSource(manifestURL).asCharSource(Charsets.UTF_8).readLines();
Pattern pattern = Pattern.compile("([^=]+)(?:=(true|false))?");
Matcher m = pattern.matcher("");
for (String line : lines) {
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
index deae2ec68d0..f4449f63890 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.sysml.diagram.internalblock;bundle-version="1.2.0",
org.eclipse.papyrus.sysml;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
diff --git a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
index 43f3f8bde45..6da27c68b97 100644
--- a/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/alf/org.eclipse.papyrus.uml.alf.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.m2m.qvt.oml.ocl;bundle-version="3.3.0",
org.eclipse.m2m.qvt.oml.runtime;bundle-version="3.3.0",
org.eclipse.xtend.lib,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend;bundle-version="1.4.0",
org.eclipse.emf.ecore.xmi;visibility:=reexport,
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
index 0ff7b9338da..f71f274aed6 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.assistant;bundle-version="1.2.0",
com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
org.eclipse.papyrus.uml.profile.types.generator.tests;bundle-version="1.2.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
index 5fe236277d5..b1658c00995 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator;bundle-version="1.2.0",
com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.8.0"
Export-Package: org.eclipse.papyrus.uml.profile.elementtypesconfigurations.generator.tests
Bundle-Vendor: %providerName
diff --git a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
index 810173094a6..a2abaf3d976 100644
--- a/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/assistants/org.eclipse.papyrus.uml.profile.types.generator.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
org.eclipse.papyrus.uml.profile.types.generator;bundle-version="1.2.0",
com.google.inject;bundle-version="3.0.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.8.0",
org.eclipse.papyrus.uml.diagram.usecase;bundle-version="2.0.0"
Export-Package: org.eclipse.papyrus.uml.profile.types.generator.tests
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
index 7b0ae05a10a..f77391c593c 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.2.0",
org.eclipse.papyrus.uml.decoratormodel.controlmode;bundle-version="1.2.0"
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
index 20828c11762..a1519fb1968 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.expressions;bundle-version="3.4.600",
org.eclipse.papyrus.uml.modelrepair;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.uml.decoratormodel.helper.tests,
diff --git a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
index 34a7a676372..cfc70a75d57 100644
--- a/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
+++ b/tests/junit/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.tests/src/org/eclipse/papyrus/uml/decoratormodel/internal/resource/index/tests/ProfileIndexTest.java
@@ -56,7 +56,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("testmodel.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
Set<URI> expected = ImmutableSet.of(
project.getURI("profile/profile1.profile.uml"), // an externally applied profile
@@ -70,7 +70,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("profile/profile1.profile.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
assertThat(profileURIs, is(Collections.singleton(URI.createURI(UMLResource.ECORE_PROFILE_URI))));
}
@@ -80,7 +80,7 @@ public class ProfileIndexTest {
IProfileIndex index = registry.getService(IProfileIndex.class);
ListenableFuture<Set<URI>> futureProfileURIs = index.getAppliedProfiles(project.getURI("package2.decorator.uml"));
- Set<URI> profileURIs = trimFragments(Futures.get(futureProfileURIs, 1L, TimeUnit.MINUTES, ServiceException.class));
+ Set<URI> profileURIs = trimFragments(Futures.getChecked(futureProfileURIs, ServiceException.class, 1L, TimeUnit.MINUTES));
Set<URI> expected = Collections.emptySet(); // We don't index these as user models, but as decorators only
assertThat(profileURIs, is(expected));
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
index ac00546810f..466e4546913 100755
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions,
org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
org.eclipse.xtend.lib;bundle-version="2.8.3",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",
org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
index 4e70533875e..eeaf06cf538 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
@@ -27,7 +27,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.eclipse.xtext.xbase.lib,
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.2.0",
org.eclipse.papyrus.infra.gmfdiag.css.properties;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index fc58b7201c0..f27f34c785e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
org.eclipse.ui.ide;bundle-version="3.8.1",
org.eclipse.jface;bundle-version="3.8.101",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
org.eclipse.core.resources,
diff --git a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
index 4184b7ea145..f71bfa5b082 100644
--- a/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.papyrus.uml.profile.drafter;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.uml2.uml;bundle-version="4.0.0",
org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.core.databinding,
org.eclipse.core.databinding.beans,
org.eclipse.core.databinding.observable,
diff --git a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
index 1ac1d3e65bd..b0209208a36 100644
--- a/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/tools/org.eclipse.papyrus.uml.tools.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0",
org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- com.google.guava;bundle-version="15.0.0",
+ com.google.guava;bundle-version="21.0.0",
org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
org.eclipse.jface.text;bundle-version="3.10.0",
org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"

Back to the top