From 1866ae17a94415e5053c4fdd8f026f2784f051af Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 9 Jan 2022 11:12:17 +0100
Subject: [PATCH 1/5] add JavaSE-15 execution environment

---
 .../com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF    | 2 +-
 plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF  | 2 +-
 .../com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF    | 2 +-
 plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF   | 2 +-
 plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF       | 2 +-
 .../META-INF/MANIFEST.MF                                        | 2 +-
 plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF | 2 +-
 plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF             | 2 +-
 tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
index 90c5dab..c2e25d4 100644
--- a/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.sqlite
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
 Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
 Service-Component: OSGI-INF/component.xml
diff --git a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index 6de81a4..8bed760 100644
--- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
 Bundle-Version: 4.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.eclipse.osgi.services;bundle-version="3.4.0",
diff --git a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
index a00e2e4..3698813 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SWT database widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
  com.minres.scviewer.database;bundle-version="1.0.0",
  com.google.guava;bundle-version="15.0.0",
diff --git a/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index 7a1dbaf..adeb1fa 100644
--- a/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: VCD signal database
 Bundle-SymbolicName: com.minres.scviewer.database.vcd
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
index 0b7dec7..367cdd4 100644
--- a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Waveform database
 Bundle-SymbolicName: com.minres.scviewer.database
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Export-Package: com.minres.scviewer.database,
  com.minres.scviewer.database.tx
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
index 9b463f6..42a3a9d 100644
--- a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
 Bundle-Version: 2.15.1
 Bundle-Vendor: MINRES Technologies GmbH
 Automatic-Module-Name: com.minres.scviewer.e4.application.help
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index cfc1e01..0ec2230 100644
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.help.webapp;bundle-version="3.9.800",
  org.eclipse.help.base;bundle-version="4.2.900",
  com.minres.scviewer.e4.application.help;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Import-Package: com.minres.scviewer.database,
  javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
diff --git a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
index 9e29130..27c4ee3 100644
--- a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi,
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect
 Service-Component: OSGI-INF/component.xml
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 514f11a..ae78593 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
+Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
 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",

From a6aa9859ea8e2832d858ddde945333c4fb8f9aca Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 9 Jan 2022 11:52:25 +0100
Subject: [PATCH 2/5] update maven plugin versions

---
 doc/com.minres.scviewer.doc/pom.xml            | 18 ++----------------
 pom.xml                                        |  2 +-
 .../com.minres.scviewer.target.target          |  5 +----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml
index dd2e999..71950ca 100644
--- a/doc/com.minres.scviewer.doc/pom.xml
+++ b/doc/com.minres.scviewer.doc/pom.xml
@@ -13,10 +13,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<asciidoctor.maven.plugin.version>1.5.6</asciidoctor.maven.plugin.version>
-		<asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
-		<asciidoctorj.version>1.5.6</asciidoctorj.version>
-		<jruby.version>1.7.26</jruby.version>
+		<asciidoctor.maven.plugin.version>2.0.0</asciidoctor.maven.plugin.version>
+		<asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
 		<help.plugin.target.dir>../../plugins/com.minres.scviewer.e4.application.help</help.plugin.target.dir>
 	</properties>
 
@@ -32,18 +30,6 @@
                         <artifactId>asciidoctorj-pdf</artifactId>
                         <version>${asciidoctorj.pdf.version}</version>
                     </dependency>
-                    <!-- Comment this section to use the default jruby artifact provided by the plugin -->
-                    <dependency>
-                        <groupId>org.jruby</groupId>
-                        <artifactId>jruby-complete</artifactId>
-                        <version>${jruby.version}</version>
-                    </dependency>
-                    <!-- Comment this section to use the default AsciidoctorJ artifact provided by the plugin -->
-                    <dependency>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctorj</artifactId>
-                        <version>${asciidoctorj.version}</version>
-                    </dependency>
                 </dependencies>
 			    <configuration>
 					<sourceDirectory>src/asciidoc</sourceDirectory>
diff --git a/pom.xml b/pom.xml
index ff64bd9..d6ae52d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	</modules>
 
 	<properties>
-		<tycho-version>1.5.0</tycho-version>
+		<tycho-version>2.3.0</tycho-version>
 		<groovy-eclipse-compiler-version>3.6.0-03</groovy-eclipse-compiler-version>
 		<groovy-eclipse-batch-version>3.0.3-01</groovy-eclipse-batch-version>
 		<software.download.area>${project.basedir}/../../..</software.download.area>
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 146343c..6be82b0 100644
--- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -37,8 +37,5 @@
 		<unit id="org.eclipse.collections.feature.source.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-1.8"/>
