[Releng] Add Papyrus Software Designer features
Change-Id: I45b3b61a3946a00f777b95f187355daf5ebbd194
Signed-off-by: Shuai Li <shuai.li@cea.fr>
diff --git a/org.eclipse.papyrus.iotml.targetplatform.photon/org.eclipse.papyrus.iotml.targetplatform.photon.target b/org.eclipse.papyrus.iotml.targetplatform.photon/org.eclipse.papyrus.iotml.targetplatform.photon.target
index 92b42d2..adb7227 100644
--- a/org.eclipse.papyrus.iotml.targetplatform.photon/org.eclipse.papyrus.iotml.targetplatform.photon.target
+++ b/org.eclipse.papyrus.iotml.targetplatform.photon/org.eclipse.papyrus.iotml.targetplatform.photon.target
@@ -70,9 +70,10 @@
<unit id="org.eclipse.papyrus.sysml14.feature.feature.group" version="0.0.0"/>
<repository id="papyrus-sysml14-photon" location="https://ci.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml14-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/"/>
</location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.papyrus.moka.feature.feature.group" version="0.0.0"/>
- <repository id="moka-photon" location="https://hudson.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository"/>
+ <unit id="org.eclipse.papyrus.moka.animation" version="0.0.0"/>
+ <repository id="moka" location="http://download.eclipse.org/modeling/mdt/papyrus/components/moka/2019-03/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.infra.gmfdiag.layers.feature.feature.group" version="0.0.0"/>
@@ -82,15 +83,32 @@
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
<repository id="papyrus-toolsmith" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03/"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
<repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.papyrus.designer.components.main.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.designer.languages.common.feature.feature.group" version="0.0.0"/>
- <repository id="swdesigner" location="https://ci.eclipse.org/papyrus/job/papyrus-designer-photon/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/"/>
+ <unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.designer.languages.java.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.designer.transformation.main.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.designer.monitoring.feature.feature.group" version="0.0.0"/>
+ <repository id="papyrus-sw-designer" location="https://ci.eclipse.org/papyrus/job/papyrus-designer-2019-06/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.designer.p2/target/repository/"/>
</location>
+ <!--<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.oneclicklabs.java.restful.feature.group" version="0.0.0"/>
+ <repository id="restful-eclipse" location="https://devxchangeio.github.io/java-restful-feature/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.nebula.feature.feature.group" version="0.0.0"/>
+ <repository id="nebula" location="https://download.eclipse.org/nebula/snapshot/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.jetty.bundles.f.feature.group" version="0.0.0"/>
+ <repository id="jetty" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+ </location>-->
</locations>
</target>
diff --git a/pom.xml b/pom.xml
index fa08af5..c689e97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.papyrus.components</groupId>
- <artifactId>org.eclipse.papyrus.components.parent</artifactId>
- <version>0.0.23</version>
- </parent>
-
<groupId>org.eclipse.papyrus.iotml</groupId>
<artifactId>org.eclipse.papyrus.iotml.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
@@ -19,20 +13,6 @@
<url>https://eclipse.org/papyrus/components/${component.shortname}/</url>
<inceptionYear>2018</inceptionYear>
- <modules>
- <module>org.eclipse.papyrus.iotml.profile</module>
- <module>org.eclipse.papyrus.iotml.library</module>
- <!--<module>org.eclipse.papyrus.iotml.profile.tests</module>-->
- <module>org.eclipse.papyrus.iotml.architecture</module>
- <!--<module>org.eclipse.papyrus.iotml.architecture.tests</module>-->
- <module>org.eclipse.papyrus.iotml.examples</module>
- <module>org.eclipse.papyrus.iotml.ui</module>
- <module>org.eclipse.papyrus.iotml.feature</module>
- <module>org.eclipse.papyrus.iotml.targetplatform.photon</module>
- <module>addons</module>
- <module>releng</module>
- </modules>
-
<properties>
<component.shortname>iotml</component.shortname>
<component.fullartifactId>org.eclipse.papyrus.iotml</component.fullartifactId>
@@ -42,14 +22,33 @@
<component.rcp.name>org.eclipse.papyrus.iotml.rcp</component.rcp.name>
<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/iotml</component.apibaseline.url>
<component.servicetype>org.eclipse.papyrus.iotml.service.types</component.servicetype>
- <eclipse.targetrelease>photon</eclipse.targetrelease>
- <target.version>${project.version}</target.version>
- <sonar.exclusions>**/src-gen/**</sonar.exclusions>
+ <tycho.version>1.7.0</tycho.version>
+ <tychoExtrasVersion>1.7.0</tychoExtrasVersion>
+ <maven.resources.version>3.1.0</maven.resources.version>
+ <maven.clean.version>3.1.0</maven.clean.version>
+ <maven.compiler.version>3.8.0</maven.compiler.version>
+ <java.source.version>11.0</java.source.version>
+ <java.target.version>11.0</java.target.version>
+ <jboss.utils.version>1.7.0</jboss.utils.version>
</properties>
+ <modules>
+ <module>org.eclipse.papyrus.iotml.profile</module>
+ <module>org.eclipse.papyrus.iotml.library</module>
+ <!--<module>org.eclipse.papyrus.iotml.profile.tests</module> -->
+ <module>org.eclipse.papyrus.iotml.architecture</module>
+ <!--<module>org.eclipse.papyrus.iotml.architecture.tests</module> -->
+ <module>org.eclipse.papyrus.iotml.examples</module>
+ <module>org.eclipse.papyrus.iotml.ui</module>
+ <module>org.eclipse.papyrus.iotml.feature</module>
+ <module>org.eclipse.papyrus.iotml.targetplatform.photon</module>
+ <module>addons</module>
+ <module>releng</module>
+ </modules>
+
<ciManagement>
- <system>Hudson</system>
- <url>https://hudson.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
+ <system>Jenkins</system>
+ <url>https://ci.eclipse.org/papyrus/view/${component.hudson.tabname}/</url>
</ciManagement>
<issueManagement>
<url>https://bugs.eclipse.org/bugs/buglist.cgi?product=Papyrus&component=${component.bugzilla.name}</url>
@@ -58,24 +57,35 @@
<licenses>
<license>
- <name>Eclipse Public License</name>
- <url>https://www.eclipse.org/legal/epl-v10.html</url>
+ <name>Eclipse Public License - v 2.0</name>
+ <url>https://www.eclipse.org/legal/epl-v20.html</url>
<distribution>repo</distribution>
</license>
</licenses>
- <repositories>
- <repository>
- <id>pap.repo.eclipse.org</id>
- <name>Papyrus Repository - Releases</name>
- <url>https://repo.eclipse.org/content/repositories/papyrus-releases/</url>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>central</id>
+ <name>Central Repository</name>
+ <url>https://repo.maven.apache.org/maven2</url>
<releases>
<enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>tycho-snapshots</id>
+ <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <repositories>
+ <repository>
+ <id>license-feature</id>
+ <url>http://download.eclipse.org/cbi/updates/license/</url>
+ <layout>p2</layout>
</repository>
</repositories>
@@ -88,25 +98,113 @@
<version>1.2.0</version>
<executions>
<execution>
- <id>source-feature</id>
+ <id>source-feature</id>
<phase>package</phase>
<goals>
<goal>source-feature</goal>
</goals>
<configuration>
<excludes>
- <feature id="org.eclipse.papyrus.sysml14.feature"/>
- <feature id="org.eclipse.papyrus.infra.gmfdiag.layers.feature"/>
- <feature id="org.eclipse.papyrus.toolsmiths.feature"/>
- <feature id="org.eclipse.papyrus.marte.main.feature"/>
- <feature id="org.eclipse.papyrus.moka.feature"/>
+ <feature id="org.eclipse.papyrus.sysml14.feature" />
+ <feature
+ id="org.eclipse.papyrus.infra.gmfdiag.layers.feature" />
+ <feature id="org.eclipse.papyrus.marte.main.feature" />
+ <feature id="org.eclipse.papyrus.moka.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.components.main.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.languages.common.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.languages.cpp.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.languages.java.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.transformation.main.feature" />
+ <feature
+ id="org.eclipse.papyrus.designer.monitoring.feature" />
</excludes>
</configuration>
- </execution>
+ </execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven.compiler.version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven.resources.version}</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>${maven.clean.version}</version>
+ </plugin>
+
+ <!-- Integration between Tycho and Maven -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-maven-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <!-- Tycho compiler -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-compiler-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <source>${java.source.version}</source>
+ <target>${java.target.version}</target>
+ <optimize>true</optimize>
+ <showWarnings>true</showWarnings>
+ <!-- Tycho build using the project's JDT settings. -->
+ <useProjectSettings>true</useProjectSettings>
+ </configuration>
+ </plugin>
+
+ <!-- Target platform based build -->
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ <target>
+ <artifact>
+ <groupId>${component.fullartifactId}</groupId>
+ <artifactId>org.eclipse.papyrus.iotml.targetplatform.photon</artifactId>
+ <version>${project.version}</version>
+ </artifact>
+ </target>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
diff --git a/releng/org.eclipse.papyrus.iotml.p2/pom.xml b/releng/org.eclipse.papyrus.iotml.p2/pom.xml
index 7c53f64..f638a12 100644
--- a/releng/org.eclipse.papyrus.iotml.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.iotml.p2/pom.xml
@@ -10,12 +10,19 @@
<artifactId>org.eclipse.papyrus.iotml.p2</artifactId>
<packaging>eclipse-repository</packaging>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>org.jboss.tools.tycho-plugins</id>
+ <url>https://repository.jboss.org/</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
<groupId>org.jboss.tools.tycho-plugins</groupId>
<artifactId>repository-utils</artifactId>
- <version>0.26.0</version>
+ <version>${jboss.utils.version}</version>
<executions>
<execution>
<phase>package</phase>
@@ -30,40 +37,20 @@
<update.site.version>${project.version}</update.site.version>
<project.website>https://git.eclipse.org/c/papyrus/org.eclipse.papyrus-iotml.git</project.website>
<project.issues>https://bugs.eclipse.org/bugs/</project.issues>
- <eclipse.target>${eclipse.targetrelease}</eclipse.target>
</symbols>
<!--<siteTemplateFolder>siteTemplate</siteTemplateFolder>-->
<p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
<!-- p2 update site transitive dependencies repositories -->
<associateSites>
- <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon/" enabled="true"</site>
<site>https://hudson.eclipse.org/papyrus/job/papyrus-marte-oxygen/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.marte.p2/target/repository/</site>
<site>https://hudson.eclipse.org/papyrus/view/Moka/job/papyrus-moka-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.moka.p2/target/repository/</site>
- <site>https://hudson.eclipse.org/papyrus/job/Papyrus-Oxygen-Developer/lastSuccessfulBuild/artifact/repository/</site>
<site>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases/</site>
- <site>http://download.eclipse.org/releases/oxygen/</site>
- <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/</site>
<site>http://download.eclipse.org/xwt/updates</site>
</associateSites>
</configuration>
</execution>
</executions>
- <!-- components dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-packaging-plugin</artifactId>
- <version>${tycho-version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
</plugins>
</build>
diff --git a/releng/org.eclipse.papyrus.iotml.product/papyrusIotml.product b/releng/org.eclipse.papyrus.iotml.product/papyrusIotml.product
index 70b800b..1cc24e7 100644
--- a/releng/org.eclipse.papyrus.iotml.product/papyrusIotml.product
+++ b/releng/org.eclipse.papyrus.iotml.product/papyrusIotml.product
@@ -194,7 +194,16 @@
<feature id="org.eclipse.papyrus.iotml.feature" installMode="root"/>
<feature id="org.eclipse.papyrus.iotml.rcp.feature" installMode="root"/>
<feature id="org.eclipse.papyrus.iotml.wot.td.feature" installMode="root"/>
- <feature id="org.eclipse.emf.compare"/>
+ <feature id="org.eclipse.papyrus.designer.components.main.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.languages.common.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.languages.cpp.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.languages.java.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.transformation.main.feature" installMode="root"/>
+ <feature id="org.eclipse.papyrus.designer.monitoring.feature" installMode="root"/>
+ <!--<feature id="org.oneclicklabs.java.restful" installMode="root"/>
+ <feature id="org.eclipse.nebula.feature" installMode="root"/>
+ <feature id="org.eclipse.jetty.bundles.f" installMode="root"/>-->
+ <feature id="org.eclipse.emf.compare"/>
<feature id="org.eclipse.emf.compare.diagram.gmf"/>
<feature id="org.eclipse.emf.compare.egit"/>
<feature id="org.eclipse.emf.compare.ide.ui"/>
diff --git a/releng/org.eclipse.papyrus.iotml.product/pom.xml b/releng/org.eclipse.papyrus.iotml.product/pom.xml
index f004216..9a073f6 100644
--- a/releng/org.eclipse.papyrus.iotml.product/pom.xml
+++ b/releng/org.eclipse.papyrus.iotml.product/pom.xml
@@ -19,13 +19,15 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho.version}</version>
<configuration>
<includeAllDependencies>true</includeAllDependencies>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
+ <version>${tycho.version}</version>
<configuration>
<profile>org.eclipse.papyrus.iotml</profile>
<formats>
@@ -54,13 +56,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
