Merge pull request #163 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:
  # --------------------------------------------
@@ -51,14 +51,14 @@ jobs:
  # handed in by known users
  #---------------------------------------------
  - name: Verify - Authors Sanity Check
- uses: virtualsatellite/ci-actions/ci-verify-authors-action@v2
+ uses: virtualsatellite/ci-actions/ci-verify-authors-action@v6
 
  # -----------------------------------------------------
  # Build and Test - SpotBugs Job
  # -----------------------------------------------------
  spotbugs:
  name: Build and Test - Spotbugs
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  needs: [verify]
 
  steps:
@@ -87,22 +87,23 @@ jobs:
  # Perform various setup operations
  # -------------------------------------------- 
  - name: Setup - Prepare OS
- uses: virtualsatellite/ci-actions/ci-setup-action@v2
+ uses: virtualsatellite/ci-actions/ci-setup-action@v6
  with:
  pkgs_file: apt_vtk_zmq_packages
+ jdk: 11
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build - Build and Deploy Decision
  id: build_decision
- uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+ uses: virtualsatellite/ci-actions/ci-build-decision-action@v6
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build and Test - Spotbugs
- uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+ uses: virtualsatellite/ci-actions/ci-maven-build-action@v6
  with:
  build_job: spotbugs
  build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -112,7 +113,7 @@ jobs:
  # -----------------------------------------------------
  surefire:
  name: Build and Test - Surefire
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  needs: [verify]
 
  steps:
@@ -141,23 +142,24 @@ jobs:
  # Perform various setup operations
  # -------------------------------------------- 
  - name: Setup - Prepare OS
- uses: virtualsatellite/ci-actions/ci-setup-action@v2
+ uses: virtualsatellite/ci-actions/ci-setup-action@v6
  with:
  xvfb: -x
  pkgs_file: apt_vtk_zmq_packages
+ jdk: 11
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build - Build and Deploy Decision
  id: build_decision
- uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+ uses: virtualsatellite/ci-actions/ci-build-decision-action@v6
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build and Test - Surefire
- uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+ uses: virtualsatellite/ci-actions/ci-maven-build-action@v6
  with:
  build_job: sureheadless
  build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -189,7 +191,7 @@ jobs:
  # -----------------------------------------------------
  checkstyle:
  name: Build and Test - Checkstyle
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  needs: [verify]
 
  steps:
@@ -218,22 +220,23 @@ jobs:
  # Perform various setup operations
  # -------------------------------------------- 
  - name: Setup - Prepare OS
- uses: virtualsatellite/ci-actions/ci-setup-action@v2
+ uses: virtualsatellite/ci-actions/ci-setup-action@v6
  with:
  pkgs_file: apt_vtk_zmq_packages
+ jdk: 11
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build - Build and Deploy Decision
  id: build_decision
- uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+ uses: virtualsatellite/ci-actions/ci-build-decision-action@v6
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build and Test - Checkstyle
- uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+ uses: virtualsatellite/ci-actions/ci-maven-build-action@v6
  with:
  build_job: checkstyle
  build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -243,7 +246,7 @@ jobs:
  # -----------------------------------------------------
  deploy:
  name: Build, Assemble and Deploy
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
  needs: [spotbugs, surefire, checkstyle]
 
  steps:
@@ -272,22 +275,23 @@ jobs:
  # Perform various setup operations
  # --------------------------------------------
  - name: Setup - Prepare OS
- uses: virtualsatellite/ci-actions/ci-setup-action@v2
+ uses: virtualsatellite/ci-actions/ci-setup-action@v6
  with:
  pkgs_file: apt_vtk_zmq_packages
+ jdk: 11
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build - Build and Deploy Decision
  id: build_decision
- uses: virtualsatellite/ci-actions/ci-build-decision-action@v2
+ uses: virtualsatellite/ci-actions/ci-build-decision-action@v6
 
  # --------------------------------------------
  # Development and Feature branches
  # --------------------------------------------
  - name: Build - Assemble
