Bug 544807: [Interoperability][SysML1.4] Migrate the tranformation to
Photon, 2018-09 and 2018-12
- Manage the SysML1.4 feature as requires instead of include (to avoid
possible installation)
Change-Id: I7375439348b6b2eb3f7ed7f949adea2cf50bf6e0
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
diff --git a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
index 1ece7d5..888a9e2 100644
--- a/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
+++ b/sysml14/features/org.eclipse.papyrus.interoperability.sysml14.sysml.feature/feature.xml
@@ -17,11 +17,11 @@
<license url="%licenseURL">
%license
</license>
-
- <includes
- id="org.eclipse.papyrus.sysml14.feature"
- version="0.0.0"/>
-
+
+ <requires>
+ <import feature="org.eclipse.papyrus.sysml14.feature" version="0.0.0" match="compatible"/>
+ </requires>
+
<plugin
id="org.eclipse.papyrus.uml.m2m.qvto.common"
download-size="0"
@@ -35,21 +35,21 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.papyrus.sysml"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.papyrus.sysml.nattable.allocation.config"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.papyrus.sysml.nattable.requirement.config"
download-size="0"
@@ -70,13 +70,12 @@
install-size="0"
version="0.0.0"
unpack="false"/>
-
+
<plugin
id="org.eclipse.papyrus.interoperability.sysml14.sysml.doc"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
-
</feature>
diff --git a/sysml14/pom.xml b/sysml14/pom.xml
index 5c6e276..824cfd1 100755
--- a/sysml14/pom.xml
+++ b/sysml14/pom.xml
@@ -19,6 +19,17 @@
<module>features</module>
<module>plugins</module>
</modules>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.jboss.tools.tycho-plugins</id>
+ <url>https://repository.jboss.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <properties>
+ <jboss.utils.version>1.3.0</jboss.utils.version>
+ </properties>
<profiles>
<profile>
@@ -50,6 +61,7 @@
<id>oxygen</id>
<properties>
<version>oxygen</version>
+ <sysml14-update-side>https://hudson.eclipse.org/papyrus/job/papyrus-sysml-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</sysml14-update-side>
</properties>
</profile>
@@ -57,6 +69,7 @@
<id>photon</id>
<properties>
<version>photon</version>
+ <sysml14-update-side>http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/photon</sysml14-update-side>
</properties>
</profile>
@@ -64,6 +77,7 @@
<id>2018-09</id>
<properties>
<version>2018-09</version>
+ <sysml14-update-side>http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09</sysml14-update-side>
</properties>
</profile>
@@ -71,6 +85,7 @@
<id>2018-12</id>
<properties>
<version>2018-12</version>
+ <sysml14-update-side>http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/2018-09</sysml14-update-side>
</properties>
</profile>
diff --git a/sysml14/releng/targetplatforms/org.eclipse.papyrus.interoperability.sysml14.sysml.main.targetplatform.photon.portable/pom.xml b/sysml14/releng/targetplatforms/org.eclipse.papyrus.interoperability.sysml14.sysml.main.targetplatform.photon.portable/pom.xml
index 7c660b2..95d907b 100644
--- a/sysml14/releng/targetplatforms/org.eclipse.papyrus.interoperability.sysml14.sysml.main.targetplatform.photon.portable/pom.xml
+++ b/sysml14/releng/targetplatforms/org.eclipse.papyrus.interoperability.sysml14.sysml.main.targetplatform.photon.portable/pom.xml
@@ -14,5 +14,5 @@
<packaging>eclipse-target-definition</packaging>
<name>Interoperability SysML1.4 Photon Target Definition</name>
<description>This plug-in contains the target definition for Papyrus Interoperability SysML1.4 in Photon</description>
-
+
</project>
\ No newline at end of file
diff --git a/sysml14/releng/targetplatforms/pom.xml b/sysml14/releng/targetplatforms/pom.xml
index d14f0c2..64e7def 100644
--- a/sysml14/releng/targetplatforms/pom.xml
+++ b/sysml14/releng/targetplatforms/pom.xml
@@ -12,6 +12,41 @@
<artifactId>org.eclipse.papyrus.interoperability.sysml14.sysml.targetplatforms</artifactId>
<packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.jboss.tools.tycho-plugins</groupId>
+ <artifactId>repository-utils</artifactId>
+ <version>${jboss.utils.version}</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>generate-repository-facade</goal>
+ </goals>
+ <configuration>
+ <!-- do not generate the pesky web folder and index.html -->
+ <skipWebContentGeneration>true</skipWebContentGeneration>
+ <!-- p2 update site transitive dependencies repositories -->
+ <associateSites>
+ <site>${sysml14-update-side}</site>
+ </associateSites>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
