diff --git a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
index 50d33d8..21cf06b 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
+++ b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/META-INF/MANIFEST.MF
@@ -38,9 +38,9 @@
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="2.1.0",
  org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)",
+Import-Package: com.google.common.base;version="[27.0.0,31.0.0)",
+ com.google.common.collect;version="[27.0.0,31.0.0)",
+ com.google.common.io;version="[27.0.0,31.0.0)",
  org.apache.log4j;version="1.2.15"
 Export-Package: org.eclipse.papyrus.compare.diagram.ide.ui.comparesource,
  org.eclipse.papyrus.compare.diagram.ide.ui.dependency,
diff --git a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
index da4027e..164a42e 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
+++ b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/contentmergeviewer/facet/PapyrusFacetContentProviderWrapper.java
@@ -236,8 +236,12 @@
 			}
 
 			URI uri = resource.getURI();
+			if (uri == null) {
+				return false;
+			}
+			final String extension = uri.fileExtension();
 			// check beginning of file extension instead of equals
-			return uri != null && uri.fileExtension().startsWith(UMLResource.FILE_EXTENSION);
+			return extension != null && extension.startsWith(UMLResource.FILE_EXTENSION);
 		}
 	}
 
diff --git a/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
index 9cbf8f8..36e7b00 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
+++ b/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@
  org.eclipse.gmf.runtime.notation;bundle-version="1.8.0",
  org.eclipse.papyrus.infra.core;bundle-version="0.9.1"
 Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,31.0.0)",
+ com.google.common.collect;version="[27.0.0,31.0.0)"
 Bundle-Activator: org.eclipse.papyrus.compare.diagram.internal.CompareDiagramPapyrusPlugin
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.papyrus.compare.diagram,
diff --git a/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
index 05277d5..881c12b 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
+++ b/compare/bundles/org.eclipse.papyrus.compare.uml2.edit/META-INF/MANIFEST.MF
@@ -21,8 +21,8 @@
  org.eclipse.papyrus.compare.uml2;bundle-version="[2.5.1,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
+Import-Package: com.google.common.base;version="[27.0.0,31.0.0)",
+ com.google.common.collect;version="[27.0.0,31.0.0)",
  org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet
 Bundle-Localization: plugin
 Export-Package: org.eclipse.papyrus.compare.uml2.edit,
diff --git a/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
index 913e8f9..e07c3cc 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
+++ b/compare/bundles/org.eclipse.papyrus.compare.uml2/META-INF/MANIFEST.MF
@@ -25,8 +25,8 @@
  org.eclipse.papyrus.compare.uml2.internal.hook;x-internal:=true,
  org.eclipse.papyrus.compare.uml2.internal.hook.migration;x-internal:=true,
  org.eclipse.papyrus.compare.uml2.internal.postprocessor;x-friends:="org.eclipse.papyrus.compare.uml2.edit"
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,31.0.0)",
+ com.google.common.collect;version="[27.0.0,31.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.papyrus.compare.uml2.internal.UMLPapyrusComparePlugin
 Automatic-Module-Name: org.eclipse.papyrus.compare.uml2
diff --git a/compare/targetplatforms/compare-nightly.target b/compare/targetplatforms/compare-nightly.target
index 1f66fa4..70ff577 100644
--- a/compare/targetplatforms/compare-nightly.target
+++ b/compare/targetplatforms/compare-nightly.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Nightly" sequenceNumber="1584715796">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1617119355">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.draw2d" version="0.0.0"/>
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
+      <repository id="eclipse-2021-03" location="http://download.eclipse.org/releases/2021-03/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
@@ -31,8 +31,8 @@
       <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
-      <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
+      <unit id="org.eclipse.xwt.feature.feature.group" version="1.6.0.202011091434"/>
+      <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
@@ -47,8 +47,8 @@
       <unit id="org.apache.commons.io" version="0.0.0"/>
       <unit id="org.apache.commons.io.source" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
-      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
-      <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
       <unit id="javaewah" version="0.0.0"/>
       <unit id="org.apache.commons.compress" version="0.0.0"/>
       <unit id="org.apache.commons.lang" version="0.0.0"/>
@@ -59,7 +59,7 @@
       <unit id="org.hamcrest.integration" version="0.0.0"/>
       <unit id="org.hamcrest.text" version="0.0.0"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210223232630/repository/"/>
     </location>
   </locations>
 </target>
diff --git a/compare/targetplatforms/compare-nightly.tpd b/compare/targetplatforms/compare-nightly.tpd
index 0a5299d..8ea99c1 100755
--- a/compare/targetplatforms/compare-nightly.tpd
+++ b/compare/targetplatforms/compare-nightly.tpd
@@ -1,6 +1,6 @@
 target "Compare Target Platform - Nightly" with source requirements
 
