updates version and eclipse rcp version

2023-08-11 12:34:54 +02:00 · 2023-08-11 12:34:54 +02:00 · 36fdc68051
commit 36fdc68051
parent 53576f5e1b
29 changed files with 33 additions and 63 deletions
--- a/version.launch
+++ b/version.launch
@ -21,6 +21,6 @@
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.minres.scviewer.parent}"/>
 </launchConfiguration>
--- a/doc/com.minres.scviewer.doc/pom.xml
+++ b/doc/com.minres.scviewer.doc/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>

--- a/features/com.minres.scviewer.database.feature/pom.xml
+++ b/features/com.minres.scviewer.database.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>3.0.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.e4.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.e4.help.feature/feature.xml
+++ b/features/com.minres.scviewer.e4.help.feature/feature.xml
@ -66,22 +66,6 @@
         version="0.0.0"
         unpack="false"/>

-   <plugin
-         id="org.eclipse.equinox.security"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.linux.x86_64"
-         os="linux"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
   <plugin
         id="javax.el"
         download-size="0"
@ -89,20 +73,6 @@
         version="0.0.0"
         unpack="false"/>

-   <plugin
-         id="javax.servlet"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.servlet.jsp"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
   <plugin
         id="org.eclipse.equinox.http.jetty"
         download-size="0"
--- a/features/com.minres.scviewer.e4.help.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.help.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.0.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.e4.platform.feature/pom.xml
+++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.0.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.feature/pom.xml
+++ b/features/com.minres.scviewer.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/features/com.minres.scviewer.ui.feature/pom.xml
+++ b/features/com.minres.scviewer.ui.feature/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>1.1.0-SNAPSHOT</version>
--- a/plugins/com.minres.scviewer.database.fst/pom.xml
+++ b/plugins/com.minres.scviewer.database.fst/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.ftr/pom.xml
+++ b/plugins/com.minres.scviewer.database.ftr/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.sqlite/pom.xml
+++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.text/pom.xml
+++ b/plugins/com.minres.scviewer.database.text/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml
+++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <version>4.0.0-SNAPSHOT</version>
--- a/plugins/com.minres.scviewer.database.vcd/pom.xml
+++ b/plugins/com.minres.scviewer.database.vcd/pom.xml
@ -5,7 +5,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.database/pom.xml
+++ b/plugins/com.minres.scviewer.database/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SCViewer Help
 Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true
-Bundle-Version: 2.18.0
+Bundle-Version: 2.19
 Bundle-Vendor: MINRES Technologies GmbH
 Automatic-Module-Name: com.minres.scviewer.e4.application.help
 Bundle-RequiredExecutionEnvironment: JavaSE-11
--- a/plugins/com.minres.scviewer.e4.application.help/plugin.xml
+++ b/plugins/com.minres.scviewer.e4.application.help/plugin.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
-<plugin>
+<plugin name="DocBook Online Help Sample" id="com.minres.scviewer.e4.application.help" version="1.0" provider-name="Example provider">
   <extension point="org.eclipse.help.toc">
      <toc file="toc.xml" primary="true"/>
   </extension>
--- a/plugins/com.minres.scviewer.e4.application.help/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application.help/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
+++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF
@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true
-Bundle-Version: 2.18.0
+Bundle-Version: 2.19
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: javax.inject;bundle-version="1.0.0",
 org.eclipse.core.runtime;bundle-version="3.11.1",
--- a/plugins/com.minres.scviewer.e4.application/pom.xml
+++ b/plugins/com.minres.scviewer.e4.application/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-plugin</packaging>
--- a/plugins/com.minres.scviewer.ui/pom.xml
+++ b/plugins/com.minres.scviewer.ui/pom.xml
@ -4,7 +4,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<relativePath>../..</relativePath>
  </parent>
  <packaging>eclipse-plugin</packaging>
--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.minres.scviewer</groupId>
 	<artifactId>com.minres.scviewer.parent</artifactId>
-	<version>2.18.0</version>
+	<version>2.19</version>
 	<packaging>pom</packaging>
 	<modules>
 		<module>releng/com.minres.scviewer.target</module>
@ -71,7 +71,7 @@
 						<artifact>
 							<groupId>com.minres.scviewer</groupId>
 							<artifactId>com.minres.scviewer.target</artifactId>
-							<version>2.18.0</version>
+							<version>2.19</version>
 						</artifact>
 					</target>
 					<executionEnvironment>
--- a/products/com.minres.scviewer.e4.product/pom.xml
+++ b/products/com.minres.scviewer.e4.product/pom.xml
@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<artifactId>com.minres.scviewer.e4.product</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
 	<packaging>eclipse-repository</packaging>
 	<groupId>com.minres.scviewer</groupId>
 	<build>
--- a/products/com.minres.scviewer.e4.product/scviewer.product
+++ b/products/com.minres.scviewer.e4.product/scviewer.product
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.18.0" useFeatures="true" includeLaunchers="true">
+<product name="SCViewer" uid="scviewer" id="com.minres.scviewer.e4.application.product" application="org.eclipse.e4.ui.workbench.swt.E4Application" version="2.19" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">

   <configIni use="default">
   </configIni>
@ -53,7 +53,6 @@
      <feature id="org.eclipse.emf.ecore" installMode="root"/>
      <feature id="org.eclipse.emf.common" installMode="root"/>
      <feature id="org.eclipse.ecf.core.feature" installMode="root"/>
-      <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature" installMode="root"/>
      <feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
      <feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
      <feature id="com.minres.scviewer.ui.feature" installMode="root"/>
@ -64,6 +63,7 @@
      <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"/>
+      <feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
   </features>

   <configurations>
--- 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/2021-12/"/>
+		<repository location="http://download.eclipse.org/releases/2022-12/"/>
 		<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,12 +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"/>
+		<unit id="jakarta.servlet" version="0.0.0"/>
 		<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
 		<unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="0.0.0"/>
 	</location>
 	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://www.opcoach.com/repository/2021-12/"/>
+		<repository location="https://www.opcoach.com/repository/2022-12/"/>
 		<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">
--- a/releng/com.minres.scviewer.target/pom.xml
+++ b/releng/com.minres.scviewer.target/pom.xml
@ -12,7 +12,7 @@
  <parent>
  	<groupId>com.minres.scviewer</groupId>
  	<artifactId>com.minres.scviewer.parent</artifactId>
-  	<version>2.18.0</version>
+  	<version>2.19</version>
  	<relativePath>../..</relativePath>
  </parent>

--- a/releng/com.minres.scviewer.updateSite/pom.xml
+++ b/releng/com.minres.scviewer.updateSite/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<build>
--- a/tests/com.minres.scviewer.database.test/pom.xml
+++ b/tests/com.minres.scviewer.database.test/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.minres.scviewer</groupId>
 		<artifactId>com.minres.scviewer.parent</artifactId>
-		<version>2.18.0</version>
+		<version>2.19</version>
 		<relativePath>../..</relativePath>
 	</parent>
 	<packaging>eclipse-test-plugin</packaging>