Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.emf.compare-parent')
-rw-r--r--org.eclipse.emf.compare-parent/pom.xml10
-rwxr-xr-xorg.eclipse.emf.compare-parent/releng/profiles-list.sh2
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target5
-rw-r--r--org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd11
4 files changed, 2 insertions, 26 deletions
diff --git a/org.eclipse.emf.compare-parent/pom.xml b/org.eclipse.emf.compare-parent/pom.xml
index 27cf40962..695107db0 100644
--- a/org.eclipse.emf.compare-parent/pom.xml
+++ b/org.eclipse.emf.compare-parent/pom.xml
@@ -473,7 +473,7 @@
</build>
</profile>
<!--
- The "extras" profiles can be used to build the supports for external tools such as Sirius and Papyrus.
+ The "extras" profiles can be used to build the supports for external tools such as Sirius.
You will need to activate both the "extra-modules" profile and one of the "<platform_name>-extras" profiles.
-->
<profile>
@@ -481,14 +481,6 @@
<modules>
<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.papyrus</module>
- <module>../plugins/org.eclipse.emf.compare.diagram.papyrus.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>
diff --git a/org.eclipse.emf.compare-parent/releng/profiles-list.sh b/org.eclipse.emf.compare-parent/releng/profiles-list.sh
index 4fbfe5c1c..9f5261dfc 100755
--- a/org.eclipse.emf.compare-parent/releng/profiles-list.sh
+++ b/org.eclipse.emf.compare-parent/releng/profiles-list.sh
@@ -35,7 +35,7 @@ SUPPORTED_PLATFORMS="luna kepler juno indigo helios galileo"
GALILEO_PROFILES="core,ui,diagram"
HELIOS_PROFILES="$GALILEO_PROFILES"
INDIGO_PROFILES="$HELIOS_PROFILES"
-JUNO_PROFILES="$INDIGO_PROFILES,ecoretools,papyrus"
+JUNO_PROFILES="$INDIGO_PROFILES,ecoretools"
KEPLER_PROFILES="$JUNO_PROFILES"
LUNA_PROFILES="$KEPLER_PROFILES,update,sign"
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
index 1bf60ba8b..268a88a8c 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.target
@@ -34,7 +34,6 @@
<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.feature.group" 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"/>
@@ -44,9 +43,5 @@
<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.sysml14" version="0.0.0"/>
- <repository id="sysml" location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14"/>
- </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
index f200537be..de192d831 100644
--- a/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
+++ b/org.eclipse.emf.compare-parent/targetPlatforms/extras/oxygen-extras-sdk.tpd
@@ -11,14 +11,3 @@ location "http://download.eclipse.org/sirius/updates/nightly/latest/oxygen" {
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
-}
-
-//required for Compare test ProfileMigrationTest
-location sysml "http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14" {
- org.eclipse.papyrus.sysml14 lazy
-} \ No newline at end of file

Back to the top