-location "http://download.eclipse.org/releases/2020-03/" eclipse-2020-03 {
+location "http://download.eclipse.org/releases/2021-03/" eclipse-2021-03 {
 	org.eclipse.draw2d lazy
 	org.eclipse.gef lazy
 	org.eclipse.ocl.core.sdk.feature.group lazy
@@ -31,7 +31,7 @@
 	org.eclipse.papyrus.views.properties.toolsmiths lazy
 }
 
-location xwt "http://download.eclipse.org/xwt/updates" {
+location xwt "https://download.eclipse.org/xwt/milestones-1.6.0/1.6.0-M2/" {
 	org.eclipse.xwt.feature.feature.group [1.3.1,2.0.0)
 }
 
@@ -48,12 +48,12 @@
 	org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
 }
 
-location  "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" orbit{
+location  "https://download.eclipse.org/tools/orbit/downloads/drops/S20210223232630/repository/" orbit{
 	org.apache.commons.io lazy
 	org.apache.commons.io.source lazy
 	com.google.inject lazy
-	com.google.guava [27.0.0,28.0.0)
-	com.google.guava.source [27.0.0,28.0.0)
+	com.google.guava [30.1.0,31.0.0)
+	com.google.guava.source [30.1.0,31.0.0)
 	/* Egit/Jgit */
 	javaewah lazy
 	org.apache.commons.compress lazy
diff --git a/compare/targetplatforms/compare-previous-release.target b/compare/targetplatforms/compare-previous-release.target
index 70cf787..c04c0d3 100644
--- a/compare/targetplatforms/compare-previous-release.target
+++ b/compare/targetplatforms/compare-previous-release.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Release" sequenceNumber="1584733438">
+<target name="Compare Target Platform - Release" sequenceNumber="1617114048">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.14.0.v20191210-0610"/>
@@ -54,7 +54,7 @@
       <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
       <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" 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.papyrus.sdk.feature.feature.group" version="4.6.0.201912110926"/>
diff --git a/compare/targetplatforms/compare-previous-release.tpd b/compare/targetplatforms/compare-previous-release.tpd
index 8de2e41..39d580b 100755
--- a/compare/targetplatforms/compare-previous-release.tpd
+++ b/compare/targetplatforms/compare-previous-release.tpd
@@ -36,7 +36,7 @@
 }
 
 //manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository" {
 	org.apache.commons.io
 	org.apache.commons.io.source
 	com.google.inject
diff --git a/compare/targetplatforms/compare-release.target b/compare/targetplatforms/compare-release.target
index f7a26fc..b9d8818 100644
--- a/compare/targetplatforms/compare-release.target
+++ b/compare/targetplatforms/compare-release.target
@@ -1,67 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Release" sequenceNumber="1584715798">
+<target name="Compare Target Platform - Release" sequenceNumber="1617117718">
   <locations>
     <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.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d" version="0.0.0"/>
-      <unit id="org.eclipse.gef" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191209-1226"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.400.v20200604-0540"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.600.v20200521-1852"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.800.v20200514-1529"/>
+      <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+      <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.22.0.v20200324-0723"/>
       <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.1.201812070911"/>
       <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/>
       <unit id="org.eclipse.emf.workspace.feature.group" version="1.12.0.201805140824"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
       <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
-      <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
+      <repository id="eclipse-2020-06" location="http://download.eclipse.org/releases/2020-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.7.0.202003110725-r"/>
-      <unit id="org.eclipse.jgit.feature.group" version="5.7.0.202003110725-r"/>
-      <unit id="org.eclipse.jgit.http.apache.feature.group" version="5.7.0.202003110725-r"/>
-      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.7"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.8.0.202006091008-r"/>
+      <unit id="org.eclipse.jgit.feature.group" version="5.8.0.202006091008-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="5.8.0.202006091008-r"/>
+      <repository id="egit-5.8" location="http://download.eclipse.org/egit/updates-5.8"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.9.201911051515"/>
-      <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.11.202005260905"/>
+      <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202005260905/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
-      <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
-      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+      <unit id="org.apache.commons.io.source" version="2.6.0.v20190123-2029"/>
+      <unit id="com.google.inject" version="3.0.0.v201605172100"/>
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
-      <unit id="javaewah" version="0.0.0"/>
-      <unit id="org.apache.commons.compress" version="0.0.0"/>
-      <unit id="org.apache.commons.lang" version="0.0.0"/>
-      <unit id="org.kohsuke.args4j" version="0.0.0"/>
+      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
+      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <unit id="org.hamcrest.integration" version="0.0.0"/>
-      <unit id="org.hamcrest.text" version="0.0.0"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.7.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.202003111206"/>
-      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.8.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.202006100855"/>
+      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06"/>
     </location>
   </locations>
 </target>
diff --git a/compare/targetplatforms/compare-release.tpd b/compare/targetplatforms/compare-release.tpd
index 008ba92..9125e04 100755
--- a/compare/targetplatforms/compare-release.tpd
+++ b/compare/targetplatforms/compare-release.tpd
@@ -1,6 +1,6 @@
 target "Compare Target Platform - Release" with source requirements
 
-location "http://download.eclipse.org/releases/2020-03/" eclipse-2020-03 {
+location "http://download.eclipse.org/releases/2020-06/" eclipse-2020-06 {
 	org.eclipse.platform.feature.group
 	org.eclipse.sdk.feature.group
 	org.eclipse.rcp.feature.group
@@ -20,13 +20,13 @@
 	org.eclipse.uml2.sdk.feature.group
 }
 
-location "http://download.eclipse.org/egit/updates-5.7" egit {
+location "http://download.eclipse.org/egit/updates-5.8" egit-5.8 {
 	org.eclipse.egit.feature.group
 	org.eclipse.jgit.feature.group
 	org.eclipse.jgit.http.apache.feature.group
 }
 
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202005260905/" {
 	org.eclipse.emf.compare.source.feature.group [3.3.5,4.0.0)
 	org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.5,4.0.0)
 	org.eclipse.emf.compare.uml2.source.feature.group [3.3.5,4.0.0)
@@ -36,7 +36,7 @@
 }
 
 //manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/" {
 	org.apache.commons.io
 	org.apache.commons.io.source
 	com.google.inject
@@ -55,7 +55,7 @@
 	org.objenesis [1.0.0,2.0.0)
 }
 
-location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03" {
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06" {
 	org.eclipse.papyrus.sdk.feature.feature.group
 	org.eclipse.papyrus.infra.gmfdiag.feature.feature.group
 	org.eclipse.papyrus.infra.services.feature.feature.group
diff --git a/compare/targetplatforms/compare.tests-nightly.target b/compare/targetplatforms/compare.tests-nightly.target
index 5f958af..f6982ed 100644
--- a/compare/targetplatforms/compare.tests-nightly.target
+++ b/compare/targetplatforms/compare.tests-nightly.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1584715796">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1617117085">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.draw2d" version="0.0.0"/>
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
+      <repository id="eclipse-2021-03" location="http://download.eclipse.org/releases/2021-03/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
@@ -31,15 +31,11 @@
       <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.xwt.feature.feature.group" version="1.3.1.I20171018-2059"/>
-      <repository id="xwt" location="http://download.eclipse.org/xwt/updates"/>
-    </location>
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.commons.io" version="0.0.0"/>
       <unit id="org.apache.commons.io.source" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
-      <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
-      <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
+      <unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
+      <unit id="com.google.guava.source" version="30.1.0.v20210127-2300"/>
       <unit id="javaewah" version="0.0.0"/>
       <unit id="org.apache.commons.compress" version="0.0.0"/>
       <unit id="org.apache.commons.lang" version="0.0.0"/>
@@ -50,7 +46,7 @@
       <unit id="org.hamcrest.integration" version="0.0.0"/>
       <unit id="org.hamcrest.text" version="0.0.0"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/S20210223232630/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="1.3.200"/>
diff --git a/compare/targetplatforms/compare.tests-previous-release.target b/compare/targetplatforms/compare.tests-previous-release.target
index 31a54af..9da6056 100644
--- a/compare/targetplatforms/compare.tests-previous-release.target
+++ b/compare/targetplatforms/compare.tests-previous-release.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Previous Release, Tests" sequenceNumber="1584733446">
+<target name="Compare Target Platform - Previous Release, Tests" sequenceNumber="1617114066">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.14.0.v20191210-0610"/>
@@ -45,7 +45,7 @@
       <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
       <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" 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.papyrus.sdk.feature.feature.group" version="4.6.0.201912110926"/>
diff --git a/compare/targetplatforms/compare.tests-release.target b/compare/targetplatforms/compare.tests-release.target
index 2ffbaff..f5ace98 100644
--- a/compare/targetplatforms/compare.tests-release.target
+++ b/compare/targetplatforms/compare.tests-release.target
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Compare Target Platform - Release, Tests" sequenceNumber="1584715802">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1617183189">
   <locations>
     <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.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.draw2d" version="0.0.0"/>
-      <unit id="org.eclipse.gef" version="0.0.0"/>
-      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.1.v20191209-1226"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.rcp.feature.group" version="4.16.0.v20200604-0951"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.400.v20200604-0540"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.600.v20200521-1852"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.800.v20200514-1529"/>
+      <unit id="org.eclipse.draw2d" version="3.10.100.201606061308"/>
+      <unit id="org.eclipse.gef" version="3.11.0.201606061308"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="2.22.0.v20200324-0723"/>
       <unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.1.201812070911"/>
       <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.12.0.201805140824"/>
       <unit id="org.eclipse.emf.workspace.feature.group" version="1.12.0.201805140824"/>
-      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.12.0.201805221301"/>
-      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
       <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.1.v20200302-1312"/>
-      <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
+      <repository id="eclipse-2020-06" location="http://download.eclipse.org/releases/2020-06/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.egit.feature.group" version="5.7.0.202003110725-r"/>
-      <unit id="org.eclipse.jgit.feature.group" version="5.7.0.202003110725-r"/>
-      <unit id="org.eclipse.jgit.http.apache.feature.group" version="5.7.0.202003110725-r"/>
-      <repository id="egit" location="http://download.eclipse.org/egit/updates-5.7"/>
+      <unit id="org.eclipse.egit.feature.group" version="5.8.0.202006091008-r"/>
+      <unit id="org.eclipse.jgit.feature.group" version="5.8.0.202006091008-r"/>
+      <unit id="org.eclipse.jgit.http.apache.feature.group" version="5.8.0.202006091008-r"/>
+      <repository id="egit-5.8" location="http://download.eclipse.org/egit/updates-5.8"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="2.0.1.v201105210651"/>
-      <unit id="org.apache.commons.io.source" version="2.0.1.v201105210651"/>
-      <unit id="com.google.inject" version="0.0.0"/>
+      <unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
+      <unit id="org.apache.commons.io.source" version="2.6.0.v20190123-2029"/>
+      <unit id="com.google.inject" version="3.0.0.v201605172100"/>
       <unit id="com.google.guava" version="27.1.0.v20190517-1946"/>
       <unit id="com.google.guava.source" version="27.1.0.v20190517-1946"/>
-      <unit id="javaewah" version="0.0.0"/>
-      <unit id="org.apache.commons.compress" version="0.0.0"/>
-      <unit id="org.apache.commons.lang" version="0.0.0"/>
-      <unit id="org.kohsuke.args4j" version="0.0.0"/>
+      <unit id="javaewah" version="1.1.7.v20200107-0831"/>
+      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+      <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/>
       <unit id="org.mockito" version="1.9.5.v201605172210"/>
-      <unit id="org.hamcrest" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <unit id="org.hamcrest.integration" version="0.0.0"/>
-      <unit id="org.hamcrest.text" version="0.0.0"/>
+      <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+      <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
+      <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
       <unit id="org.objenesis" version="1.0.0.v201505121915"/>
-      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.7.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.202003111106"/>
-      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.202003111206"/>
-      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03"/>
+      <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.8.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.202006100749"/>
+      <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.202006100855"/>
+      <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-06"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="1.3.200"/>
       <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.2.201911051515"/>
-      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.9.201911051515"/>
-      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.9.201911051515"/>
-      <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/"/>
+      <unit id="org.eclipse.emf.compare.tests.source.feature.group" version="3.5.2.202005260905"/>
+      <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.11.202005260905"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.11.202005260905"/>
+      <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202005260905/"/>
     </location>
   </locations>
 </target>
diff --git a/compare/targetplatforms/compare.tests-release.tpd b/compare/targetplatforms/compare.tests-release.tpd
index b196c4f..087c78a 100755
--- a/compare/targetplatforms/compare.tests-release.tpd
+++ b/compare/targetplatforms/compare.tests-release.tpd
@@ -7,6 +7,6 @@
 	org.eclipse.papyrus.sysml14.feature.feature.group [1.3.0,2.0.0)
 }
 
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R202005260905/" {
 	org.eclipse.emf.compare.tests.source.feature.group [3.5.1,4.0.0)
 }
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
index 054d0b6..7280ba3 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Fragment-Host: org.eclipse.papyrus.compare.diagram.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.emf.compare.egit;bundle-version="1.1.0",
  org.eclipse.jgit;bundle-version="4.1.0",
  org.eclipse.egit.core;bundle-version="4.1.0",
