Merge pull request #80 from virtualsatellite/feature/task_78-Update_IDE

Updated IDE to latest versions Closes #78
virtualsatellite · Aug 8, 2024 · b64c7c8 · b64c7c8
2 parents 5087436 + 9919225
commit b64c7c8
Show file tree

Hide file tree

Showing 19 changed files with 282 additions and 232 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,59 +37,92 @@ 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"
+          cache: 'maven'
+
+      - 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
-        with:
-          path: ~/.m2/repository/
-          key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-local-m2-deploy-
-            ${{ runner.os }}-local-m2-
+      # - name: Setup - Cache local m2 repository
+      #   uses: actions/cache@v4.0.2
+      #  with:
+      #     cache-always: true
+      #     path: ~/.m2/repository/
+      #     key: ${{ runner.os }}-local-m2-deploy-${{ hashFiles('**/pom.xml') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-local-m2-deploy-
+      #       ${{ runner.os }}-local-m2-
 
       - 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
+        uses: actions/cache@v4.0.2
         with:
           path: ./p2Repo
+          save-always: true
           key: ${{ runner.os }}-local-p2-deploy-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-local-p2-deploy-
@@ -99,16 +132,16 @@ jobs:
       # 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 +153,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 +162,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 +174,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/build.xml b/build.xml
@@ -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
@@ -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"/>
    </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.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
@@ -4,7 +4,7 @@ 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-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.product/launch/VirSat IDE Application.launch b/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch
diff --git a/de.dlr.sc.virsat.ide.product/p2.inf b/de.dlr.sc.virsat.ide.product/p2.inf
@@ -22,6 +22,6 @@ properties.2.value = DLR (German Aerospace Center)
 # RCP/RAP package had been changed in Eclipse Mars (4.5)
 
 update.id = de.dlr.sc.virsat.ide.product
-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.product/pom.xml b/de.dlr.sc.virsat.ide.product/pom.xml
@@ -39,7 +39,7 @@
 						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>tycho-p2-director-plugin</artifactId>
 					</plugin>
-		
+
 					<plugin>
 						<artifactId>maven-antrun-plugin</artifactId>
 						<executions>
@@ -53,8 +53,7 @@
 											<condition>
 												<and>
 													<equals arg1="${build.deploy.release}" arg2="true" />
-													<available file="${build.folder.fullpath.p2}"
-														type="dir" />
+													<available file="${build.folder.fullpath.p2}" type="dir" />
 												</and>
 											</condition>
 										</fail>
@@ -79,18 +78,17 @@
 											<condition>
 												<and>
 													<equals arg1="${build.deploy.release}" arg2="true" />
-													<available file="${build.folder.fullpath}"
-														type="dir" />
+													<available file="${build.folder.fullpath}" type="dir" />
 												</and>
 											</condition>
 										</fail>
-		
+
 										<!-- ANT Script Start -->
 										<mkdir dir="${build.folder.fullpath}" />
-		
+
 										<delete file="${build.file.win32.fullpath}" />
 										<delete file="${build.file.linux.fullpath}" />
-		
+
 										<zip destfile="${build.file.win32.fullpath}"
 											basedir="./target/products/de.dlr.sc.virsat.ide.product/win32/win32/x86_64" />
 										<tar destfile="${build.file.linux.fullpath}"
@@ -108,6 +106,32 @@
 					</plugin>
 				</plugins>
 			</build>
-		</profile>	
+		</profile>
 	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<!-- Do not include execution environment units, so we're
+					sure JustJ is used -->
+					<executionEnvironment>none</executionEnvironment>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>