Merge pull request #73 from virtualsatellite/integration

Release 4.15.0

.github/workflows/main.yml

@@ -37,7 +37,7 @@ jobs:
   #---------------------------------------------
   verify:
     name: Verify
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       # --------------------------------------------
@@ -58,7 +58,7 @@ jobs:
   # -----------------------------------------------------
   deploy:
     name: Build, Assemble and Deploy
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: [verify]
 
     steps:
@@ -99,7 +99,9 @@ jobs:
       # Perform various setup operations
       # --------------------------------------------
       - name: Setup - Prepare OS
-        uses: virtualsatellite/ci-actions/ci-setup-action@v4
+        uses: virtualsatellite/ci-actions/ci-setup-action@v5
+        with:
+           jdk: 11
 
       # --------------------------------------------
       # Development and Feature branches
@@ -118,10 +120,22 @@ jobs:
       # Development and Feature branches
       # --------------------------------------------
       - name: Build - Assemble
-        uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v4
+        uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v5
         with:
           build_job: assemble
           build_profile: ${{ steps.build_decision.outputs.build_type }}
+
+      # --------------------------------------------
+      # Upload deployable applications
+      # --------------------------------------------
+      - name: Build - Upload Build Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Deployable Applications
+          path: |
+            deploy/**/*.zip
+            deploy/**/*.tar.gz
+          retention-days: 3
 
       # ---------------------------------------------
       # Deploying to github releases

build.xml

@@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
   	  Additional Build Preparations for VirSat
   	</description>
 
-	<property name="version">4.14.0</property>
+	<property name="version">4.15.0</property>
 
 	<property name="version.pattern.qualified">[\s]?[0-9]+\.[0-9]+\.[0-9]+\.qualifier</property>
 	<property name="version.pattern">[\s]?[0-9]+\.[0-9]+\.[0-9]+</property>

de.dlr.sc.virsat.ide.branding.feature/feature.xml

@@ -2,22 +2,22 @@
 <feature
       id="de.dlr.sc.virsat.ide.branding.feature"
       label="VirSat Development IDE Branding and Package Feature"
-      version="4.14.0.qualifier"
+      version="4.15.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.ide.branding.ui"
       license-feature="de.dlr.sc.virsat.ide.license.feature">
 
    <description>
-      Feature for the Virtual Satellite IDE
-
-based on Eclipse Packaging Project (EPP)
-
-German Aerospace Center (DLR e.V.)
+      Feature for the Virtual Satellite IDE
+
+based on Eclipse Packaging Project (EPP)
+
+German Aerospace Center (DLR e.V.)
 Simulation and Software Technology
    </description>
 
    <copyright>
-      Copyright 2017
+      Copyright 2017
 by German Aerospace Center (DLR e.V.)
    </copyright>
 
@@ -27,10 +27,9 @@ by German Aerospace Center (DLR e.V.)
 
    <requires>
       <import feature="org.eclipse.epp.mpc"/>
-      <import feature="org.eclipse.epp.logging.aeri.feature"/>
       <import feature="org.eclipse.oomph.setup"/>
-      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.14.0.qualifier"/>
-      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.14.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.15.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.15.0.qualifier"/>
    </requires>
 
    <plugin

de.dlr.sc.virsat.ide.branding.feature/pom.xml

@@ -14,7 +14,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<groupId>de.dlr.sc.virsat.ide</groupId>
 		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>

de.dlr.sc.virsat.ide.branding.ui/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11

de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF

@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat Development IDE based on EPP RCP/RAP Bundle
 Bundle-SymbolicName: de.dlr.sc.virsat.ide.branding.ui;singleton:=true
-Bundle-Version: 4.14.0.qualifier
+Bundle-Version: 4.15.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir

de.dlr.sc.virsat.ide.branding.ui/pom.xml

@@ -14,7 +14,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<groupId>de.dlr.sc.virsat.ide</groupId>
 		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>

de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt

@@ -1,6 +1,18 @@
 VirSat IDE Release Notes
 -------------------------
 
+Release 4.15.0  (09th August 2022)
+------------------------------------
+
+New Features:
+	Added Concept language and generators of Virtual Satellite Core 4.15.0
+    Migrated to Java 11
+    Migrated to Eclipse 2022-03
+
+Usability Updates:
+
+Fixed Bugs:
+
 Release 4.14.0  (18th February 2022)
 ------------------------------------
 

de.dlr.sc.virsat.ide.docs.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.ide.docs.feature"
       label="VirSat IDE Documents and Release Notes Feature"
-      version="4.14.0.qualifier"
+      version="4.15.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.ide.branding.ui"
       license-feature="de.dlr.sc.virsat.ide.license.feature">

de.dlr.sc.virsat.ide.docs.feature/pom.xml

@@ -14,7 +14,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<groupId>de.dlr.sc.virsat.ide</groupId>
 		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>

de.dlr.sc.virsat.ide.license.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.ide.license.feature"
       label="VirSat Development IDE License Feature"
-      version="4.14.0.qualifier"
+      version="4.15.0.qualifier"
       provider-name="DLR (German Aerospace Center)">
 
    <description>

de.dlr.sc.virsat.ide.license.feature/pom.xml

@@ -14,7 +14,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<groupId>de.dlr.sc.virsat.ide</groupId>
 		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.license.feature</artifactId>

de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch

@@ -26,7 +26,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.0%Foundation-1.0"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=11 -Xms256m -Xmx1024m"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="de.dlr.sc.virsat.ide.branding.ui.product"/>
 <stringAttribute key="productFile" value="\de.dlr.sc.modsim.product\product\modsim_template.product"/>