- uses: virtualsatellite/ci-actions/ci-maven-build-action@v2
+ uses: virtualsatellite/ci-actions/ci-maven-build-action@v6
  with:
  build_job: assemble
  build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -296,7 +300,7 @@ jobs:
  # Deploying to github releases
  # --------------------------------------------
  - name: Build - Deploy GH
- uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v2
+ uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v6
  with:
  build_profile: ${{ steps.build_decision.outputs.build_type }}
  gh_token: ${{ secrets.GITHUB_TOKEN }}
@@ -306,7 +310,7 @@ jobs:
  # SF Deploy still to be done
  # ----------------------------------------------
  - name: Build - Deploy SF
- uses: virtualsatellite/ci-actions/ci-deploy-sf-product-action@v2
+ uses: virtualsatellite/ci-actions/ci-deploy-sf-product-action@v6
  with:
  build_profile: ${{ steps.build_decision.outputs.build_type }}
  openssl_pass: ${{ secrets.SF_SSH_KEY_OPENSSL_PASS }}

.mailmap

@@ -7,6 +7,7 @@ franzTobiasDLR <tobias.franz@dlr.de> Tobias Franz <tobias.franz@dlr.de>
 SaMuellerDLR <sa.mueller@dlr.de> Müller, Sascha ( SC-SRV ) <sa.mueller@dlr.de>
 SaMuellerDLR <sa.mueller@dlr.de> SaMuellerDLR <48356419+SaMuellerDLR@users.noreply.github.com>
 SaMuellerDLR <sa.mueller@dlr.de> Sascha Müller <sa.mueller@dlr.de>
+SaMuellerDLR <sa.mueller@dlr.de> muel_s8 <muel_s8@SC-010214.intra.dlr.de>
 
 PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <35496033+PhilMFischer@users.noreply.github.com>
 PhilMFischer <philipp.fischer@dlr.de> Philipp M. Fischer <philipp.fischer@dlr.de>

apt_vtk_zmq_packages

@@ -1 +1 @@
-libvtk6-java libzmq5 libzmq-java libzmq-jni
+libvtk7-java libzmq5 libzmq-java libzmq-jni

build.xml

@@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
  Additional Build Preparations for VirSat
  </description>
 
- <property name="version">4.13.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.cef.branding.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
  id="de.dlr.sc.virsat.cef.branding.feature"
  label="VirSat CEF Branding Feature"
- version="4.13.0.qualifier"
+ version="4.15.0.qualifier"
  provider-name="DLR (German Aerospace Center)"
  license-feature="de.dlr.sc.virsat.cef.license.feature">
 

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

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

de.dlr.sc.virsat.cef.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="src" path="src"/>
  <classpathentry kind="src" path="src-gen"/>

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

@@ -1,7 +1,7 @@
 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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11

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

@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Branding
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.branding.ui;singleton:=true
-Bundle-Version: 4.13.0.qualifier
+Bundle-Version: 4.15.0.qualifier
 Bundle-Activator: de.dlr.sc.virsat.cef.branding.ui.BrandingPlugin
 Bundle-Vendor: DLR (German Aerospace Center)
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.ui.workbench,
  org.eclipse.jface,

de.dlr.sc.virsat.cef.branding.ui/plugin.xml

@@ -25,7 +25,7 @@
  </property>
  <property
  name="aboutText"
