[Releng] Update target platform and feature version number
Change-Id: I8dbd42181c361dafa91030866a9c87e63ecbb511
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF b/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
index b41b092..3705397 100644
--- a/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
+++ b/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
@@ -67,7 +67,8 @@
org.eclipse.papyrus.uml.modelexplorer;bundle-version="[3.1.0,4.0.0)",
org.eclipse.papyrus.infra.nattable.modelexplorer;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="[2.0.0,3.0.0)",
- org.apache.xerces;bundle-version="[2.9.0,3.0.0)"
+ org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.25.0,3.0.0)"
Export-Package: org.eclipse.papyrus.sysml16.architecture,
org.eclipse.papyrus.sysml16.architecture.internal;x-internal:=true,
org.eclipse.papyrus.sysml16.architecture.util
diff --git a/pom.xml b/pom.xml
index 4fc5ec9..0951699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,13 +29,13 @@
<tycho.scmUrl>${project.scm.connection}</tycho.scmUrl>
<!-- platform specific properties -->
- <eclipse.targetrelease>2021-03</eclipse.targetrelease>
+ <eclipse.targetrelease>2021-09</eclipse.targetrelease>
<target.version>2.0.0-SNAPSHOT</target.version>
<target.groupId>org.eclipse.papyrus.sysml</target.groupId>
<target.artifactId>org.eclipse.papyrus.sysml16.targetplatform</target.artifactId>
- <tycho.version>2.0.0</tycho.version>
- <tychoExtras.version>2.0.0</tychoExtras.version>
+ <tycho.version>2.2.0</tycho.version>
+ <tychoExtras.version>2.2.0</tychoExtras.version>
<xtext.version>2.23.0</xtext.version>
<maven.resources.version>3.2.0</maven.resources.version>
<maven.clean.version>3.1.0</maven.clean.version>
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/category.xml b/releng/org.eclipse.papyrus.sysml16.p2/category.xml
index f40ef43..e1ef316 100644
--- a/releng/org.eclipse.papyrus.sysml16.p2/category.xml
+++ b/releng/org.eclipse.papyrus.sysml16.p2/category.xml
@@ -20,5 +20,5 @@
Papyrus SysML 1.6 Category
</description>
</category-def>
- <repository-reference location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/" enabled="true" />
+ <repository-reference location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09/" enabled="true" />
</site>
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
index 8e4e891..bedb069 100644
--- a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
@@ -39,7 +39,7 @@
<update.site.nightly>https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml16.p2/target/repository/</update.site.nightly>
</symbols>
<associateSites>
- <site>https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03</site>
+ <site>https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09</site>
</associateSites>
<p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
</configuration>
diff --git a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
index 83f9740..68e67be 100644
--- a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
@@ -44,6 +44,7 @@
</win>
</launcher>
+
<vm>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>
@@ -121,15 +122,14 @@
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
- <property name="org.eclipse.update.reconcile" value="false" />
- <property name="osgi.bundles.defaultStartLevel" value="4" />
- <property name="osgi.requiredJavaVersion" value="11" />
<property name="osgi.instance.area.default" value="@user.home/workspace-papyrus-sysml" />
+ <property name="org.eclipse.update.reconcile" value="false" />
+ <property name="osgi.requiredJavaVersion" value="11" />
+ <property name="osgi.bundles.defaultStartLevel" value="4" />
</configurations>
<repositories>
- <repository location="http://https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03" enabled="true" />
- <repository location="http://https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03" enabled="true" />
+ <repository location="http://https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
index b6bca30..848ccf0 100755
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="SysML 1.6 - 2021-03" sequenceNumber="1627050618">
+<target name="SysML 1.6 - 2021-09" sequenceNumber="1631881214">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,7 +10,7 @@
<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"/>
- <repository id="eclipse-2021-03" location="http://download.eclipse.org/releases/2021-03/"/>
+ <repository id="eclipse-2021-09" location="http://download.eclipse.org/releases/2021-09/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -20,11 +20,15 @@
<unit id="org.eclipse.papyrus.junit.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
- <repository id="Papyrus-2021-03" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/"/>
+ <repository id="Papyrus-2021-09" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
+ <repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
</locations>
</target>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
index a902a0e..d90dc28 100644
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
@@ -1,6 +1,6 @@
-target "SysML 1.6 - 2021-03" with source requirements
+target "SysML 1.6 - 2021-09" with source requirements
-location "http://download.eclipse.org/releases/2021-03/" eclipse-2021-03 {
+location "http://download.eclipse.org/releases/2021-09/" eclipse-2021-09 {
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -13,12 +13,16 @@
org.eclipse.license.feature.group lazy
}
-location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/" Papyrus-2021-03 {
+location "https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-09/" Papyrus-2021-09 {
org.eclipse.papyrus.junit.feature.feature.group lazy
org.eclipse.papyrus.sdk.feature.feature.group lazy
org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
}
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/" {
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/" {
org.apache.xerces [2.9.0, 2.10.0)
}
+
+location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
+ org.eclipse.xwt.feature.feature.group lazy
+}
\ No newline at end of file