de.dlr.sc.virsat.ide.product/pom.xml

@@ -14,7 +14,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<groupId>de.dlr.sc.virsat.ide</groupId>
 		<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-		<version>4.14.0-SNAPSHOT</version>
+		<version>4.15.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.product</artifactId>

de.dlr.sc.virsat.ide.product/virsat_ide.product

@@ -6,21 +6,21 @@
    <aboutInfo>
       <image path="/de.dlr.sc.virsat.ide.branding.ui/eclipse_lg.png"/>
       <text>
-         Virtual Satellite IDE
-
-© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. 
-
-The DLR trade mark (as  the word mark DLR or as combination DLR with the DLR Logo)  is a registered and protected trade mark and may not be used without DLR´s prior written permission.  
-
-Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as images, photographs, videos and texts which are indicated as being under DLR´s copyright through copyright notice (i. g. © DLR 2020)  are provided for use under the Terms of use as provided for on DLRs webpage www.dlr.de
-
-based on Eclipse for RCP and RAP Developers
-
-Virtual Satellite Version: {2}.{0}
-Eclipse Version: {1}
-
-(c) Copyright Eclipse contributors and others 2000, 2017.  All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
-
+         Virtual Satellite IDE
+
+© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. 
+
+The DLR trade mark (as  the word mark DLR or as combination DLR with the DLR Logo)  is a registered and protected trade mark and may not be used without DLR´s prior written permission.  
+
+Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as images, photographs, videos and texts which are indicated as being under DLR´s copyright through copyright notice (i. g. © DLR 2020)  are provided for use under the Terms of use as provided for on DLRs webpage www.dlr.de
+
+based on Eclipse for RCP and RAP Developers
+
+Virtual Satellite Version: {2}.{0}
+Eclipse Version: {1}
+
+(c) Copyright Eclipse contributors and others 2000, 2017.  All rights reserved. Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., https://www.eclipse.org/. The Eclipse logo cannot be altered without Eclipse&apos;s permission. Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, https://www.eclipse.org/logotm/. Oracle and Java are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.
+
 This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.
       </text>
    </aboutInfo>
@@ -29,14 +29,14 @@ This product includes software developed by other open source projects including
    </configIni>
 
    <launcherArgs>
-      <programArgs>-product de.dlr.sc.virsat.ide.branding.ui.product
--showsplash de.dlr.sc.virsat.ide.branding.ui
+      <programArgs>-product de.dlr.sc.virsat.ide.branding.ui.product
+-showsplash de.dlr.sc.virsat.ide.branding.ui
 --launcher.defaultAction openFile
       </programArgs>
-      <vmArgs>-Dosgi.requiredJavaVersion=1.8
--Xms256m
--Xmx1024m
--XX:+UseG1GC
+      <vmArgs>-Dosgi.requiredJavaVersion=11
+-Xms256m
+-Xmx1024m
+-XX:+UseG1GC
 -XX:+UseStringDeduplication
       </vmArgs>
    </launcherArgs>
@@ -57,19 +57,19 @@ This product includes software developed by other open source projects including
    <intro introId="org.eclipse.ui.intro.universal"/>
 
    <vm>
-      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
-      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
-      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
-      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+      <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
+      <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</macos>
+      <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</solaris>
+      <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
    </vm>
 
    <plugins>
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.rcp.feature" version="4.16.0.qualifier"/>
-      <feature id="org.eclipse.epp.package.common.feature" version="4.16.0.qualifier"/>
-      <feature id="org.eclipse.platform" version="4.16.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.rcp.feature" version="4.23.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.23.0.qualifier"/>
+      <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.epp.mpc" installMode="root"/>
       <feature id="org.eclipse.jdt"/>
       <feature id="org.eclipse.pde"/>
@@ -79,9 +79,11 @@ This product includes software developed by other open source projects including
       <feature id="org.eclipse.e4.core.tools.feature" installMode="root"/>
       <feature id="org.eclipse.eclemma.feature" installMode="root"/>
       <feature id="org.eclipse.egit" installMode="root"/>
-      <feature id="org.eclipse.egit.mylyn" installMode="root"/>
-      <feature id="org.eclipse.m2e.feature" installMode="root"  version="1.11.0.qualifier"/>
-      <feature id="org.eclipse.m2e.logback.feature" installMode="root"  version="1.11.0.qualifier"/>
+      <feature id="org.eclipse.egit.gitflow.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.pde.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.lemminx.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.gerrit.feature" installMode="root"/>
@@ -91,11 +93,13 @@ This product includes software developed by other open source projects including
       <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.pde_feature" installMode="root"/>
       <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.oomph.setup" installMode="root"/>
       <feature id="org.eclipse.rap.tools.feature" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse.gef" installMode="root"/>
       <feature id="org.eclipse.swtbot.eclipse" installMode="root"/>
       <feature id="org.eclipse.swtbot.ide" installMode="root"/>
       <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
+      <feature id="org.eclipse.passage.ldc.feature" installMode="root"/>
       <feature id="de.dlr.sc.virsat.ide.branding.feature" installMode="root"/>
       <feature id="de.dlr.sc.virsat.model.concept.feature" installMode="root"/>
       <feature id="de.dlr.sc.overtarget.feature" installMode="root"/>
@@ -122,6 +126,10 @@ This product includes software developed by other open source projects including
    <repositories>
       <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
       <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
+      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
+      <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
+      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
+      <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
    </repositories>
 
    <preferencesInfo>