- value="Virtual Satellite 4 - CEF&#x0D;&#x0A;&#x0D;&#x0A;Version 4.13.0&#x0D;&#x0A;&#x0D;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. &#x0D;&#x0A;&#x0D;&#x0A;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. &#x0D;&#x0A;&#x0D;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as the 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&#x0D;&#x0A;&#x0D;&#x0A;The CEF logo and images cannot be altered or used without DLR&apos;s permission.&#x0D;&#x0A;&#x0D;&#x0A;German Aerospace Center (DLR) e.V.&#x0D;&#x0A;Lilienthalplatz 7&#x0D;&#x0A;38108 Braunschweig&#x0D;&#x0A;Germany">
+ value="Virtual Satellite 4 - CEF&#x0D;&#x0A;&#x0D;&#x0A;Version 4.15.0&#x0D;&#x0A;&#x0D;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. &#x0D;&#x0A;&#x0D;&#x0A;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. &#x0D;&#x0A;&#x0D;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as the 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&#x0D;&#x0A;&#x0D;&#x0A;The CEF logo and images cannot be altered or used without DLR&apos;s permission.&#x0D;&#x0A;&#x0D;&#x0A;German Aerospace Center (DLR) e.V.&#x0D;&#x0A;Lilienthalplatz 7&#x0D;&#x0A;38108 Braunschweig&#x0D;&#x0A;Germany">
  </property>
  <property
  name="aboutImage"

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

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

de.dlr.sc.virsat.cef.calculation.test/.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="src" path="src/"/>
  <classpathentry kind="output" path="target/classes"/>

de.dlr.sc.virsat.cef.calculation.test/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11

de.dlr.sc.virsat.cef.calculation.test/META-INF/MANIFEST.MF

@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Calculation Tests
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.calculation.test
-Bundle-Version: 4.13.0.qualifier
+Bundle-Version: 4.15.0.qualifier
 Fragment-Host: de.dlr.sc.virsat.cef.calculation
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: DLR (German Aerospace Center)
 Require-Bundle: org.junit,
  de.dlr.sc.virsat.model.extension.cef,

de.dlr.sc.virsat.cef.calculation.test/pom.xml

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

de.dlr.sc.virsat.cef.calculation.test/src/de/dlr/sc/virsat/cef/calculation/test/AllTests.java

@@ -28,11 +28,11 @@
 @RunWith(Suite.class)
 
 @SuiteClasses({
-  ModeVectorResultTest.class,
-  ParameterSetterTest.class, 
-  ParameterGetterTest.class,
-  ModeVectorEvaluatorTest.class
- })
+ ModeVectorResultTest.class,
+ ParameterSetterTest.class, 
+ ParameterGetterTest.class,
+ ModeVectorEvaluatorTest.class
+})
 
 public class AllTests {
 

de.dlr.sc.virsat.cef.calculation/.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="src" path="src"/>
  <classpathentry kind="output" path="target/classes"/>

de.dlr.sc.virsat.cef.calculation/.settings/org.eclipse.jdt.core.prefs

@@ -1,7 +1,7 @@
 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.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11

de.dlr.sc.virsat.cef.calculation/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Calculation
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.calculation;singleton:=true
-Bundle-Version: 4.13.0.qualifier
+Bundle-Version: 4.15.0.qualifier
 Bundle-ClassPath: .
 Eclipse-ExtensibleAPI: true
 Require-Bundle: org.eclipse.ui,
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
  de.dlr.sc.virsat.model.edit,
  de.dlr.sc.virsat.model.calculation,
  de.dlr.sc.virsat.model.extension.cef
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: DLR (German Aerospace Center)
 Export-Package: de.dlr.sc.virsat.cef.calculation.modes

de.dlr.sc.virsat.cef.calculation/pom.xml

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

de.dlr.sc.virsat.cef.docs.feature/docs/VirSat_CEF_ReleaseNotes.txt

@@ -3,6 +3,13 @@ VirSat CEF Release Notes
 
 VirSat CEF is based on VirSat Core. Please don't forget to read the Release Notes of VirSat Core as well!
 
+Release 4.15.0 (09th August 2022)
+----------------------------------
+
+New Features:
+ Migrated to Java 11 #159 Build
+ Migrated to Eclipse 2022-03 #160 Build
+
 Release 4.13.0 (27th April 2021)
 ----------------------------------