@@ -21,6 +21,7 @@
  org.mockito;bundle-version="1.8.0",
  org.hamcrest;bundle-version="1.1.0",
  org.eclipse.emf.common;bundle-version="2.11.0",
- org.eclipse.papyrus.compare.uml2;bundle-version="2.5.1"
+ org.eclipse.papyrus.compare.uml2;bundle-version="2.5.1",
+ javax.annotation;bundle-version="1.2.0"
 Import-Package: org.eclipse.emf.compare.ide.ui.tests
 Automatic-Module-Name: org.eclipse.papyrus.compare.diagram.tests.git
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
index 4c102ef..96bde11 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/AbstractGitMergeTestCase.java
@@ -24,12 +24,14 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.channels.FileChannel;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.mapping.IModelProviderDescriptor;
 import org.eclipse.core.resources.mapping.ModelProvider;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -106,6 +108,8 @@
 		}
 	};
 
+	private static final int MAX_ATTEMPTS = 3;
+
 	protected static String defaultResolutionScope;
 
 	protected GitTestRepository repository;
@@ -208,11 +212,25 @@
 		final TestProject testProject1 = new TestProject(DEFAULT_PROJECT, workingDirectory.getAbsolutePath());
 		final IProject iProject = testProject1.getProject();
 		final File projectDirectory = new File(iProject.getLocation().toOSString());
