Bug 540517 - [Releng] [2018-09] Add a new target platform for 2018-09
- Add a new target platform
- Update references to 2018-09
- Removed the RCPTT tests until RCPTT supports 4.9
Change-Id: I1e4de3867f43cb9409e8387c2a8d52b945549f06
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/README.md b/README.md
index 702dc94..78d87dd 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@
### Building against a specific Eclipse Release ###
-By default SysML14 is build against latest stable Eclipse Release Train (Photon).
+By default SysML14 is build against latest stable Eclipse Release Train (2018-09).
### Building for Eclipser server ###
@@ -73,7 +73,7 @@
Have a look to src/site/xdoc/developer/normRequirementExtraction.xml
## Hudson CI
-Build Status : 
+Build Status : 
### How to change version ###
diff --git a/pom.xml b/pom.xml
index 7f5c17b..d53232a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,12 +35,12 @@
<component.rcp.name>org.eclipse.papyrus.sysml14.rcp</component.rcp.name>
<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/0.8.0_papyrus-sysml-mars_190/</component.apibaseline.url>
<component.servicetype>org.eclipse.papyrus.sysml14.service.types</component.servicetype>
- <eclipse.targetrelease>photon</eclipse.targetrelease>
+ <eclipse.targetrelease>2018-09</eclipse.targetrelease>
<target.version>${project.version}</target.version>
<sonar.exclusions>**/src-gen/**</sonar.exclusions>
<!-- Override Components properties -->
- <rcptt-runner-version>2.3.0-M6c</rcptt-runner-version>
+ <rcptt-runner-version>2.3.0</rcptt-runner-version>
</properties>
<mailingLists>
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/category.xml b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
index 1f75fa5..6b0e731 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/category.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
@@ -11,5 +11,5 @@
Papyrus SysML Category
</description>
</category-def>
- <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon/" enabled="true" />
+ <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09/" enabled="true" />
</site>
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
index 4677089..48c1f1c 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
@@ -31,10 +31,10 @@
<project.website>https://www.eclipse.org/papyrus/components/sysml</project.website>
<project.issues>${project.issueManagement.url}</project.issues>
<eclipse.target>${eclipse.targetrelease}</eclipse.target>
- <update.site.nightly>https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml-photon/ws/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</update.site.nightly>
+ <update.site.nightly>https://ci.eclipse.org/papyrus/job/papyrus-sysml-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</update.site.nightly>
</symbols>
<associateSites>
- <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon</site>
+ <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09</site>
</associateSites>
<siteTemplateFolder>siteTemplate</siteTemplateFolder>
<p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
diff --git a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
index 64fb7f4..b253ea9 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
@@ -141,7 +141,7 @@
<repositories>
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/" enabled="true" />
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon" enabled="true" />
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/pom.xml b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/pom.xml
index d9f0e03..e5c1590 100755
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/pom.xml
@@ -33,6 +33,7 @@
<plugin>
<groupId>org.eclipse.rcptt</groupId>
<artifactId>rcptt-maven-plugin</artifactId>
+ <version>2.3.0</version>
<extensions>true</extensions>
</plugin>
</plugins>
diff --git a/releng/pom.xml b/releng/pom.xml
index bd6f80e..0f4ba75 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -16,6 +16,15 @@
</modules>
<profiles>
+ <profile>
+ <id>p2</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>org.eclipse.papyrus.sysml14.p2</module>
+ </modules>
+ </profile>
<profile>
<id>product</id>
<activation>
@@ -26,7 +35,8 @@
<module>org.eclipse.papyrus.sysml14.rcp</module>
<module>org.eclipse.papyrus.sysml14.rcp.feature</module>
<module>org.eclipse.papyrus.sysml14.product</module>
- <module>org.eclipse.papyrus.sysml14.rcptt.tests</module>
+ <!-- RCPTT cannot be launched against the 4.9 platform - Bug 538719 -->
+ <!--module>org.eclipse.papyrus.sysml14.rcptt.tests</module-->
</modules>
</profile>
</profiles>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.project b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.project
new file mode 100755
index 0000000..787115b
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.sysml14.targetplatform.2018-09</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.settings/org.eclipse.core.resources.prefs
new file mode 100755
index 0000000..99f26c0
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.target b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.target
new file mode 100755
index 0000000..0055511
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.target
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Papyrus 2018-09" sequenceNumber="1540803407">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
+ <repository id="eclipse-2018-09" location="http://download.eclipse.org/releases/2018-09/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+ <repository id="eclipse-license" location="http://download.eclipse.org/cbi/updates/license/"/>
+ </location>
+ </locations>
+</target>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.tpd b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.tpd
new file mode 100755
index 0000000..762ea2c
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/org.eclipse.papyrus.sysml14.targetplatform.2018-09.tpd
@@ -0,0 +1,17 @@
+target "Papyrus 2018-09" with source requirements
+
+location "http://download.eclipse.org/releases/2018-09/" eclipse-2018-09 {
+ org.eclipse.platform.feature.group lazy
+ org.eclipse.rcp.feature.group lazy
+ org.eclipse.jdt.feature.group lazy
+ org.eclipse.equinox.p2.discovery.feature.feature.group lazy
+ org.eclipse.equinox.executable.feature.group lazy
+ org.eclipse.ocl.uml.feature.group lazy
+ org.eclipse.papyrus.sdk.feature.feature.group lazy
+ org.eclipse.papyrus.views.properties.model.xwt lazy
+}
+
+
+location "http://download.eclipse.org/cbi/updates/license/" eclipse-license {
+ org.eclipse.license.feature.group lazy
+}
\ No newline at end of file
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/pom.xml b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/pom.xml
new file mode 100755
index 0000000..ea4572e
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.2018-09/pom.xml
@@ -0,0 +1,13 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>org.eclipse.papyrus.sysml14.targetplatform</artifactId>
+ <groupId>org.eclipse.papyrus.sysml</groupId>
+ <version>1.3.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.sysml14.targetplatform.2018-09</artifactId>
+ <packaging>eclipse-target-definition</packaging>
+ <name>org.eclipse.papyrus.sysml14.targetplatform.2018-09</name>
+ <description>This plug-in contains the target definition for Papyrus SysML in 2018-09.</description>
+</project>
\ No newline at end of file
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index e6be1a8..265f47f 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -15,12 +15,21 @@
<profile>
<id>photon</id>
<activation>
- <activeByDefault>true</activeByDefault>
+ <activeByDefault>false</activeByDefault>
</activation>
<modules>
<module>org.eclipse.papyrus.sysml14.targetplatform.photon</module>
</modules>
</profile>
+ <profile>
+ <id>2018-09</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>org.eclipse.papyrus.sysml14.targetplatform.2018-09</module>
+ </modules>
+ </profile>
</profiles>
</project>
\ No newline at end of file