-<launcherArgs>
-	<vmArgs>-Xms40m -Xmx2G</vmArgs>
-</launcherArgs>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 </target>
\ No newline at end of file

From eb4e2301c1634a82f743bebc26f539ac6561c1ec Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 9 Jan 2022 11:59:33 +0100
Subject: [PATCH 3/5] fix minimum required execution environment

---
 .../com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF    | 2 +-
 plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF  | 2 +-
 .../com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF    | 2 +-
 plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF   | 2 +-
 plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF       | 2 +-
 .../META-INF/MANIFEST.MF                                        | 2 +-
 plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF | 2 +-
 plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF             | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
index c2e25d4..90c5dab 100644
--- a/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.sqlite
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0"
 Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar
 Service-Component: OSGI-INF/component.xml
diff --git a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
index 8bed760..6de81a4 100644
--- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Textual transaction database
 Bundle-SymbolicName: com.minres.scviewer.database.text
 Bundle-Version: 4.0.1.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: com.minres.scviewer.database,
  org.eclipse.osgi.services;bundle-version="3.4.0",
diff --git a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
index 3698813..a00e2e4 100644
--- a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: SWT database widget
 Bundle-SymbolicName: com.minres.scviewer.database.ui.swt
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1",
  com.minres.scviewer.database;bundle-version="1.0.0",
  com.google.guava;bundle-version="15.0.0",
diff --git a/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
index adeb1fa..7a1dbaf 100644
--- a/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: VCD signal database
 Bundle-SymbolicName: com.minres.scviewer.database.vcd
 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;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.4.0",
  com.google.guava;bundle-version="15.0.0"
diff --git a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
index 367cdd4..0b7dec7 100644
--- a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Waveform database
 Bundle-SymbolicName: com.minres.scviewer.database
 Bundle-Version: 4.0.0.qualifier
 Bundle-Vendor: MINRES Technologies GmbH
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: com.minres.scviewer.database,
  com.minres.scviewer.database.tx
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
index 42a3a9d..9b463f6 100644
--- a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
 Bundle-Version: 2.15.1
 Bundle-Vendor: MINRES Technologies GmbH
 Automatic-Module-Name: com.minres.scviewer.e4.application.help
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
index 0ec2230..cfc1e01 100644
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@@ -40,7 +40,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0",
  org.eclipse.help.webapp;bundle-version="3.9.800",
  org.eclipse.help.base;bundle-version="4.2.900",
  com.minres.scviewer.e4.application.help;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: com.minres.scviewer.database,
  javax.annotation;version="1.0.0";resolution:=optional,
  javax.inject;version="1.0.0"
diff --git a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
index 27c4ee3..9e29130 100644
--- a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0",
  org.eclipse.osgi,
  org.eclipse.core.expressions;bundle-version="3.4.600",
  org.eclipse.jface
-Bundle-RequiredExecutionEnvironment: JavaSE-11, JavaSE-15
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Import-Package: com.google.common.collect
 Service-Component: OSGI-INF/component.xml

From 9fe7a83dfa084a8437090f19b54d849b240e8fee Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sun, 9 Jan 2022 12:13:01 +0100
Subject: [PATCH 4/5] update target definition to 2021-09

---
 .../com.minres.scviewer.target.target             | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 6be82b0..bdae75b 100644
--- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
+++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target
@@ -3,7 +3,7 @@
 <target name="com.minres.scviewer.target" sequenceNumber="138">
 <locations>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://download.eclipse.org/releases/2020-03/"/>
+		<repository location="http://download.eclipse.org/releases/2021-09/"/>
 		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.equinox.p2.sdk.feature.jar" version="0.0.0"/> <!-- needed by Linux exectable-->
 		<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
@@ -13,13 +13,9 @@
 		<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>	<!-- org.junit for testing -->
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2020-03/"/>
+		<repository location="https://www.opcoach.com/repository/2021-09/"/>
 		<unit id="com.opcoach.e4.preferences.feature.feature.group" version="0.0.0"/>
 	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="http://dist.springsource.org/snapshot/GRECLIPSE/e4.15/"/>
-		<unit id="org.codehaus.groovy25.feature.feature.group" version="0.0.0"/>
-	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="http://download.eclipse.org/nattable/releases/1.6.0/repository/"/>
 		<unit id="org.eclipse.nebula.widgets.nattable.core.feature.feature.group" version="1.6.0.201909181823"/>
@@ -36,6 +32,11 @@
 		<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>-->
 </locations>
-	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<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

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 5/5] 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",