-		repository.connect(iProject);
+		connectToRepository(iProject);
+
 		copyDirectoryContents(rootDirectory, projectDirectory);
 		repository.addAllAndCommit(commitMsg, true);
 	}
 
+	private void connectToRepository(final IProject iProject) throws Exception {
+		for (int i = 0; i < MAX_ATTEMPTS; i++) {
+			try {
+				repository.connect(iProject);
+				return;
+			} catch (CoreException e) {
+				// wait for a couple of mil
+				e.printStackTrace();
+				TimeUnit.MILLISECONDS.sleep(200);
+			}
+		}
+	}
+
 	private static void copyDirectoryContents(File rootDirectory, final File workingDirectory)
 			throws IOException {
 		String[] list = rootDirectory.list();
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
index 6c352d2..5fb650d 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests/META-INF/MANIFEST.MF
@@ -46,13 +46,14 @@
  org.eclipse.papyrus.uml.diagram.component;bundle-version="3.0.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="2.1.0",
  org.eclipse.papyrus.infra.architecture.representation;bundle-version="1.0.0",
- org.eclipse.papyrus.infra.gmfdiag.css
+ org.eclipse.papyrus.infra.gmfdiag.css,
+ javax.annotation;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %providerName
-Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
- com.google.common.collect;version="[27.0.0,28.0.0)",
- com.google.common.eventbus;version="[27.0.0,28.0.0)",
- com.google.common.io;version="[27.0.0,28.0.0)",
+Import-Package: com.google.common.base;version="[27.0.0,31.0.0)",
+ com.google.common.collect;version="[27.0.0,31.0.0)",
+ com.google.common.eventbus;version="[27.0.0,31.0.0)",
+ com.google.common.io;version="[27.0.0,31.0.0)",
  org.eclipse.papyrus.infra.core.sashwindows.di,
  org.eclipse.papyrus.infra.core.sashwindows.di.util
 Export-Package: org.eclipse.papyrus.compare.diagram.tests,
diff --git a/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
index 011d215..7b399fc 100644
--- a/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
+++ b/compare/tests/org.eclipse.papyrus.compare.uml2.tests/META-INF/MANIFEST.MF
@@ -23,16 +23,17 @@
  org.junit,
  org.eclipse.emf.compare,
  org.eclipse.emf.compare.uml2,
- org.eclipse.emf.compare.tests;bundle-version="2.0.1",
+ org.eclipse.emf.compare.tests;bundle-version="3.5.3",
  org.eclipse.uml2.uml.edit;bundle-version="5.0.0";visibility:=reexport,
  org.eclipse.uml2.common.edit;visibility:=reexport,
  org.eclipse.emf.compare.uml2.edit,
  org.eclipse.emf.compare.edit,
- org.eclipse.emf.compare.ide.ui.tests.framework,
+ org.eclipse.emf.compare.ide.ui.tests.framework;bundle-version="1.0.1",
  org.eclipse.emf.compare.ide;bundle-version="3.3.0",
  org.eclipse.papyrus.compare.uml2,
  org.eclipse.papyrus.infra.core,
  org.eclipse.papyrus.uml.modelrepair;bundle-version="2.0.0",
- com.google.guava;bundle-version="[27.0.0,28.0.0)"
+ com.google.guava;bundle-version="[27.0.0,31.0.0)",
+ javax.annotation;bundle-version="1.2.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.papyrus.compare.uml2.tests