Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2017-07-05 11:11:17 -0400
committerLaurent Goubet2017-08-22 04:47:56 -0400
commit58daefff5ded3af37e527807aefad4efd287d62f (patch)
treef45fd8eb65227e49a1fb5f5d2ec3b476a9bff48b
parentd7fb5216c5345bba6350767fa71af27dd906bfcf (diff)
downloadorg.eclipse.emf.compare-58daefff5ded3af37e527807aefad4efd287d62f.tar.gz
org.eclipse.emf.compare-58daefff5ded3af37e527807aefad4efd287d62f.tar.xz
org.eclipse.emf.compare-58daefff5ded3af37e527807aefad4efd287d62f.zip
Separate core & extra builds
Papyrus and sirius are "polluting" the target platform and preventing some of our builds to succeed. This will allow us to build the core EMF Compare separately from the support for extra tools while also decoupling our target platforms. Change-Id: I0f783a21c3333f7dc77cbe28539dfc08b28eac67
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml270
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target52
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd23
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/fragments/papyrus.tpd11
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.target21
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.tpd17
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target18
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.tpd4
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target19
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd4
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd2
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target24
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd10
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target28
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd23
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target26
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd24
-rw-r--r--packaging/org.eclipse.emf.compare.update.extras/.project11
-rw-r--r--packaging/org.eclipse.emf.compare.update.extras/category.xml20
-rw-r--r--packaging/org.eclipse.emf.compare.update.extras/index.html0
-rw-r--r--packaging/org.eclipse.emf.compare.update.extras/pom.xml43
-rw-r--r--packaging/org.eclipse.emf.compare.update/category.xml12
-rw-r--r--packaging/org.eclipse.emf.compare.update/p2.xsl35
-rw-r--r--packaging/org.eclipse.emf.compare.update/promoter.xml278
-rw-r--r--packaging/org.eclipse.emf.compare.update/publisher.properties1
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java (renamed from plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/DiffInvolvingRefineDiffInputData.java)6
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java (renamed from plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java)23
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/left.uml (renamed from plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/left.uml)0
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/right.uml (renamed from plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/right.uml)0
-rw-r--r--plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java3
-rw-r--r--plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java2
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF6
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java8
35 files changed, 267 insertions, 763 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index e3f0a1ae7..9ae49f69c 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -40,8 +40,8 @@
<!-- plugins versions -->
<!-- use 'mvn versions:display-plugin-updates' to check for the latest -->
- <tycho-version>0.26.0</tycho-version>
- <tycho-extras-version>0.26.0</tycho-extras-version>
+ <tycho-version>1.0.0</tycho-version>
+ <tycho-extras-version>1.0.0</tycho-extras-version>
<maven-resources-version>2.6</maven-resources-version>
<maven-antrun-version>1.7</maven-antrun-version>
<findbugs-maven-version>3.0.0</findbugs-maven-version>
@@ -76,17 +76,23 @@
<modules>
<!-- This one must remain the first module in the list -->
<module>../packaging/org.eclipse.emf.compare.gendoc</module>
+
+ <module>../packaging/org.eclipse.emf.compare.update</module>
+
<module>../packaging/org.eclipse.emf.compare-feature</module>
<module>../plugins/org.eclipse.emf.compare</module>
<module>../plugins/org.eclipse.emf.compare.tests</module>
<module>../plugins/org.eclipse.emf.compare.doc</module>
+
<module>../packaging/org.eclipse.emf.compare.ide.ui-feature</module>
<module>../plugins/org.eclipse.emf.compare.edit</module>
<module>../plugins/org.eclipse.emf.compare.ide</module>
<module>../plugins/org.eclipse.emf.compare.ide.ui</module>
<module>../plugins/org.eclipse.emf.compare.ide.ui.e4</module>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.framework</module>
<module>../plugins/org.eclipse.emf.compare.ide.ui.tests</module>
+ <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.framework</module>
+ <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
+ <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework</module>
<module>../plugins/org.eclipse.emf.compare.ide.tests</module>
<module>../packaging/org.eclipse.emf.compare.rcp.ui-feature</module>
@@ -94,6 +100,29 @@
<module>../plugins/org.eclipse.emf.compare.rcp.tests</module>
<module>../plugins/org.eclipse.emf.compare.rcp.ui</module>
<module>../plugins/org.eclipse.emf.compare.rcp.ui.tests</module>
+
+ <module>../packaging/org.eclipse.emf.compare.egit-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.egit</module>
+ <module>../plugins/org.eclipse.emf.compare.egit.ui</module>
+
+ <module>../packaging/org.eclipse.emf.compare.subversive-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.subversive</module>
+
+ <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.ide</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.ide.ui.tests</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.ide.tests</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests</module>
+ <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
+
+ <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
</modules>
<build>
@@ -344,12 +373,6 @@
</pluginManagement>
</build>
<profiles>
- <!--
- EMF Compare can be built against Oxygen, Neon, Mars, Luna, Kepler, Juno, Indigo, Helios and Galileo.
- However, some parts of EMF Compare are dependent on recent platforms.
- Namely, the UML and diagram comparison supports are only available for platforms Juno and higher.
- Please set the "platform" variable to either one of the supported platform to activate the proper set of profiles.
- -->
<!-- Target platforms are located in org.eclipse.emf.compare-parent/targetPlatforms. -->
<profile>
<id>oxygen</id>
@@ -374,42 +397,6 @@
</plugin>
</plugins>
</build>
- <modules>
- <module>../packaging/org.eclipse.emf.compare.update</module>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git</module>
- <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.ui.tests</module>
-
- <module>../plugins/org.eclipse.emf.compare.egit</module>
- <module>../plugins/org.eclipse.emf.compare.egit.ui</module>
- <module>../packaging/org.eclipse.emf.compare.egit-feature</module>
- <module>../plugins/org.eclipse.emf.compare.subversive</module>
- <module>../packaging/org.eclipse.emf.compare.subversive-feature</module>
-
- <module>../plugins/org.eclipse.emf.compare.diagram.sirius</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.sirius-feature</module>
- </modules>
</profile>
<profile>
<id>neon</id>
@@ -434,41 +421,6 @@
</plugin>
</plugins>
</build>
- <modules>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git</module>
- <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.ui.tests</module>
-
- <module>../plugins/org.eclipse.emf.compare.egit</module>
- <module>../plugins/org.eclipse.emf.compare.egit.ui</module>
- <module>../packaging/org.eclipse.emf.compare.egit-feature</module>
- <module>../plugins/org.eclipse.emf.compare.subversive</module>
- <module>../packaging/org.eclipse.emf.compare.subversive-feature</module>
-
- <module>../plugins/org.eclipse.emf.compare.diagram.sirius</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.sirius-feature</module>
- </modules>
</profile>
<profile>
<id>mars</id>
@@ -493,41 +445,6 @@
</plugin>
</plugins>
</build>
- <modules>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git</module>
- <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.ui.tests</module>
-
- <module>../plugins/org.eclipse.emf.compare.egit</module>
- <module>../plugins/org.eclipse.emf.compare.egit.ui</module>
- <module>../packaging/org.eclipse.emf.compare.egit-feature</module>
- <module>../plugins/org.eclipse.emf.compare.subversive</module>
- <module>../packaging/org.eclipse.emf.compare.subversive-feature</module>
-
- <module>../plugins/org.eclipse.emf.compare.diagram.sirius</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.sirius-feature</module>
- </modules>
</profile>
<profile>
<id>luna</id>
@@ -552,77 +469,31 @@
</plugin>
</plugins>
</build>
+ </profile>
+ <!--
+ The "extras" profiles can be used to build the supports for external tools such as Sirius and Papyrus.
+ You will need to activate both the "extra-modules" profile and one of the "<platform_name>-extras" profiles.
+ -->
+ <profile>
+ <id>extra-modules</id>
<modules>
- <!-- Uncomment when https://git.eclipse.org/r/#/c/29372/ merged into repository
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- -->
- <module>../packaging/org.eclipse.emf.compare.uml2-feature</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.edit</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.rcp.ui.tests</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
+ <module>../packaging/org.eclipse.emf.compare.update.extras</module>
+
<module>../packaging/org.eclipse.emf.compare.diagram.papyrus-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests.git</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
<module>../plugins/org.eclipse.emf.compare.uml2.papyrus</module>
<module>../plugins/org.eclipse.emf.compare.uml2.edit.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus</module>
<module>../plugins/org.eclipse.emf.compare.diagram.papyrus</module>
<module>../plugins/org.eclipse.emf.compare.diagram.papyrus.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.tests</module>
- <module>../plugins/org.eclipse.emf.compare.uml2.ide.ui.tests</module>
-
- <module>../plugins/org.eclipse.emf.compare.subversive</module>
- <module>../packaging/org.eclipse.emf.compare.subversive-feature</module>
- </modules>
- </profile>
- <profile>
- <id>kepler</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <target>
- <artifact>
- <groupId>org.eclipse.emf.compare</groupId>
- <artifactId>emf.compare-parent</artifactId>
- <version>${parent-version}</version>
- <classifier>targetPlatforms/kepler-sdk</classifier>
- </artifact>
- </target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <modules>
- <!-- Uncomment when https://git.eclipse.org/r/#/c/29372/ merged into repository
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- -->
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.ecoretools-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ecoretools.tests</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests</module>
+
+ <module>../packaging/org.eclipse.emf.compare.diagram.sirius-feature</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.sirius</module>
+ <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.sirius</module>
</modules>
</profile>
<profile>
- <id>juno</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <id>oxygen-extras</id>
<build>
<plugins>
<plugin>
@@ -634,32 +505,16 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
- <classifier>targetPlatforms/juno-4.2-sdk</classifier>
+ <classifier>targetPlatforms/extras/oxygen-extras-sdk</classifier>
</artifact>
</target>
</configuration>
</plugin>
</plugins>
</build>
- <modules>
- <!-- Uncomment when https://git.eclipse.org/r/#/c/29372/ merged into repository
- <module>../plugins/org.eclipse.emf.compare.ide.ui.tests.git</module>
- -->
- <module>../packaging/org.eclipse.emf.compare.diagram.gmf-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.edit</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui</module>
- <module>../packaging/org.eclipse.emf.compare.diagram.ecoretools-feature</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ui.ecoretools</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ecoretools.tests</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.ide.ecoretools.tests</module>
- </modules>
</profile>
<profile>
- <id>indigo</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <id>neon-extras</id>
<build>
<plugins>
<plugin>
@@ -671,7 +526,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
- <classifier>targetPlatforms/indigo-sdk</classifier>
+ <classifier>targetPlatforms/extras/neon-extras-sdk</classifier>
</artifact>
</target>
</configuration>
@@ -680,10 +535,7 @@
</build>
</profile>
<profile>
- <id>helios</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <id>mars-extras</id>
<build>
<plugins>
<plugin>
@@ -695,7 +547,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
- <classifier>targetPlatforms/helios-sdk</classifier>
+ <classifier>targetPlatforms/extras/mars-extras-sdk</classifier>
</artifact>
</target>
</configuration>
@@ -704,10 +556,7 @@
</build>
</profile>
<profile>
- <id>galileo</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
+ <id>luna-extras</id>
<build>
<plugins>
<plugin>
@@ -719,7 +568,7 @@
<groupId>org.eclipse.emf.compare</groupId>
<artifactId>emf.compare-parent</artifactId>
<version>${parent-version}</version>
- <classifier>targetPlatforms/galileo-sdk</classifier>
+ <classifier>targetPlatforms/extras/luna-extras-sdk</classifier>
</artifact>
</target>
</configuration>
@@ -727,6 +576,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>sign</id>
<activation>
@@ -881,8 +731,6 @@
</properties>
<modules>
<module>../performance/org.eclipse.emf.compare.tests.performance</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
</modules>
<build>
<plugins>
@@ -914,8 +762,6 @@
</properties>
<modules>
<module>../performance/org.eclipse.emf.compare.tests.performance</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
</modules>
<build>
<plugins>
@@ -947,8 +793,6 @@
</properties>
<modules>
<module>../performance/org.eclipse.emf.compare.tests.performance</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
</modules>
<build>
<plugins>
@@ -980,8 +824,6 @@
</properties>
<modules>
<module>../performance/org.eclipse.emf.compare.tests.performance</module>
- <module>../plugins/org.eclipse.emf.compare.uml2</module>
- <module>../plugins/org.eclipse.emf.compare.diagram</module>
</modules>
<build>
<plugins>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
new file mode 100644
index 000000000..365b0526b
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="EMF Compare with extras based on Oxygen SDK" sequenceNumber="1502374703">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
+ <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+ <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="1.1.0.v20090501071000"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
+ <repository location="http://obeo.github.io/fr.obeo.performance/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.diagram" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/sirius/updates/nightly/latest/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
+ <unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/oxygen"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
+ <repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository"/>
+ </location>
+ </locations>
+</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
new file mode 100644
index 000000000..33e74f327
--- /dev/null
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
@@ -0,0 +1,23 @@
+target "EMF Compare with extras based on Oxygen SDK"
+
+include "../oxygen-sdk.tpd"
+
+with source, requirements
+
+// Sirius
+
+location "http://download.eclipse.org/sirius/updates/nightly/latest/oxygen" {
+ org.eclipse.sirius lazy
+ org.eclipse.sirius.diagram lazy
+ org.eclipse.sirius.runtime.feature.group lazy
+}
+
+// Papyrus
+
+location "http://download.eclipse.org/releases/oxygen" {
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+}
+
+location "https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository" {
+ org.eclipse.papyrus.sysml.feature.feature.group lazy
+} \ No newline at end of file
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/papyrus.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/papyrus.tpd
deleted file mode 100644
index f2f9f152d..000000000
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/papyrus.tpd
+++ /dev/null
@@ -1,11 +0,0 @@
-target "Papyrus"
-
-with source, requirements
-
-// TODO change location to http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars
-// once mars contains org.eclipse.papyrus.migration.rsa
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/luna/" {
- org.eclipse.papyrus.migration.rsa lazy
- org.eclipse.papyrus.extra.umlrt.feature.feature.group lazy
- org.eclipse.papyrus.extra.epf.richtext.feature.feature.group lazy
-} \ No newline at end of file
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.target b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.target
deleted file mode 100644
index ebc35d9e3..000000000
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.target
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Sirius" sequenceNumber="1450799518">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.query.feature.group" version="3.6.0.201506080954"/>
- <repository location="http://download.eclipse.org/releases/mars"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/sirius/updates/releases/3.0.0/mars"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="6.0.0.201510191019"/>
- <repository location="http://releases.umldesigner.org/6.0.0/repository/"/>
- </location>
- </locations>
-</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.tpd
deleted file mode 100644
index 5607f3f15..000000000
--- a/org.eclipse.emf.compare-parent/targetPlatforms/fragments/sirius.tpd
+++ /dev/null
@@ -1,17 +0,0 @@
-target "Sirius"
-
-with requirements
-
-location "http://download.eclipse.org/releases/mars" {
- org.eclipse.acceleo.feature.group lazy
- org.eclipse.acceleo.query.feature.group [3.6.0,3.7.0)
-}
-
-location "http://download.eclipse.org/sirius/updates/releases/3.1.4/mars" {
- org.eclipse.sirius lazy
- org.eclipse.sirius.runtime.acceleo.feature.group lazy
-}
-
-location "http://releases.umldesigner.org/6.0.0/repository/" {
- org.obeonetwork.dsl.uml2.runtime.feature.feature.group
-} \ No newline at end of file
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
index ad8eec93b..f8491f147 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.target
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Luna SDK" sequenceNumber="1466060892">
+<target name="EMF Compare based on Luna SDK" sequenceNumber="1500968088">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="15.0.0.v201403281430"/>
- <unit id="com.google.gson" version="2.2.4.v201311231704"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="javaewah" version="0.7.9.v201401101600"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
- <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
- <unit id="org.mockito" version="1.9.5.v201311280930"/>
+ <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="1.1.0.v20090501071000"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
@@ -29,10 +29,8 @@
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.8.0.201405281451"/>
<unit id="org.eclipse.uml2.feature.group" version="5.0.2.v20150202-0947"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.8.0.201405281433"/>
- <unit id="org.eclipse.emf.ecoretools.feature.group" version="2.0.3.201411191338"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="1.0.2.v201502181349"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="1.8.0.201408201453"/>
<unit id="org.eclipse.team.svn.feature.group" version="2.0.4.I20150123-1700"/>
- <unit id="org.eclipse.pde.junit.runtime" version="3.4.400.v20140204-1740"/>
<repository location="http://download.eclipse.org/releases/luna"/>
</location>
</locations>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.tpd
index e9da1d6a5..678377d4c 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/luna-sdk.tpd
@@ -12,8 +12,6 @@ location "http://download.eclipse.org/releases/luna" {
org.eclipse.emf.transaction.sdk.feature.group
org.eclipse.uml2.feature.group
org.eclipse.gmf.runtime.notation.sdk.feature.group
- org.eclipse.emf.ecoretools.feature.group
- org.eclipse.papyrus.sdk.feature.feature.group
+ org.eclipse.gmf.runtime.diagram.ui
org.eclipse.team.svn.feature.group
- org.eclipse.pde.junit.runtime
}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target
index dea11e9e5..0566907a8 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.target
@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="EMF Compare based on Mars SDK with Logical Model and Papyrus" sequenceNumber="1450798538">
+<target name="EMF Compare based on Mars SDK with Logical Model and Papyrus" sequenceNumber="1500986499">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
<repository location="http://download.eclipse.org/cbi/updates/license"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="com.google.guava" version="11.0.2.v201303041551"/>
+ <unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+ <unit id="com.google.gson" version="2.7.0.v20170129-0911"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <unit id="javaewah" version="0.7.9.v201401101600"/>
+ <unit id="javaewah" version="1.1.6.v20160919-1400"/>
<unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
- <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
- <unit id="org.mockito" version="1.9.5.v201311280930"/>
+ <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="1.1.0.v20090501071000"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
@@ -43,6 +44,11 @@
<repository location="http://download.eclipse.org/technology/swtbot/releases/2.3.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.sirius" version="0.0.0"/>
+ <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/sirius/updates/releases/3.1.4/mars"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="6.0.0.201510191019"/>
<repository location="http://releases.umldesigner.org/6.0.0/repository/"/>
</location>
@@ -57,7 +63,6 @@
<unit id="org.eclipse.jdt.annotation" version="1.1.100.v20140704-0625"/>
<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
<unit id="org.eclipse.acceleo.query.feature.group" version="3.6.0.201506080954"/>
- <unit id="org.eclipse.sirius" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/mars"/>
</location>
</locations>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd
index b57b6ecfb..8f388c932 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-papyrus-sdk.tpd
@@ -4,10 +4,10 @@ include "fragments/licence.tpd"
include "fragments/orbit.tpd"
include "fragments/egit-logical-nightly.tpd"
include "fragments/perf.tpd"
-include "fragments/papyrus.tpd"
+include "extras/papyrus.tpd"
include "fragments/uml2-interim.tpd"
include "fragments/swtbot.tpd"
-include "fragments/sirius.tpd"
+include "extras/sirius.tpd"
with source, requirements
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd
index 66c59bdf0..42c3d90ef 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-logical-sdk.tpd
@@ -5,7 +5,7 @@ include "fragments/orbit.tpd"
include "fragments/egit-logical-nightly.tpd"
include "fragments/perf.tpd"
include "fragments/swtbot.tpd"
-include "fragments/sirius.tpd"
+include "extras/sirius.tpd"
with source, requirements
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
index 2a4e2c2de..14e5500a7 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.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="EMF Compare based on Mars SDK" sequenceNumber="1499327801">
+<target name="EMF Compare based on Mars SDK" sequenceNumber="1500968112">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -20,21 +20,12 @@
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170307180635/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/egit/updates"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="fr.obeo.performance" version="1.0.0.201402071743"/>
<repository location="http://obeo.github.io/fr.obeo.performance/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/sirius/updates/releases/3.1.4/mars"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="6.0.0.201510191019"/>
- <repository location="http://releases.umldesigner.org/6.0.0/repository/"/>
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
@@ -42,16 +33,9 @@
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.query.feature.group" version="3.6.0.201506080954"/>
<repository location="http://download.eclipse.org/releases/mars"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars/"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
index 2ae44a79e..908f10663 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/mars-sdk.tpd
@@ -3,7 +3,7 @@ target "EMF Compare based on Mars SDK"
include "fragments/licence.tpd"
include "fragments/orbit.tpd"
include "fragments/perf.tpd"
-include "fragments/sirius.tpd"
+include "fragments/egit.tpd"
with source, requirements
@@ -13,12 +13,6 @@ location "http://download.eclipse.org/releases/mars" {
org.eclipse.emf.transaction.sdk.feature.group lazy
org.eclipse.uml2.feature.group lazy
org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
- org.eclipse.emf.ecoretools.sdk.feature.group lazy
- org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.gmf.runtime.diagram.ui lazy
org.eclipse.team.svn.feature.group lazy
- org.eclipse.egit.feature.group lazy
-}
-
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars/" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
index ff1504746..5e45880ba 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.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="EMF Compare based on Neon SDK" sequenceNumber="1499328085">
+<target name="EMF Compare based on Neon SDK" sequenceNumber="1500968146">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -24,34 +24,18 @@
<repository location="http://obeo.github.io/fr.obeo.performance/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/egit/updates"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/acceleo/updates/releases/3.6"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="0.0.0"/>
- <repository location="http://obeo-umldesigner-releases.s3-website-eu-west-1.amazonaws.com/7.1.0/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
index 1cf3e79a1..1f45fe455 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/neon-sdk.tpd
@@ -3,6 +3,7 @@ target "EMF Compare based on Neon SDK"
include "fragments/licence.tpd"
include "fragments/orbit.tpd"
include "fragments/perf.tpd"
+include "fragments/egit.tpd"
with source, requirements
@@ -12,26 +13,6 @@ location "http://download.eclipse.org/releases/neon" {
org.eclipse.emf.transaction.sdk.feature.group lazy
org.eclipse.uml2.feature.group lazy
org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
- org.eclipse.emf.ecoretools.sdk.feature.group lazy
- org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.gmf.runtime.diagram.ui lazy
org.eclipse.team.svn.feature.group lazy
- org.eclipse.egit.feature.group lazy
-}
-
-location "http://download.eclipse.org/acceleo/updates/releases/3.6" {
- org.eclipse.acceleo.feature.group lazy
- org.eclipse.acceleo.query.feature.group lazy
-}
-
-location "http://download.eclipse.org/sirius/updates/nightly/4.1.x/neon" {
- org.eclipse.sirius lazy
- org.eclipse.sirius.runtime.acceleo.feature.group lazy
-}
-
-location "http://obeo-umldesigner-releases.s3-website-eu-west-1.amazonaws.com/7.1.0/repository" {
- org.obeonetwork.dsl.uml2.runtime.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon/" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
}
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target
index 2ab74e1d3..3bf552f18 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.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="EMF Compare based on Oxygen SDK" sequenceNumber="1499266963">
+<target name="EMF Compare based on Oxygen SDK" sequenceNumber="1500968636">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -33,31 +33,9 @@
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.uml2.feature.group" version="0.0.0"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.gmf.runtime.diagram.ui" version="0.0.0"/>
<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/oxygen"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.acceleo.query.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/acceleo/updates/nightly/latest"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sirius" version="0.0.0"/>
- <unit id="org.eclipse.sirius.runtime.acceleo.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/sirius/updates/nightly/latest/neon"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.obeonetwork.dsl.uml2.runtime.feature.feature.group" version="0.0.0"/>
- <repository location="http://obeo-umldesigner-nightly.s3-website-eu-west-1.amazonaws.com/master/repository"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sysml.feature.feature.group" version="0.0.0"/>
- <repository location="https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository"/>
- </location>
</locations>
</target>
diff --git a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
index 9c0f6acd8..2e29fb4c9 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/oxygen-sdk.tpd
@@ -13,28 +13,6 @@ location "http://download.eclipse.org/releases/oxygen" {
org.eclipse.emf.transaction.sdk.feature.group lazy
org.eclipse.uml2.feature.group lazy
org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
- org.eclipse.emf.ecoretools.sdk.feature.group lazy
+ org.eclipse.gmf.runtime.diagram.ui lazy
org.eclipse.team.svn.feature.group lazy
}
-
-location "http://download.eclipse.org/acceleo/updates/nightly/latest" {
- org.eclipse.acceleo.feature.group lazy
- org.eclipse.acceleo.query.feature.group lazy
-}
-
-location "http://download.eclipse.org/sirius/updates/nightly/latest/neon" {
- org.eclipse.sirius lazy
- org.eclipse.sirius.runtime.acceleo.feature.group lazy
-}
-
-location "http://obeo-umldesigner-nightly.s3-website-eu-west-1.amazonaws.com/master/repository" {
- org.obeonetwork.dsl.uml2.runtime.feature.feature.group lazy
-}
-
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/oxygen" {
- org.eclipse.papyrus.sdk.feature.feature.group lazy
-}
-
-location "https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml11-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.sysml11.p2/target/repository" {
- org.eclipse.papyrus.sysml.feature.feature.group lazy
-} \ No newline at end of file
diff --git a/packaging/org.eclipse.emf.compare.update.extras/.project b/packaging/org.eclipse.emf.compare.update.extras/.project
new file mode 100644
index 000000000..ec1687386
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.update.extras/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.compare.update.extras</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/packaging/org.eclipse.emf.compare.update.extras/category.xml b/packaging/org.eclipse.emf.compare.update.extras/category.xml
new file mode 100644
index 000000000..b25ecc74c
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.update.extras/category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature id="org.eclipse.emf.compare.diagram.papyrus" version="0.0.0">
+ <category name="compare_integration"/>
+ </feature>
+ <feature id="org.eclipse.emf.compare.diagram.papyrus.source" version="0.0.0">
+ <category name="compare_integration"/>
+ </feature>
+ <feature id="org.eclipse.emf.compare.diagram.sirius" version="0.0.0">
+ <category name="compare_integration"/>
+ </feature>
+ <feature id="org.eclipse.emf.compare.diagram.sirius.source" version="0.0.0">
+ <category name="compare_integration"/>
+ </feature>
+ <category-def name="compare_integration" label="EMF Compare tools support">
+ <description>
+ Features to integrate EMF Compare with other tools.
+ </description>
+ </category-def>
+</site>
diff --git a/packaging/org.eclipse.emf.compare.update.extras/index.html b/packaging/org.eclipse.emf.compare.update.extras/index.html
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.update.extras/index.html
diff --git a/packaging/org.eclipse.emf.compare.update.extras/pom.xml b/packaging/org.eclipse.emf.compare.update.extras/pom.xml
new file mode 100644
index 000000000..e1984eaec
--- /dev/null
+++ b/packaging/org.eclipse.emf.compare.update.extras/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>emf.compare-parent</artifactId>
+ <groupId>org.eclipse.emf.compare</groupId>
+ <version>3.3.1-SNAPSHOT</version>
+ <relativePath>../../org.eclipse.emf.compare-parent</relativePath>
+ </parent>
+ <artifactId>org.eclipse.emf.compare.update.extras</artifactId>
+ <packaging>eclipse-repository</packaging>
+ <version>3.3.1-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <configuration>
+ <createArtifactRepository>true</createArtifactRepository>
+ <finalName>${project.groupId}.extras-${unqualifiedVersion}.${buildQualifier}</finalName>
+ <compress>true</compress>
+ <repositoryName>EMF Compare Extras ${unqualifiedVersion}.${buildQualifier}</repositoryName>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
diff --git a/packaging/org.eclipse.emf.compare.update/category.xml b/packaging/org.eclipse.emf.compare.update/category.xml
index c6101f4f7..0fb748aa5 100644
--- a/packaging/org.eclipse.emf.compare.update/category.xml
+++ b/packaging/org.eclipse.emf.compare.update/category.xml
@@ -30,18 +30,6 @@
<feature id="org.eclipse.emf.compare.diagram.gmf.source" version="0.0.0">
<category name="compare_integration"/>
</feature>
- <feature id="org.eclipse.emf.compare.diagram.papyrus" version="0.0.0">
- <category name="compare_integration"/>
- </feature>
- <feature id="org.eclipse.emf.compare.diagram.papyrus.source" version="0.0.0">
- <category name="compare_integration"/>
- </feature>
- <feature id="org.eclipse.emf.compare.diagram.sirius" version="0.0.0">
- <category name="compare_integration"/>
- </feature>
- <feature id="org.eclipse.emf.compare.diagram.sirius.source" version="0.0.0">
- <category name="compare_integration"/>
- </feature>
<feature id="org.eclipse.emf.compare.subversive" version="0.0.0">
<category name="compare_integration"/>
</feature>
diff --git a/packaging/org.eclipse.emf.compare.update/p2.xsl b/packaging/org.eclipse.emf.compare.update/p2.xsl
deleted file mode 100644
index 8c804d3b7..000000000
--- a/packaging/org.eclipse.emf.compare.update/p2.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output method="xml" indent="yes"/>
-
- <xsl:param name="mirrorsURL"/>
-
- <!-- add p2.mirrorsURL and p2.statsURI properties -->
- <xsl:template match="repository/properties">
- <properties size='{@size+2}'>
- <xsl:copy-of select="property"/>
- <property name='p2.statsURI' value='http://download.eclipse.org/stats'/>
- <xsl:element name="property">
- <xsl:attribute name="name">p2.mirrorsURL</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of select="$mirrorsURL"/></xsl:attribute>
- </xsl:element>
- </properties>
- </xsl:template>
-
- <!-- add p2.mirrorsURL property -->
- <xsl:template match="repository/artifacts/artifact/properties[../@classifier='org.eclipse.update.feature']">
- <properties size='{@size+1}'>
- <xsl:copy-of select="property"/>
- <property name='download.stats' value='{../@id}-{../@version}'/>
- </properties>
- </xsl:template>
-
- <!-- copy everything else -->
- <xsl:template match="* | @*">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/packaging/org.eclipse.emf.compare.update/promoter.xml b/packaging/org.eclipse.emf.compare.update/promoter.xml
deleted file mode 100644
index c8d144bc4..000000000
--- a/packaging/org.eclipse.emf.compare.update/promoter.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2011 Obeo.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
-
- Contributors:
- Obeo - initial API and implementation
-
- $Id: promoter.xml,v 1.35 2012/03/16 17:14:14 sbouchet Exp $
--->
-<project name="Promoter" default="main">
- <!--
- This promotion script helps to automatically promote the last sucessful build of tycho based build to correct location.
-
- Be sure to use at least ant 1.8.2 to launch this script.
-
- Ant 1.8.2 is located here : /shared/common/apache-ant-1.8.2/
- on build.eclipse.org, do a
- $> export ANT_HOME=/shared/common/apache-ant-1.8.2/
- -->
-
- <property name="downloads.project.root" value="modeling/emf/compare" />
- <property name="build.root" value="/shared/jobs/emf-compare-master/lastSuccessful/archive/packaging/org.eclipse.emf.compare.update/target/" />
- <property name="project.name" value="EMF Compare" />
- <property name="final.updatesite.name" value="emf-compare-update" />
- <property name="build.root.updatesite.name" value="org.eclipse.emf.compare.update.zip" />
- <property name="group.owner" value="modeling.emf.compare" />
- <property name="thirdPartyJarsDir" value="/shared/modeling/emf/eef/3rdPartyJars" />
-
- <!--# To permit automatic downloads of non-EPL compatible code, override this to property to "Y" -->
- <property name="thirdPartyDownloadLicenseAcceptance" value="Y" />
-
- <property name="downloads.root" value="/home/data/httpd/download.eclipse.org/" />
- <property name="downloads.area" value="${downloads.root}/${downloads.project.root}" />
- <property name="property.file.location" location="${build.root}/promotion/promote.properties" />
-
- <!--
- most of the code comes from Athena CBI.
- see http://wiki.eclipse.org/Common_Build_Infrastructure
- -->
- <target name="check.ant-contrib" if="antContribJarUnavailable">
- <condition property="thirdPartyDownloadLicenseAcceptanceOK">
- <and>
- <isset property="thirdPartyDownloadLicenseAcceptance" />
- <or>
- <equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="Y" />
- <equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="I accept" />
- <equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="&quot;I accept&quot;" />
- </or>
- </and>
- </condition>
- <antcall target="get.ant-contrib" />
- <available file="${thirdPartyJarsDir}/ant-contrib.jar" property="antContribJarAvailable" />
- <fail unless="antContribJarAvailable">Error!
-
-Ant-Contrib is required. Download it from http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download,
-then place it in the following location. You can also redefine the path in the promote.properties file:
-
-$${thirdPartyJarsDir}/ant-contrib.jar = ${thirdPartyJarsDir}/ant-contrib.jar
-
- Or, to download this automatically, see $${relengCommonBuilderDir}/build.properties#thirdPartyDownloadLicenseAcceptance.
- </fail>
- </target>
-
- <target name="get.ant-contrib" if="thirdPartyDownloadLicenseAcceptanceOK">
- <get src="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download" dest="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" usetimestamp="true" />
- <mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" />
- <unzip src="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" dest="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" overwrite="true" />
- <mkdir dir="${thirdPartyJarsDir}" />
- <copy file="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_/ant-contrib/ant-contrib-1.0b3.jar" tofile="${thirdPartyJarsDir}/ant-contrib.jar" failonerror="true" />
- <delete dir="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" includeemptydirs="true" quiet="true" />
- <delete file="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" quiet="true" />
- </target>
-
- <target name="init">
- <condition property="antContribJarUnavailable">
- <not>
- <available file="${thirdPartyJarsDir}/ant-contrib.jar" type="file" />
- </not>
- </condition>
- <antcall target="check.ant-contrib" />
- <!-- This will fail if ant-contrib.jar cannot be found. You can install Ant-Contrib via RPM, or download it here:
- http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download
- -->
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${thirdPartyJarsDir}/ant-contrib.jar" />
- </classpath>
- </taskdef>
- <available file="${property.file.location}" property="propertyFileAvailable" />
- <fail message="property.file.location property must be defined" unless="propertyFileAvailable" />
- </target>
-
- <target name="load.properties">
- <property file="${property.file.location}" />
- </target>
-
- <target name="init.properties">
- <fail message="build.qualifier property must be defined">
- <condition>
- <not>
- <and>
- <isset property="build.qualifier" />
- <length string="${build.qualifier}" trim="true" when="greater" length="0" />
- </and>
- </not>
- </condition>
- </fail>
- <propertyregex override="true" property="build.qualifier" input="${build.qualifier}" regexp="v" replace="" casesensitive="false" />
- <fail message="version property must be defined">
- <condition>
- <not>
- <and>
- <isset property="version" />
- <length string="${version}" trim="true" when="greater" length="0" />
- </and>
- </not>
- </condition>
- </fail>
- <if>
- <and>
- <isset property="build.alias" />
- <length string="${build.alias}" trim="true" when="greater" length="0" />
- </and>
- <then>
- <property name="final.version.qualifier" value="${build.alias}" />
- </then>
- <else>
- <property name="final.version.qualifier" value="${build.qualifier}" />
- </else>
- </if>
- <fail message="build.root property must be defined" unless="build.root" />
- <fail message="downloads.area property must be defined" unless="downloads.area" />
- </target>
-
- <target name="main" depends="init,load.properties,init.properties">
- <!-- publish into drops ( Zips ) -->
- <antcall target="-publish.build.drops" inheritall="true" />
-
- <!-- publish p2 repository -->
- <antcall target="-publish.build.repository" inheritall="true" />
- </target>
-
- <target name="-publish.build.drops">
- <property name="build.drop.directory" location="${downloads.area}/downloads/drops/${version}/${build.qualifier}" />
-
- <delete dir="${build.drop.directory}" />
- <mkdir dir="${build.drop.directory}" />
-
- <!-- copy zip packages -->
- <copy todir="${build.drop.directory}">
- <fileset dir="${build.root}">
- <filename name="*.zip" />
- </fileset>
- </copy>
-
- <!-- rename UpdateSite zip package -->
- <move tofile="${build.drop.directory}/${final.updatesite.name}-${final.version.qualifier}.zip" file="${build.drop.directory}/${build.root.updatesite.name}" />
-
- <!-- genereate md5 checksums -->
- <checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
- <fileset dir="${build.drop.directory}" />
- </checksum>
-
- <fileset id="drop.resources" dir="${build.drop.directory}">
- <or>
- <type type="dir" />
- <type type="file" />
- </or>
- </fileset>
-
- <!-- chgrp -->
- <chgrp group="${group.owner}" type="both" verbose="true">
- <fileset refid="drop.resources" />
- </chgrp>
-
- </target>
-
- <target name="-publish.build.repository">
- <!-- determine the base version -->
- <propertyregex property="base.version" input="${version}" regexp="^(\d+\.\d+)\.\d+.*$" select="\1" casesensitive="false" />
-
- <!-- setup composite.repository.base and composite.type according to the build type -->
- <condition property="composite.repository.base" value="interim/${base.version}">
- <matches pattern="^I" string="${build.qualifier}" />
- </condition>
- <condition property="composite.repository.base" value="milestones/${base.version}">
- <matches pattern="^[MS]" string="${build.qualifier}" />
- </condition>
- <condition property="composite.repository.base" value="releases/${base.version}">
- <matches pattern="^R" string="${build.qualifier}" />
- </condition>
- <condition property="composite.repository.base" value="nightly/${base.version}">
- <matches pattern="^N" string="${build.qualifier}" />
- </condition>
- <condition property="composite.type" value="Interim">
- <matches pattern="^I" string="${build.qualifier}" />
- </condition>
- <condition property="composite.type" value="Milestones">
- <matches pattern="^[MS]" string="${build.qualifier}" />
- </condition>
- <condition property="composite.type" value="Releases">
- <matches pattern="^R" string="${build.qualifier}" />
- </condition>
- <condition property="composite.type" value="Nightly">
- <matches pattern="^N" string="${build.qualifier}" />
- </condition>
-
- <property name="composite.repository.directory" location="${downloads.area}/updates/${composite.repository.base}" />
- <property name="composite.repository.url" value="file:/${composite.repository.directory}" />
- <property name="build.repository.directory" location="${composite.repository.directory}/${build.qualifier}" />
- <property name="mirror.repository.path" value="${downloads.project.root}/updates/${composite.repository.base}/${build.qualifier}" />
-
- <delete dir="${build.repository.directory}" />
- <mkdir dir="${build.repository.directory}" />
-
- <!-- unzip update site to final location -->
- <unzip dest="${build.repository.directory}">
- <fileset dir="${build.root}">
- <filename name="*.zip" />
- </fileset>
- </unzip>
-
- <!-- adding p2.index -->
- <echo file="${build.repository.directory}/p2.index" message="version = 1${line.separator}metadata.repository.factory.order = content.xml,\!${line.separator}artifact.repository.factory.order = artifacts.xml,\!" />
-
- <!-- adding p2.mirrorsURL and p2.statsURI to the repository -->
- <unzip dest="${build.repository.directory}">
- <fileset file="${build.repository.directory}/artifacts.jar" />
- </unzip>
-
- <move file="${build.repository.directory}/artifacts.xml" tofile="${build.repository.directory}/artifacts.original.xml" />
-
- <xslt style="p2.xsl" in="${build.repository.directory}/artifacts.original.xml" out="${build.repository.directory}/artifacts.xml">
- <param name="mirrorsURL" expression="http://www.eclipse.org/downloads/download.php?file=${mirror.repository.path}&amp;format=xml" />
- </xslt>
-
- <zip destfile="${build.repository.directory}/artifacts.jar" basedir="${build.repository.directory}" includes="artifacts.xml" />
-
- <delete file="${build.repository.directory}/artifacts.xml" />
- <delete file="${build.repository.directory}/artifacts.original.xml" />
-
- <!-- add to composite repo -->
- <ant antfile="/shared/modeling/tools/promotion/manage-composite.xml" target="add" dir="${composite.repository.directory}">
- <property name="user.dir" value="${composite.repository.directory}" />
- <property name="child.repository" value="${build.qualifier}" />
- <property name="composite.name" value="${project.name} ${base.version} ${composite.type} Update Site" />
- </ant>
-
- <!-- add p2.index on top of composite repo is needed -->
- <if>
- <not>
- <available file="${composite.repository.directory}/p2.index" type="file" />
- </not>
- <then>
- <echo file="${composite.repository.directory}/p2.index" message="version = 1${line.separator}metadata.repository.factory.order = compositeContent.xml,\!${line.separator}artifact.repository.factory.order = compositeArtifacts.xml,\!" />
- </then>
- </if>
-
- <fileset id="repository.resources" dir="${composite.repository.directory}">
- <or>
- <filename name="compositeContent.*" />
- <filename name="compositeArtifacts.*" />
- <filename name="p2.index" />
- <filename name="${build.qualifier}/**" />
- </or>
- </fileset>
-
- <!-- chgrp -->
- <chgrp group="${group.owner}" type="both" verbose="true">
- <fileset refid="repository.resources" />
- </chgrp>
- </target>
-
-</project>
diff --git a/packaging/org.eclipse.emf.compare.update/publisher.properties b/packaging/org.eclipse.emf.compare.update/publisher.properties
index a7a288b00..d6ac5f15a 100644
--- a/packaging/org.eclipse.emf.compare.update/publisher.properties
+++ b/packaging/org.eclipse.emf.compare.update/publisher.properties
@@ -3,3 +3,4 @@ UPDATE_SITE__UNQUALIFIED_VERSION=${unqualifiedVersion}
UPDATE_SITE__QUALIFIED_VERSION=${unqualifiedVersion}.${buildQualifier}
UPDATE_SITE__ARTIFACT_NAME=${project.groupId}-${unqualifiedVersion}.${buildQualifier}.zip
UPDATE_SITE__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/packaging/org.eclipse.emf.compare.update/target/${project.groupId}-${unqualifiedVersion}.${buildQualifier}.zip
+UPDATE_SITE_EXTRAS__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/packaging/org.eclipse.emf.compare.update.extras/target/${project.groupId}.extras-${unqualifiedVersion}.${buildQualifier}.zip
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF
index f0aafa4cc..2bf6b61c1 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/META-INF/MANIFEST.MF
@@ -39,7 +39,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare.ide.ui.tests;bundle-version="4.0.0",
org.eclipse.emf.compare.uml2.rcp.ui.tests;bundle-version="2.2.0",
org.eclipse.emf.compare.uml2.ide.tests,
- org.eclipse.emf.compare.ide.ui.tests.framework
+ org.eclipse.emf.compare.ide.ui.tests.framework,
+ org.eclipse.papyrus.sysml;bundle-version="[1.0.2,2.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: %providerName
Import-Package: com.google.common.base;version="[15.0.0,22.0.0)",
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/DiffInvolvingRefineDiffInputData.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
index d0c60414e..937609a7e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/DiffInvolvingRefineDiffInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/DiffInvolvingRefineDiffInputData.java
@@ -8,14 +8,14 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.tests.merge.data;
+package org.eclipse.emf.compare.diagram.papyrus.tests.merge.sysml;
import java.io.IOException;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
+import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;
import org.eclipse.emf.ecore.resource.Resource;
-public class DiffInvolvingRefineDiffInputData extends AbstractUMLInputData {
+public class DiffInvolvingRefineDiffInputData extends DiagramInputData {
public Resource getLeft() throws IOException {
return loadFromClassLoader("left.uml"); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
index a041cc3a7..1b4c4ef8c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/MergeDiffInvolvingRefineDiffTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
-package org.eclipse.emf.compare.uml2.tests.merge;
+package org.eclipse.emf.compare.diagram.papyrus.tests.merge.sysml;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromReference;
import static org.junit.Assert.assertEquals;
@@ -24,37 +24,24 @@ import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
+import org.eclipse.emf.compare.diagram.papyrus.tests.AbstractTest;
+import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;
import org.eclipse.emf.compare.merge.BatchMerger;
import org.eclipse.emf.compare.merge.IMerger;
import org.eclipse.emf.compare.scope.DefaultComparisonScope;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLInputData;
-import org.eclipse.emf.compare.uml2.tests.AbstractUMLTest;
-import org.eclipse.emf.compare.uml2.tests.merge.data.DiffInvolvingRefineDiffInputData;
import org.eclipse.emf.ecore.resource.Resource;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@SuppressWarnings("nls")
-public class MergeDiffInvolvingRefineDiffTest extends AbstractUMLTest {
+public class MergeDiffInvolvingRefineDiffTest extends AbstractTest {
private DiffInvolvingRefineDiffInputData input = new DiffInvolvingRefineDiffInputData();
- @BeforeClass
- public static void setupClass() {
- fillRegistries();
- }
-
- @AfterClass
- public static void teardownClass() {
- resetRegistries();
- }
-
@Override
- protected AbstractUMLInputData getInput() {
+ protected DiagramInputData getInput() {
return input;
}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/left.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/left.uml
index 4dc2db493..4dc2db493 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/left.uml
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/left.uml
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/right.uml b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/right.uml
index 95c24d60b..95c24d60b 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/data/right.uml
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/sysml/right.uml
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java
index 2d7bca99c..fc867dcb8 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/suite/AllTests.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.compare.diagram.papyrus.tests.groups.PapyrusConflictsGrou
import org.eclipse.emf.compare.diagram.papyrus.tests.merge.AssocMergeTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.merge.EdgeMergeTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.merge.NodeMergeTest;
+import org.eclipse.emf.compare.diagram.papyrus.tests.merge.sysml.MergeDiffInvolvingRefineDiffTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.modelextension.ModelExtensionUtilTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.saveparameter.SaveParameterHookIntegrationTest;
import org.eclipse.emf.compare.diagram.papyrus.tests.saveparameter.SaveParameterHookTest;
@@ -56,7 +57,7 @@ import junit.textui.TestRunner;
SaveParameterHookTest.class, SaveParameterHookIntegrationTest.class, URIAttachmentTest.class,
DiagramTooltipProviderTest.class, PapyrusConflictsGroupProviderTests.class,
IgnoreDiFilePostProcessorTest.class, PapyrusContextUtilTest.class,
- MergeNonConflictingCascadingFilterTest.class })
+ MergeNonConflictingCascadingFilterTest.class, MergeDiffInvolvingRefineDiffTest.class, })
public class AllTests {
/**
diff --git a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java
index 8c996d829..2ede0f3fe 100644
--- a/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java
+++ b/plugins/org.eclipse.emf.compare.egit.ui/src/org/eclipse/emf/compare/egit/ui/internal/logical/SingleRepositoryMinimizer.java
@@ -136,7 +136,7 @@ public class SingleRepositoryMinimizer implements IModelMinimizer {
* @return repository or null if no associated repository can be found.
*/
public static Repository getRepository(IStorage storage) {
- IFile file = storage.getAdapter(IFile.class);
+ IFile file = (IFile)storage.getAdapter(IFile.class);
if (file != null) {
return getRepository(file);
}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
index 219a5ee18..b335312a6 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests.git.framework/META-INF/MANIFEST.MF
@@ -12,15 +12,15 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jgit;bundle-version="4.1.0",
org.eclipse.core.resources,
org.eclipse.egit.core;bundle-version="4.1.0",
- org.eclipse.ui.ide;bundle-version="3.11.0",
- org.eclipse.team.core;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0",
+ org.eclipse.team.core;bundle-version="3.5.0",
org.eclipse.emf.compare.ide.ui;bundle-version="3.1.0",
org.eclipse.emf.compare.rcp,
org.eclipse.compare,
org.eclipse.emf.compare.ide.ui.tests.framework,
org.eclipse.jface,
org.eclipse.emf.compare.egit,
- org.eclipse.team.ui;bundle-version="3.7.200"
+ org.eclipse.team.ui;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
index ddee781ad..e3234e31a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.compare.uml2.edit,
org.eclipse.emf.compare.edit,
org.eclipse.emf.compare.ide.ui.tests.framework,
- org.eclipse.emf.compare.ide;bundle-version="3.3.0",
- org.eclipse.papyrus.sysml;bundle-version="[1.0.2,2.0.0)"
+ org.eclipse.emf.compare.ide;bundle-version="3.3.0"
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)",
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java
index 8d790448d..752546d66 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/suite/AllTests.java
@@ -39,7 +39,6 @@ import org.eclipse.emf.compare.uml2.tests.implications.ImplicationsTransitionTes
import org.eclipse.emf.compare.uml2.tests.include.AddIncludeTest;
import org.eclipse.emf.compare.uml2.tests.merge.ExtensionMergeTest;
import org.eclipse.emf.compare.uml2.tests.merge.InstanceSpecificationClassifiersMergeTest;
-import org.eclipse.emf.compare.uml2.tests.merge.MergeDiffInvolvingRefineDiffTest;
import org.eclipse.emf.compare.uml2.tests.message.AddMessageTest;
import org.eclipse.emf.compare.uml2.tests.message.bug507177.AddMessageSubDiffTest;
import org.eclipse.emf.compare.uml2.tests.multiplicitychanges.MultiplicityElementChangesTest;
@@ -82,10 +81,9 @@ import junit.textui.TestRunner;
ImplicationsTransitionTest.class, ImplicationsInterfaceRealizationTest.class,
StaticStereotypedElementItemProviderTest.class, DynamicStereotypedElementItemProviderTest.class,
OpaqueElementBodyChangeDiffTest.class, OpaqueElementBodyChangeMergeTest.class,
- DanglingStereotypeApplicationTest.class, MergeDiffInvolvingRefineDiffTest.class,
- TestNonRegPseudoConflict_484576.class, RemoveStereotypeApplicationPseudoConflictTest.class,
- MultiplicityElementChangesTest.class, InstanceSpecificationClassifiersMergeTest.class,
- AddMessageSubDiffTest.class, })
+ DanglingStereotypeApplicationTest.class, TestNonRegPseudoConflict_484576.class,
+ RemoveStereotypeApplicationPseudoConflictTest.class, MultiplicityElementChangesTest.class,
+ InstanceSpecificationClassifiersMergeTest.class, AddMessageSubDiffTest.class, })
public class AllTests {
/**

Back to the top