Merge "Bug 529998 - [revision] problem to lauch revision mode and create author"
diff --git a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
index a605ad3..d1f2f06 100644
--- a/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
+++ b/plugins/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/plugin.xml
@@ -146,7 +146,7 @@
fileExtension="sash">
</fileExtensionModelInclusionTester>
<dynamicModelInclusionTester
- dynamicTester="org.eclipse.emf.compare.diagram.ide.ui.papyrus.internal.logical.InternationalizationFileInclusionTester">
+ dynamicTester="org.eclipse.papyrus.compare.diagram.ide.ui.internal.logical.InternationalizationFileInclusionTester">
</dynamicModelInclusionTester>
</extension>
</plugin>
diff --git a/plugins/compare/pom.xml b/plugins/compare/pom.xml
index e861274..ce2481a 100755
--- a/plugins/compare/pom.xml
+++ b/plugins/compare/pom.xml
@@ -185,16 +185,6 @@
<goals>
<goal>source-feature</goal>
</goals>
- <configuration>
- <excludes>
- <feature id="org.eclipse.emf.compare" />
- <feature id="org.eclipse.emf.compare.diagram.gmf" />
- <feature id="org.eclipse.emf.compare.egit" />
- <feature id="org.eclipse.emf.compare.ide.ui" />
- <feature id="org.eclipse.emf.compare.rcp.ui" />
- <feature id="org.eclipse.emf.compare.uml2" />
- </excludes>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/plugins/compare/targetplatforms/compare-nightly.target b/plugins/compare/targetplatforms/compare-nightly.target
index b47d601..a06e7e3 100644
--- a/plugins/compare/targetplatforms/compare-nightly.target
+++ b/plugins/compare/targetplatforms/compare-nightly.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly" sequenceNumber="1514940783">
+<target name="Compare Target Platform - Nightly" sequenceNumber="1516204258">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -34,12 +34,12 @@
<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.eclipse.emf.compare.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare-nightly.tpd b/plugins/compare/targetplatforms/compare-nightly.tpd
index fe9240d..3a2dd24 100755
--- a/plugins/compare/targetplatforms/compare-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare-nightly.tpd
@@ -39,12 +39,12 @@
* Search all references to emf-compare.p2.repo
*/
location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
- org.eclipse.emf.compare.feature.group lazy
- org.eclipse.emf.compare.diagram.gmf.feature.group lazy
- org.eclipse.emf.compare.uml2.feature.group lazy
- org.eclipse.emf.compare.egit.feature.group lazy
- org.eclipse.emf.compare.ide.ui.feature.group lazy
- org.eclipse.emf.compare.rcp.ui.feature.group lazy
+ org.eclipse.emf.compare.source.feature.group lazy
+ org.eclipse.emf.compare.diagram.gmf.source.feature.group lazy
+ org.eclipse.emf.compare.uml2.source.feature.group lazy
+ org.eclipse.emf.compare.egit.source.feature.group lazy
+ org.eclipse.emf.compare.ide.ui.source.feature.group lazy
+ org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
}
location orbit "http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository" {
diff --git a/plugins/compare/targetplatforms/compare-release-base.target b/plugins/compare/targetplatforms/compare-release-base.target
index d41ba2b..049a732 100644
--- a/plugins/compare/targetplatforms/compare-release-base.target
+++ b/plugins/compare/targetplatforms/compare-release-base.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Base for Release" sequenceNumber="1514940786">
+<target name="Compare Target Platform - Base for Release" sequenceNumber="1516204260">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
@@ -31,10 +31,10 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare-release-base.tpd b/plugins/compare/targetplatforms/compare-release-base.tpd
index 584b085..788f2f7 100755
--- a/plugins/compare/targetplatforms/compare-release-base.tpd
+++ b/plugins/compare/targetplatforms/compare-release-base.tpd
@@ -32,10 +32,10 @@
location "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/" emfCompare {
org.eclipse.emf.compare.source.feature.group lazy
org.eclipse.emf.compare.diagram.gmf.source.feature.group lazy
- org.eclipse.emf.compare.uml2.feature.group lazy
- org.eclipse.emf.compare.egit.feature.group lazy
- org.eclipse.emf.compare.ide.ui.feature.group lazy
- org.eclipse.emf.compare.rcp.ui.feature.group lazy
+ org.eclipse.emf.compare.uml2.source.feature.group lazy
+ org.eclipse.emf.compare.egit.source.feature.group lazy
+ org.eclipse.emf.compare.ide.ui.source.feature.group lazy
+ org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
}
//manualUpdate
diff --git a/plugins/compare/targetplatforms/compare-release.target b/plugins/compare/targetplatforms/compare-release.target
index 7901891..3417273 100644
--- a/plugins/compare/targetplatforms/compare-release.target
+++ b/plugins/compare/targetplatforms/compare-release.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release" sequenceNumber="1514940786">
+<target name="Compare Target Platform - Release" sequenceNumber="1516204260">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
@@ -31,10 +31,10 @@
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.target b/plugins/compare/targetplatforms/compare.tests-nightly.target
index 3abb1be..34a695d 100644
--- a/plugins/compare/targetplatforms/compare.tests-nightly.target
+++ b/plugins/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/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1514940783">
+<target name="Compare Target Platform - Nightly, Tests" sequenceNumber="1516204257">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -61,14 +61,13 @@
<repository id="sysml" location="https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastStableBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.tests.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.diagram.gmf.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/"/>
</location>
</locations>
diff --git a/plugins/compare/targetplatforms/compare.tests-nightly.tpd b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
index 351ada4..8e282ba 100755
--- a/plugins/compare/targetplatforms/compare.tests-nightly.tpd
+++ b/plugins/compare/targetplatforms/compare.tests-nightly.tpd
@@ -17,6 +17,5 @@
}
location emfCompare "http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/nightly/latest/" {
- org.eclipse.emf.compare.rcp.ui.source.feature.group lazy
org.eclipse.emf.compare.tests.source.feature.group lazy
}
\ No newline at end of file
diff --git a/plugins/compare/targetplatforms/compare.tests-release.target b/plugins/compare/targetplatforms/compare.tests-release.target
index 4e88c7a..e6f49c8 100644
--- a/plugins/compare/targetplatforms/compare.tests-release.target
+++ b/plugins/compare/targetplatforms/compare.tests-release.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Compare Target Platform - Release, Tests" sequenceNumber="1514940786">
+<target name="Compare Target Platform - Release, Tests" sequenceNumber="1516204260">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="4.7.2.v20171130-0510"/>
@@ -69,10 +69,9 @@
<unit id="org.eclipse.emf.compare.uml2.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.diagram.gmf.source.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.egit.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.egit.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
<repository id="emfCompare" location="http://download.eclipse.org/modeling/emf/compare/updates/logical/emf.compare/integration/"/>
</location>
</locations>