Bug 571439 - [SysML1.6] RCP for SysML 1.6 could embed a JRE to be more
self-standing
Change-Id: I733bfd8e8049b7bc2bcdcfe56a03014a9159b8f3
Signed-off-by: Florian NOYRIT <florian.noyrit@cea.fr>
Also-by: Pauline DEVILLE <pauline.deville@cea.fr>
diff --git a/pom.xml b/pom.xml
index fa433b1..212bbd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,6 +195,7 @@
<arch>x86_64</arch>
</environment>
</environments>
+ <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
<target>
<artifact>
<groupId>${target.groupId}</groupId>
diff --git a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
index b1e8f62..65cb0cb 100644
--- a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
@@ -47,7 +47,6 @@
</win>
</launcher>
-
<vm>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>
@@ -115,6 +114,7 @@
<feature id="org.eclipse.papyrus.sysml16.feature"/>
<feature id="org.eclipse.papyrus.sysml16.rcp.feature"/>
<feature id="org.eclipse.papyrus.sysml16.elementgroup.feature"/>
+ <feature id="org.eclipse.justj.openjdk.hotspot.jre.full"/>
</features>
<configurations>
@@ -125,9 +125,9 @@
<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="osgi.bundles.defaultStartLevel" value="4" />
- <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus-sysml" />
<property name="org.eclipse.update.reconcile" value="false" />
+ <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus-sysml" />
+ <property name="osgi.bundles.defaultStartLevel" value="4" />
<property name="osgi.requiredJavaVersion" value="11" />
</configurations>
diff --git a/releng/org.eclipse.papyrus.sysml16.rcp/plugin.xml b/releng/org.eclipse.papyrus.sysml16.rcp/plugin.xml
index dadaaa9..b92efd4 100644
--- a/releng/org.eclipse.papyrus.sysml16.rcp/plugin.xml
+++ b/releng/org.eclipse.papyrus.sysml16.rcp/plugin.xml
@@ -28,7 +28,7 @@
<property name="aboutImage" value="icons/papyrus_lg.png"/>
<property
name="appName"
- value="Papyrus">
+ value="Papyrus SysML 1.6">
</property>
<property
name="introTitle"
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
index 1ff7af7..eb7394c 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-12" sequenceNumber="1639558698">
+<target name="SysML 1.6 - 2021-12" sequenceNumber="1641483620">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -24,6 +24,10 @@
<repository id="Papyrus" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-12"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
+ <repository id="JustJ-11" location="https://download.eclipse.org/justj/jres/11/updates/release"/>
+ </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/R20211122181901/repository/"/>
</location>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
index 3dc8953..e15cc6b 100644
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
@@ -23,8 +23,12 @@
org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
}
+//manual update
+location "https://download.eclipse.org/justj/jres/11/updates/release" JustJ-11 {
+ org.eclipse.justj.openjdk.hotspot.jre.full.feature.group lazy
+}
//manual update
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/repository/" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/repository/" orbit {
org.apache.xerces [2.9.0, 2.10.0)
}
