From 2a9c5ff6a572acc6d6a2120263f2151579ec4c40 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 9 Jan 2022 13:29:10 +0100
Subject: [PATCH] add justj runtime

---
 .../com.minres.scviewer.e4.help.feature/feature.xml    |  8 --------
 pom.xml                                                |  3 +++
 .../com.minres.scviewer.e4.product/scviewer.product    |  1 +
 .../com.minres.scviewer.target.target                  | 10 +++++-----
 .../META-INF/MANIFEST.MF                               |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/features/com.minres.scviewer.e4.help.feature/feature.xml b/features/com.minres.scviewer.e4.help.feature/feature.xml
index f53b91f..ffba2a7 100644
--- a/features/com.minres.scviewer.e4.help.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.help.feature/feature.xml
@@ -145,13 +145,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jetty.continuation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.jetty.http"
          download-size="0"
@@ -211,5 +204,4 @@
          fragment="true"
          unpack="false"/>
 
-
 </feature>
diff --git a/pom.xml b/pom.xml
index d6ae52d..47be6d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,9 @@
 							<version>2.15.1</version>
 						</artifact>
 					</target>
+              		<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironment>
+		            <executionEnvironmentDefault>org.eclipse.justj.openjdk.hotspot.jre.minimal-15</executionEnvironmentDefault>
+					<includePackedArtifacts>true</includePackedArtifacts>
 					<environments>
 						<environment>
 							<os>linux</os>
diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product
index 899efaf..d1f7a38 100644
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@@ -63,6 +63,7 @@
       <feature id="org.eclipse.e4.rcp" installMode="root"/>
       <feature id="com.opcoach.e4.preferences.feature" installMode="root"/>
       <feature id="com.minres.scviewer.e4.help.feature" installMode="root"/>
+      <feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped" installMode="root"/> 
    </features>
 
    <configurations>
diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
index bdae75b..e4d2353 100644
--- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -11,6 +11,7 @@
 		<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/> <!-- org.eclipse.equinox.p2.iu -->
 		<unit id="org.eclipse.rcptt.core.feature.group" version="0.0.0"/><!-- com.google.guave-->
 		<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>	<!-- org.junit for testing -->
+		<unit id="javax.servlet" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://www.opcoach.com/repository/2021-09/"/>
@@ -32,11 +33,10 @@
 		<unit id="org.eclipse.collections.feature.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.collections.feature.source.feature.group" version="0.0.0"/>
 	</location>
-	<!--
-    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/justj/sandbox/jres/14/updates/nightly/latest"/>
-    </location>-->
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://download.eclipse.org/justj/jres/15/updates/release/latest"/>
+		<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
+	</location>
 </locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
 </target>
\ No newline at end of file
diff --git a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
index ae78593..514f11a 100644
--- a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
+++ b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SCViewer database tests
 Bundle-SymbolicName: com.minres.scviewer.database.test
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.minres.scviewer.database,
  com.minres.scviewer.database.sqlite;bundle-version="1.0.0",
  com.minres.scviewer.database.text;bundle-version="1.0.0",