Merge pull request #85 from virtualsatellite/integration

Release 4.17.0
virtualsatellite · Aug 12, 2024 · 949be53 · 949be53
2 parents 6d8ebba + 64ed69f
commit 949be53
Show file tree

Hide file tree

Showing 27 changed files with 348 additions and 283 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,78 +37,99 @@ jobs:
   #---------------------------------------------
   verify:
     name: Verify
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       # --------------------------------------------
       # Checks out a copy of the repository
       # --------------------------------------------
       - name: Setup - Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
+
+      - name: Setup - Java 17
+        uses: actions/setup-java@v4.2.1
+        with:
+          java-version: 17
+          distribution: "temurin"
 
       # --------------------------------------------
       # Run a quick sanity check if all commits are
       # handed in by known users
       #---------------------------------------------
       - name: Verify - Authors Sanity Check
-        uses: virtualsatellite/ci-actions/ci-verify-authors-action@v4
+        uses: virtualsatellite/ci-actions/ci-verify-authors-action@v7
+
 
   # -----------------------------------------------------
   # Build, Assemble and Deploy Job
   # -----------------------------------------------------
   deploy:
     name: Build, Assemble and Deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [verify]
 
     steps:
       # --------------------------------------------
       # Checks out a copy of your repository
       # --------------------------------------------
       - name: Setup - Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.1.1
+
+      - name: Setup - Java 17
+        uses: actions/setup-java@v4.2.1
+        with:
+          java-version: 17
+          distribution: "temurin"
+
+      - name: Setup - Maven 3.9.6
+        uses: virtualsatellite/ci-actions/ci-maven-setup@v7
+        with:
+           maven-version: "3.9.6"
+
+      - name: Setup - Cache maven download
+        uses: actions/cache@v4.0.2
+        with:
+          path: ./maven.tar.gz
+          key: ${{ runner.os }}-local-maven-setup-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-local-maven-setup-
+            ${{ runner.os }}-local-maven-
+      
 
       # --------------------------------------------
       # Setup caching for m2 repository
       # --------------------------------------------
-      - name: Setup - Cache local m2 repository
-        uses: actions/cache@v2
+      - name: Setup - Cache local m2 and p2 repository
+        uses: actions/cache@v4.0.2
         with:
-          path: ~/.m2/repository/
-          key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-local-m2-deploy-
-            ${{ runner.os }}-local-m2-
+           save-always: true
+           path: |
+              ./p2Repo
+              ~/.m2/repository/
+           key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
+           restore-keys: |
+             ${{ runner.os }}-local-m2-p2-deploy-
+             ${{ runner.os }}-local-m2-p2-
        
       - name: Setup - Clean local m2 repository
-        run: rm -rf ~/.m2/repository/de/dlr/sc/virsat
+        run: |
+           ls -d ~/.m2/repository/*/*/* || true
+           rm -rf ~/.m2/repository/de/dlr/sc/virsat
          
-      # --------------------------------------------
-      # Setup caching for p2 repository
-      # --------------------------------------------
-      - name: Setup - Cache local p2 repository
-        uses: actions/cache@v2
-        with:
-          path: ./p2Repo
-          key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-local-p2-deploy-
-            ${{ runner.os }}-local-p2-
-        
       # --------------------------------------------
       # Perform various setup operations
       # --------------------------------------------
       - name: Setup - Prepare OS
-        uses: virtualsatellite/ci-actions/ci-setup-action@v5
+        uses: virtualsatellite/ci-actions/ci-setup-action@v7
         with:
-           jdk: 11
+          jdk: no
 
       # --------------------------------------------
       # Development and Feature branches
       # --------------------------------------------
       - name: Build - Build and Deploy Decision
         id: build_decision
-        uses: virtualsatellite/ci-actions/ci-build-decision-action@v4
+        uses: virtualsatellite/ci-actions/ci-build-decision-action@v7
 
       # --------------------------------------------
       # Prepare p2 Repos
@@ -120,7 +141,7 @@ jobs:
       # Development and Feature branches
       # --------------------------------------------
       - name: Build - Assemble
-        uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v5
+        uses: virtualsatellite/ci-actions/ci-maven-simple-build-action@v7
         with:
           build_job: assemble
           build_profile: ${{ steps.build_decision.outputs.build_type }}
@@ -129,7 +150,7 @@ jobs:
       # Upload deployable applications
       # --------------------------------------------
       - name: Build - Upload Build Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: Deployable Applications
           path: |
@@ -141,7 +162,7 @@ jobs:
       # Deploying to github releases
       # --------------------------------------------
       - name: Build - Deploy GH
