Upgrade Papyrus Compare to recent Eclipse, Papyrus, EMF Compare
Change-Id: I6e480784eb07c5e3cda1c059fe7be2c283e73c61
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 b36b140..50d33d8 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
@@ -37,10 +37,10 @@
org.eclipse.papyrus.infra.architecture;bundle-version="1.0.0",
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.7
-Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
- com.google.common.collect;version="[15.0.0,22.0.0)",
- com.google.common.io;version="[15.0.0,22.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)",
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/META-INF/MANIFEST.MF b/compare/bundles/org.eclipse.papyrus.compare.diagram/META-INF/MANIFEST.MF
index f94e816..9cbf8f8 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
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.compare.diagram;singleton:=true
Bundle-Version: 2.6.2.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
org.eclipse.emf.compare.rcp;bundle-version="2.3.0",
org.eclipse.emf.compare;bundle-version="3.2.0",
@@ -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="[15.0.0,22.0.0)",
- com.google.common.collect;version="[15.0.0,22.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
+ com.google.common.collect;version="[27.0.0,28.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 9e4b354..05277d5 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
@@ -19,10 +19,10 @@
org.eclipse.papyrus.uml.tools,
org.eclipse.papyrus.compare.diagram.ide.ui,
org.eclipse.papyrus.compare.uml2;bundle-version="[2.5.1,3.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
-Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
- com.google.common.collect;version="[15.0.0,22.0.0)",
+Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
+ com.google.common.collect;version="[27.0.0,28.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 1754dde..913e8f9 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
@@ -6,7 +6,7 @@
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.uml.modelrepair;bundle-version="[1.0.2,3.0.0)",
org.eclipse.papyrus.uml.tools;bundle-version="[1.0.2,5.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[1.0.2,4.0.0)",
@@ -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="[15.0.0,22.0.0)",
- com.google.common.collect;version="[15.0.0,22.0.0)"
+Import-Package: com.google.common.base;version="[27.0.0,28.0.0)",
+ com.google.common.collect;version="[27.0.0,28.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 30345e3..1f66fa4 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="1566394770">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1584715796">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.draw2d" version="0.0.0"/>
@@ -17,11 +17,12 @@
<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-2019-09" location="http://download.eclipse.org/staging/2019-09/"/>
+ <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -58,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/R20190602212107/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
</location>
</locations>
</target>
diff --git a/compare/targetplatforms/compare-nightly.tpd b/compare/targetplatforms/compare-nightly.tpd
index 8abffef..0a5299d 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/staging/2019-09/" eclipse-2019-09 {
+location "http://download.eclipse.org/releases/2020-03/" eclipse-2020-03 {
org.eclipse.draw2d lazy
org.eclipse.gef lazy
org.eclipse.ocl.core.sdk.feature.group lazy
@@ -23,6 +23,7 @@
location "http://download.eclipse.org/egit/updates" EGit {
org.eclipse.egit.feature.group lazy
org.eclipse.jgit.feature.group lazy
+ org.eclipse.jgit.http.apache.feature.group lazy
}
location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master" {
@@ -47,7 +48,7 @@
org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
}
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/" orbit{
+location "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" orbit{
org.apache.commons.io lazy
org.apache.commons.io.source lazy
com.google.inject lazy
diff --git a/compare/targetplatforms/compare-previous-release.target b/compare/targetplatforms/compare-previous-release.target
index 94bb809..70cf787 100644
--- a/compare/targetplatforms/compare-previous-release.target
+++ b/compare/targetplatforms/compare-previous-release.target
@@ -1,41 +1,42 @@
<?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" sequenceNumber="1566394783">
+<target name="Compare Target Platform - Release" sequenceNumber="1584733438">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.11.0.v20190307-0943"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.17.0.v20190307-0500"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.200.v20190129-1112"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.300.v20190213-1655"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.200.v20191210-0610"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.400.v20191014-1907"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/>
<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.9.2.v20190313-0834"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.17.0.v20190301-1325"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.17.0.v20181220-0942"/>
+ <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="2.20.0.v20191028-0905"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.20.0.v20191117-1035"/>
<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.0.201806010809"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="eclipse-2019-03" location="http://download.eclipse.org/releases/2019-03/"/>
+ <repository id="eclipse-2019-12" location="http://download.eclipse.org/releases/2019-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.3.0.201903130848-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.3.0.201903130848-r"/>
- <repository id="egit" location="https://download.eclipse.org/egit/updates-5.3/"/>
+ <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"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.6.201903050300"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201903050300/"/>
+ <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/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
@@ -43,8 +44,8 @@
<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="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+ <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"/>
@@ -53,14 +54,14 @@
<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="http://download.eclipse.org/tools/orbit/downloads/drops/R20190528213420/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.3.0.201903131008"/>
- <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201903131008"/>
- <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201903131008"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201903131058"/>
- <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.6.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.201912111049"/>
+ <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12"/>
</location>
</locations>
</target>
diff --git a/compare/targetplatforms/compare-previous-release.tpd b/compare/targetplatforms/compare-previous-release.tpd
index 91efabc..8de2e41 100755
--- a/compare/targetplatforms/compare-previous-release.tpd
+++ b/compare/targetplatforms/compare-previous-release.tpd
@@ -1,6 +1,6 @@
-target "Compare Target Platform - Previous Release" with source requirements
+target "Compare Target Platform - Release" with source requirements
-location eclipse-2019-03 "http://download.eclipse.org/releases/2019-03/" {
+location "http://download.eclipse.org/releases/2019-12/" eclipse-2019-12 {
org.eclipse.platform.feature.group
org.eclipse.sdk.feature.group
org.eclipse.rcp.feature.group
@@ -20,22 +20,23 @@
org.eclipse.uml2.sdk.feature.group
}
-location "https://download.eclipse.org/egit/updates-5.3/" egit {
+location "http://download.eclipse.org/egit/updates-5.7" egit {
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/R201903050300/" {
- org.eclipse.emf.compare.source.feature.group [3.3.3,4.0.0)
- org.eclipse.emf.compare.diagram.gmf.source.feature.group [3.3.3,4.0.0)
- org.eclipse.emf.compare.uml2.source.feature.group [3.3.3,4.0.0)
- org.eclipse.emf.compare.egit.source.feature.group [3.3.4,4.0.0)
- org.eclipse.emf.compare.ide.ui.source.feature.group [3.3.3,4.0.0)
- org.eclipse.emf.compare.rcp.ui.source.feature.group [3.3.3,4.0.0)
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
+ 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)
+ org.eclipse.emf.compare.egit.source.feature.group [3.3.5,4.0.0)
+ org.eclipse.emf.compare.ide.ui.source.feature.group [3.3.5,4.0.0)
+ org.eclipse.emf.compare.rcp.ui.source.feature.group [3.3.5,4.0.0)
}
//manualUpdate
-location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20190528213420/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" {
org.apache.commons.io
org.apache.commons.io.source
com.google.inject
@@ -54,7 +55,7 @@
org.objenesis [1.0.0,2.0.0)
}
-location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03" {
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12" {
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-release.target b/compare/targetplatforms/compare-release.target
index 9e83991..f7a26fc 100644
--- a/compare/targetplatforms/compare-release.target
+++ b/compare/targetplatforms/compare-release.target
@@ -1,66 +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="1566394799">
+<target name="Compare Target Platform - Release" sequenceNumber="1584715798">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.18.0.v20190605-1800"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.200.v20190129-1112"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.400.v20190515-0925"/>
- <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.9.3.v20190610-0948"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.18.0.v20190528-0845"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.18.0.v20190323-1100"/>
+ <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.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.1.201905141505"/>
- <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="eclipse-2019-06" location="http://download.eclipse.org/releases/2019-06/"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+ <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/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.4.0.201906121030-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.4.0.201906121030-r"/>
- <repository id="egit" location="http://download.eclipse.org/egit/updates-5.4"/>
+ <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"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.7.201905300200"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201905300200/"/>
+ <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/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <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="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="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="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+ <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="2.33.0.v20160323-2218"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
- <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
+ <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.objenesis" version="1.0.0.v201505121915"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20190602181010/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.4.0.201906121718"/>
- <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201906121718"/>
- <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201906121718"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201906121827"/>
- <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06"/>
+ <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"/>
</location>
</locations>
</target>
diff --git a/compare/targetplatforms/compare-release.tpd b/compare/targetplatforms/compare-release.tpd
index 65138c3..008ba92 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/2019-06/" eclipse-2019-06 {
+location "http://download.eclipse.org/releases/2020-03/" eclipse-2020-03 {
org.eclipse.platform.feature.group
org.eclipse.sdk.feature.group
org.eclipse.rcp.feature.group
@@ -20,12 +20,13 @@
org.eclipse.uml2.sdk.feature.group
}
-location "http://download.eclipse.org/egit/updates-5.4" egit {
+location "http://download.eclipse.org/egit/updates-5.7" egit {
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/R201905300200/" {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
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)
@@ -35,7 +36,7 @@
}
//manualUpdate
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20190602181010/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/" {
org.apache.commons.io
org.apache.commons.io.source
com.google.inject
@@ -54,7 +55,7 @@
org.objenesis [1.0.0,2.0.0)
}
-location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06" {
+location papyrus "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2020-03" {
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 34a5b72..5f958af 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="1566386751">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1584715796">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.draw2d" version="0.0.0"/>
@@ -17,11 +17,12 @@
<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-2019-09" location="http://download.eclipse.org/staging/2019-09/"/>
+ <repository id="eclipse-2020-03" location="http://download.eclipse.org/releases/2020-03/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jgit.http.apache.feature.group" version="0.0.0"/>
<repository id="EGit" location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
@@ -49,7 +50,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/R20190602212107/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/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 e8e6c0a..31a54af 100644
--- a/compare/targetplatforms/compare.tests-previous-release.target
+++ b/compare/targetplatforms/compare.tests-previous-release.target
@@ -1,32 +1,33 @@
<?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="1566394815">
+<target name="Compare Target Platform - Previous Release, Tests" sequenceNumber="1584733446">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.11.0.v20190307-0943"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.17.0.v20190307-0500"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.200.v20190129-1112"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.300.v20190213-1655"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.14.0.v20191210-0610"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.200.v20191210-0610"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.400.v20191014-1907"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.600.v20191014-2025"/>
<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.9.2.v20190313-0834"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.17.0.v20190301-1325"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.17.0.v20181220-0942"/>
+ <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="2.20.0.v20191028-0905"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.20.0.v20191117-1035"/>
<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.0.201806010809"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="eclipse-2019-03" location="http://download.eclipse.org/releases/2019-03/"/>
+ <repository id="eclipse-2019-12" location="http://download.eclipse.org/releases/2019-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.3.0.201903130848-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.3.0.201903130848-r"/>
- <repository id="egit" location="https://download.eclipse.org/egit/updates-5.3/"/>
+ <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"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.commons.io" version="2.6.0.v20190123-2029"/>
@@ -34,8 +35,8 @@
<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="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+ <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"/>
@@ -44,28 +45,28 @@
<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="http://download.eclipse.org/tools/orbit/downloads/drops/R20190528213420/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.3.0.201903131008"/>
- <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201903131008"/>
- <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201903131008"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201903131058"/>
- <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.6.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201912110926"/>
+ <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.1.0.201912111049"/>
+ <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-12"/>
</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.201903050300"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.6.201903050300"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.6.201903050300"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201903050300/"/>
+ <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/"/>
</location>
</locations>
</target>
diff --git a/compare/targetplatforms/compare.tests-previous-release.tpd b/compare/targetplatforms/compare.tests-previous-release.tpd
index e6b27c7..6c7a803 100755
--- a/compare/targetplatforms/compare.tests-previous-release.tpd
+++ b/compare/targetplatforms/compare.tests-previous-release.tpd
@@ -7,6 +7,6 @@
org.eclipse.papyrus.sysml14.feature.feature.group [1.3.1,2.0.0)
}
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201903050300/" {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
org.eclipse.emf.compare.tests.source.feature.group [3.5.1,4.0.0)
}
diff --git a/compare/targetplatforms/compare.tests-release.target b/compare/targetplatforms/compare.tests-release.target
index 412490f..2ffbaff 100644
--- a/compare/targetplatforms/compare.tests-release.target
+++ b/compare/targetplatforms/compare.tests-release.target
@@ -1,71 +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="1566394822">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1584715802">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.12.0.v20190605-1801"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.18.0.v20190605-1800"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.2.200.v20190129-1112"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.400.v20190515-0925"/>
- <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.9.3.v20190610-0948"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.18.0.v20190528-0845"/>
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.18.0.v20190323-1100"/>
+ <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.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.1.201905141505"/>
- <unit id="org.eclipse.uml2.sdk.feature.group" version="5.5.0.v20181203-1331"/>
- <repository id="eclipse-2019-06" location="http://download.eclipse.org/releases/2019-06/"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.12.2.201912020813"/>
+ <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/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="5.4.0.201906121030-r"/>
- <unit id="org.eclipse.jgit.feature.group" version="5.4.0.201906121030-r"/>
- <repository id="egit" location="http://download.eclipse.org/egit/updates-5.4"/>
+ <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"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <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="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="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="1.1.6.v20160919-1400"/>
- <unit id="org.apache.commons.compress" version="1.18.0.v20181121-2221"/>
+ <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="2.33.0.v20160323-2218"/>
+ <unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="org.mockito" version="1.9.5.v201605172210"/>
<unit id="org.hamcrest" version="0.0.0"/>
- <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+ <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.objenesis" version="1.0.0.v201505121915"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20190602181010/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200203200403/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="4.4.0.201906121718"/>
- <unit id="org.eclipse.papyrus.infra.gmfdiag.feature.feature.group" version="3.0.0.201906121718"/>
- <unit id="org.eclipse.papyrus.infra.services.feature.feature.group" version="3.0.0.201906121718"/>
- <unit id="org.eclipse.papyrus.views.properties.toolsmiths" version="2.0.2.201906121827"/>
- <repository id="papyrus" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06"/>
+ <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"/>
</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.201905300200"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.7.201905300200"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="3.3.7.201905300200"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201905300200/"/>
+ <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/"/>
</location>
</locations>
</target>
diff --git a/compare/targetplatforms/compare.tests-release.tpd b/compare/targetplatforms/compare.tests-release.tpd
index a9dc00f..b196c4f 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/R201905300200/" {
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515/" {
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/.classpath b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
index 098194c..eca7bdb 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
index 79ea86f..cfb6a75 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/.settings/org.eclipse.jdt.core.prefs
@@ -8,9 +8,9 @@
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -101,8 +101,9 @@
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -110,17 +111,20 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
@@ -206,11 +210,12 @@
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
@@ -241,6 +246,8 @@
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
@@ -265,13 +272,17 @@
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
@@ -319,6 +330,8 @@
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
@@ -355,9 +368,12 @@
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
@@ -383,7 +399,11 @@
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_on_off_tags=false
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
index fd6014a..ec9c14e 100644
--- a/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
+++ b/compare/tests/org.eclipse.papyrus.compare.diagram.tests.git/src/org/eclipse/papyrus/compare/diagram/tests/egit/fixture/MockSystemReader.java
@@ -47,12 +47,15 @@
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.Field;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.time.Duration;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.Config;
@@ -61,13 +64,15 @@
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.util.FS;
import org.eclipse.jgit.util.SystemReader;
+import org.eclipse.jgit.util.time.MonotonicClock;
+import org.eclipse.jgit.util.time.ProposedTimestamp;
/**
* Except for this comment, verbatim copy/paste of org.eclipse.jgit.junit.MockSystemReader.
*/
@SuppressWarnings("nls")
public class MockSystemReader extends SystemReader {
- private final class MockConfig extends FileBasedConfig {
+ private static final class MockConfig extends FileBasedConfig {
private MockConfig(File cfgLocation, FS fs) {
super(cfgLocation, fs);
}
@@ -78,56 +83,111 @@
}
@Override
+ public void save() throws IOException {
+ // Do nothing
+ }
+
+ @Override
public boolean isOutdated() {
return false;
}
+
+ @Override
+ public String toString() {
+ return "MockConfig";
+ }
}
+ long now = 1250379778668L; // Sat Aug 15 20:12:58 GMT-03:30 2009
+
final Map<String, String> values = new HashMap<>();
- FileBasedConfig userGitConfig;
+ private FileBasedConfig userGitConfig;
FileBasedConfig systemGitConfig;
+ /**
+ * Set the user-level git config
+ *
+ * @param userGitConfig
+ * set another user-level git config
+ * @return the old user-level git config
+ */
+ public FileBasedConfig setUserGitConfig(FileBasedConfig userGitConfig) {
+ FileBasedConfig old = this.userGitConfig;
+ this.userGitConfig = userGitConfig;
+ return old;
+ }
+
+ /**
+ * Set the system-level git config
+ *
+ * @param systemGitConfig
+ * the new system-level git config
+ * @return the old system-level config
+ */
+ public FileBasedConfig setSystemGitConfig(FileBasedConfig systemGitConfig) {
+ FileBasedConfig old = this.systemGitConfig;
+ this.systemGitConfig = systemGitConfig;
+ return old;
+ }
+
+ /**
+ * Constructor for <code>MockSystemReader</code>
+ */
public MockSystemReader() {
init(Constants.OS_USER_NAME_KEY);
init(Constants.GIT_AUTHOR_NAME_KEY);
init(Constants.GIT_AUTHOR_EMAIL_KEY);
init(Constants.GIT_COMMITTER_NAME_KEY);
init(Constants.GIT_COMMITTER_EMAIL_KEY);
+ setProperty(Constants.OS_USER_DIR, ".");
userGitConfig = new MockConfig(null, null);
systemGitConfig = new MockConfig(null, null);
setCurrentPlatform();
}
- private void init(final String n) {
+ private void init(String n) {
setProperty(n, n);
}
+ /**
+ * Clear properties
+ */
public void clearProperties() {
values.clear();
}
+ /**
+ * Set a property
+ *
+ * @param key
+ * @param value
+ */
public void setProperty(String key, String value) {
values.put(key, value);
}
+ /** {@inheritDoc} */
@Override
public String getenv(String variable) {
return values.get(variable);
}
+ /** {@inheritDoc} */
@Override
public String getProperty(String key) {
return values.get(key);
}
+ /** {@inheritDoc} */
@Override
public FileBasedConfig openUserConfig(Config parent, FS fs) {
assert parent == null || parent == systemGitConfig;
return userGitConfig;
}
+ /** {@inheritDoc} */
@Override
public FileBasedConfig openSystemConfig(Config parent, FS fs) {
assert parent == null;
@@ -135,35 +195,83 @@
}
@Override
+ public StoredConfig getUserConfig() throws IOException, ConfigInvalidException {
+ return userGitConfig;
+ }
+
+ @Override
+ public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException {
+ return systemGitConfig;
+ }
+
+ /** {@inheritDoc} */
+ @Override
public String getHostname() {
return "fake.host.example.com";
}
+ /** {@inheritDoc} */
@Override
public long getCurrentTime() {
- return 1250379778668L; // Sat Aug 15 20:12:58 GMT-03:30 2009
+ return now;
}
+ /** {@inheritDoc} */
+ @Override
+ public MonotonicClock getClock() {
+ return () -> {
+ long t = getCurrentTime();
+ return new ProposedTimestamp() {
+
+ @Override
+ public long read(TimeUnit unit) {
+ return unit.convert(t, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public void blockUntil(Duration maxWait) {
+ // Do not wait.
+ }
+ };
+ };
+ }
+
+ /**
+ * Adjusts the current time in seconds.
+ *
+ * @param secDelta
+ * number of seconds to add to the current time.
+ * @since 4.2
+ */
+ public void tick(int secDelta) {
+ now += secDelta * 1000L;
+ }
+
+ /** {@inheritDoc} */
@Override
public int getTimezone(long when) {
return getTimeZone().getOffset(when) / (60 * 1000);
}
+ /** {@inheritDoc} */
@Override
public TimeZone getTimeZone() {
return TimeZone.getTimeZone("GMT-03:30");
}
+ /** {@inheritDoc} */
@Override
public Locale getLocale() {
return Locale.US;
}
+ /** {@inheritDoc} */
@Override
public SimpleDateFormat getSimpleDateFormat(String pattern) {
return new SimpleDateFormat(pattern, getLocale());
}
+ /** {@inheritDoc} */
@Override
public DateFormat getDateTimeInstance(int dateStyle, int timeStyle) {
return DateFormat.getDateTimeInstance(dateStyle, timeStyle, getLocale());
@@ -173,6 +281,7 @@
* Assign some properties for the currently executing platform
*/
public void setCurrentPlatform() {
+ resetOsNames();
setProperty("os.name", System.getProperty("os.name"));
setProperty("file.separator", System.getProperty("file.separator"));
setProperty("path.separator", System.getProperty("path.separator"));
@@ -183,27 +292,48 @@
* Emulate Windows
*/
public void setWindows() {
+ resetOsNames();
setProperty("os.name", "Windows");
setProperty("file.separator", "\\");
setProperty("path.separator", ";");
setProperty("line.separator", "\r\n");
+ setPlatformChecker();
}
/**
* Emulate Unix
*/
public void setUnix() {
+ resetOsNames();
setProperty("os.name", "*nix"); // Essentially anything but Windows
setProperty("file.separator", "/");
setProperty("path.separator", ":");
setProperty("line.separator", "\n");
+ setPlatformChecker();
}
- public StoredConfig getUserConfig() throws IOException, ConfigInvalidException {
- return userGitConfig;
+ private void resetOsNames() {
+ Field field;
+ try {
+ field = SystemReader.class.getDeclaredField("isWindows");
+ field.setAccessible(true);
+ field.set(null, null);
+ field = SystemReader.class.getDeclaredField("isMacOS");
+ field.setAccessible(true);
+ field.set(null, null);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- public StoredConfig getSystemConfig() throws IOException, ConfigInvalidException {
- return systemGitConfig;
+ @Override
+ public String toString() {
+ return "MockSystemReader";
}
+
+ @Override
+ public FileBasedConfig openJGitConfig(Config parent, FS fs) {
+ return SystemReader.getInstance().openJGitConfig(parent, fs);
+ }
+
}
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 0c6d37d..6c352d2 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
@@ -47,12 +47,12 @@
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
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
-Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
- com.google.common.collect;version="[15.0.0,22.0.0)",
- com.google.common.eventbus;version="[15.0.0,22.0.0)",
- com.google.common.io;version="[15.0.0,22.0.0)",
+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)",
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 7a9ab2e..011d215 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
@@ -6,7 +6,7 @@
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.compare.uml2.tests.blocks,
org.eclipse.papyrus.compare.uml2.tests.blocks.impl,
org.eclipse.papyrus.compare.uml2.tests.blocks.util,
