Merge branch 'feature/integrated_jre' into develop

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>
+		<asciidoctor.maven.plugin.version>2.0.0</asciidoctor.maven.plugin.version>
-		<asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
+		<asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
-		<asciidoctorj.version>1.5.6</asciidoctorj.version>
-		<jruby.version>1.7.26</jruby.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>

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>

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>
@@ -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>

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>

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"/>
@@ -11,15 +11,12 @@
 		<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/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,9 +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 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-1.8"/>
+	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-15"/>
-<launcherArgs>
-	<vmArgs>-Xms40m -Xmx2G</vmArgs>
-</launcherArgs>
 </target>