-        uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v4
+        uses: virtualsatellite/ci-actions/ci-deploy-gh-product-action@v7
         with:
           build_profile: ${{ steps.build_decision.outputs.build_type }}
           gh_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,6 @@
 **/*._trace
 **/*.xtendbin
 /workspace/
-/deploy/
+/deploy/
+/apache-maven-*
+/maven.tar.gz
diff --git a/.mailmap b/.mailmap
@@ -18,5 +18,6 @@ Anna-Lena-DLR <anna-lena.gefke@dlr.de>			Anna-Lena-DLR <anna-lena.gefke@dlr.de>
 
 dellerDLR <Dennis.Eller@dlr.de>					Dennis Eller <Dennis.Eller@dlr.de>
 dellerDLR <Dennis.Eller@dlr.de>					elle_de <elle_de@SC-010259.intra.dlr.de>
+dellerDLR <Dennis.Eller@dlr.de>					Dennis Eller <95470420+dellerDLR@users.noreply.github.com>
 
 pchrszon-dlr <Philipp.Chrszon@dlr.de>			Chrszon, Philipp <Philipp.Chrszon@dlr.de>
diff --git a/build.xml b/build.xml
@@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0
   	  Additional Build Preparations for VirSat
   	</description>
 
-	<property name="version">4.16.0</property>
+	<property name="version">4.17.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>
@@ -66,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0
 	<!-- =====================================================
 		 Task: updateVersion 
 	     ===================================================== -->
-	<target name="updateVersions">
+	<target name="updateVersions"> 
 
 		<!-- =====================================================
 		     Task: updateVersion - Ask for new Version String

diff --git a/de.dlr.sc.virsat.ide.branding.feature/feature.xml b/de.dlr.sc.virsat.ide.branding.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.ide.branding.feature"
       label="VirSat Development IDE Branding and Package Feature"
-      version="4.16.0.qualifier"
+      version="4.17.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">
@@ -26,16 +26,12 @@ by German Aerospace Center (DLR e.V.)
    </license>
 
    <requires>
-      <import feature="org.eclipse.epp.mpc"/>
-      <import feature="org.eclipse.oomph.setup"/>
-      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.16.0.qualifier"/>
-      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.16.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.17.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.17.0.qualifier"/>
    </requires>
 
    <plugin
          id="de.dlr.sc.virsat.ide.branding.ui"
-         download-size="0"
-         install-size="0"
          version="0.0.0"/>
 
 </feature>
diff --git a/de.dlr.sc.virsat.ide.branding.feature/p2.inf b/de.dlr.sc.virsat.ide.branding.feature/p2.inf
@@ -22,6 +22,6 @@ requires.1.greedy=true
 # RCP/RAP package had been changed in Eclipse Mars (4.5)
 
 update.id = de.dlr.sc.virsat.ide.branding.feature.feature.group
-update.range = [4.5, $version$)
+update.range = [4.5, 5.0.0)
 update.severity = 0
 update.description = Eclipse package upgrade from versions before Eclipse Mars (4.5) is not possible. See bug 332989.
diff --git a/de.dlr.sc.virsat.ide.branding.feature/pom.xml b/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.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>

diff --git a/de.dlr.sc.virsat.ide.branding.ui/.classpath b/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-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs b/de.dlr.sc.virsat.ide.branding.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
+org.eclipse.jdt.core.compiler.compliance=17
 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.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
diff --git a/de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF b/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.16.0.qualifier
+Bundle-Version: 4.17.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
 Eclipse-BundleShape: dir

diff --git a/de.dlr.sc.virsat.ide.branding.ui/pom.xml b/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.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>

diff --git a/de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt b/de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt
@@ -1,6 +1,18 @@
 VirSat IDE Release Notes
 -------------------------
 
+Release 4.17.0  (12th August 2024)
+------------------------------------
+
+New Features:
+    Added Concept language and generators of Virtual Satellite Core 4.17.0
+    Updated to Eclipe 2024-03
+    Shipping with Java justj 21
+    Removed python feature
+    Removed m2e tycho integration
+
+Usability Updates:
+
 
 Release 4.16.0  (31th August 2023)
 ------------------------------------

diff --git a/de.dlr.sc.virsat.ide.docs.feature/feature.xml b/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.16.0.qualifier"
+      version="4.17.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">

diff --git a/de.dlr.sc.virsat.ide.docs.feature/pom.xml b/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.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>

diff --git a/de.dlr.sc.virsat.ide.license.feature/feature.xml b/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.16.0.qualifier"
+      version="4.17.0.qualifier"
       provider-name="DLR (German Aerospace Center)">
 
    <description>

diff --git a/de.dlr.sc.virsat.ide.license.feature/pom.xml b/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.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.license.feature</artifactId>