diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 70a966e..3d42d8e 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/build.xml b/build.xml index b66fc50..a530996 100644 --- a/build.xml +++ b/build.xml @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0 Additional Build Preparations for VirSat - 4.14.0 + 4.15.0 [\s]?[0-9]+\.[0-9]+\.[0-9]+\.qualifier [\s]?[0-9]+\.[0-9]+\.[0-9]+ diff --git a/de.dlr.sc.virsat.ide.branding.feature/feature.xml b/de.dlr.sc.virsat.ide.branding.feature/feature.xml index 1655ae5..280a3ac 100644 --- a/de.dlr.sc.virsat.ide.branding.feature/feature.xml +++ b/de.dlr.sc.virsat.ide.branding.feature/feature.xml @@ -2,22 +2,22 @@ - 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 - Copyright 2017 + Copyright 2017 by German Aerospace Center (DLR e.V.) @@ -27,10 +27,9 @@ by German Aerospace Center (DLR e.V.) - - - + + ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT de.dlr.sc.virsat.ide.branding.feature diff --git a/de.dlr.sc.virsat.ide.branding.ui/.classpath b/de.dlr.sc.virsat.ide.branding.ui/.classpath index 323b07b..cbd391f 100644 --- a/de.dlr.sc.virsat.ide.branding.ui/.classpath +++ b/de.dlr.sc.virsat.ide.branding.ui/.classpath @@ -1,6 +1,6 @@ - + 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 index 0c68a61..7adc0fb 100644 --- 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,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 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 index b03971e..4a59ad6 100644 --- 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.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 diff --git a/de.dlr.sc.virsat.ide.branding.ui/pom.xml b/de.dlr.sc.virsat.ide.branding.ui/pom.xml index 3f978da..204d995 100644 --- a/de.dlr.sc.virsat.ide.branding.ui/pom.xml +++ b/de.dlr.sc.virsat.ide.branding.ui/pom.xml @@ -14,7 +14,7 @@ ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT de.dlr.sc.virsat.ide.branding.ui 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 index e7528f7..ac02453 100644 --- 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.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) ------------------------------------ diff --git a/de.dlr.sc.virsat.ide.docs.feature/feature.xml b/de.dlr.sc.virsat.ide.docs.feature/feature.xml index b367c06..440e99f 100644 --- a/de.dlr.sc.virsat.ide.docs.feature/feature.xml +++ b/de.dlr.sc.virsat.ide.docs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/de.dlr.sc.virsat.ide.docs.feature/pom.xml b/de.dlr.sc.virsat.ide.docs.feature/pom.xml index f413951..2d5556a 100644 --- a/de.dlr.sc.virsat.ide.docs.feature/pom.xml +++ b/de.dlr.sc.virsat.ide.docs.feature/pom.xml @@ -14,7 +14,7 @@ ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT de.dlr.sc.virsat.ide.docs.feature diff --git a/de.dlr.sc.virsat.ide.license.feature/feature.xml b/de.dlr.sc.virsat.ide.license.feature/feature.xml index 045c6e9..46143b4 100644 --- a/de.dlr.sc.virsat.ide.license.feature/feature.xml +++ b/de.dlr.sc.virsat.ide.license.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/de.dlr.sc.virsat.ide.license.feature/pom.xml b/de.dlr.sc.virsat.ide.license.feature/pom.xml index ea39ac5..5c6bc56 100644 --- a/de.dlr.sc.virsat.ide.license.feature/pom.xml +++ b/de.dlr.sc.virsat.ide.license.feature/pom.xml @@ -14,7 +14,7 @@ ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT de.dlr.sc.virsat.ide.license.feature 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 index 9798bcb..71b404c 100644 --- a/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch +++ b/de.dlr.sc.virsat.ide.product/launch/VirSat IDE Application.launch @@ -26,7 +26,7 @@ - + diff --git a/de.dlr.sc.virsat.ide.product/pom.xml b/de.dlr.sc.virsat.ide.product/pom.xml index c9fbc67..9d72599 100644 --- a/de.dlr.sc.virsat.ide.product/pom.xml +++ b/de.dlr.sc.virsat.ide.product/pom.xml @@ -14,7 +14,7 @@ ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT de.dlr.sc.virsat.ide.product diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product index 5e3db19..e3f98a9 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -6,21 +6,21 @@ - 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'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'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/. @@ -29,14 +29,14 @@ This product includes software developed by other open source projects including - -product de.dlr.sc.virsat.ide.branding.ui.product --showsplash de.dlr.sc.virsat.ide.branding.ui + -product de.dlr.sc.virsat.ide.branding.ui.product +-showsplash de.dlr.sc.virsat.ide.branding.ui --launcher.defaultAction openFile - -Dosgi.requiredJavaVersion=1.8 --Xms256m --Xmx1024m --XX:+UseG1GC + -Dosgi.requiredJavaVersion=11 +-Xms256m +-Xmx1024m +-XX:+UseG1GC -XX:+UseStringDeduplication @@ -57,19 +57,19 @@ This product includes software developed by other open source projects including - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 - - - + + + @@ -79,9 +79,11 @@ This product includes software developed by other open source projects including - - - + + + + + @@ -91,11 +93,13 @@ This product includes software developed by other open source projects including + + @@ -122,6 +126,10 @@ This product includes software developed by other open source projects including + + + + diff --git a/maven/pom.xml b/maven/pom.xml index a4dde79..c8141f5 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -12,15 +12,15 @@ 4.0.0 de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT pom - 1.7.0 + 2.6.0 2.6 UTF-8 - 4.14.0 + 4.15.0 't'yyyyMMddHHmm 't'yyyyMMddHHmm @@ -36,7 +36,7 @@ false - 1.2.1 + 1.4.0 jacoco @@ -45,8 +45,8 @@ 0.7.7.201606060606 ${maven.build.timestamp} - 2020-06 Release - http://download.eclipse.org/releases/2020-06/ + 2022-03 Release + http://download.eclipse.org/releases/2022-03/ @@ -79,7 +79,7 @@ https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/ Overtarget-Feature-Development - https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/483/ + https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd// @@ -93,7 +93,7 @@ DVLM-Tools-Feature-Integration https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/integration/${build.version}/ Overtarget-Feature-Integration - https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/483/ + https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd// @@ -106,9 +106,9 @@ VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz DVLM-Tools-Feature-Release - https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/2ebf0c6c75ba40bdfc379fa2356f19b74c3db491 + https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/ebcfe996102db4a8b251736cfbf2afd7dece51fb Overtarget-Feature-Release - https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/483 + https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd/ @@ -208,6 +208,17 @@ p2 + + mylyn-feature + https://download.eclipse.org/mylyn/releases/3.25/ + p2 + + + + github-mylyn-connector-feature + https://download.eclipse.org/egit/github/updates/ + p2 + diff --git a/pom.xml b/pom.xml index f2c007a..5531933 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 4.0.0 de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide - 4.14.0-SNAPSHOT + 4.15.0-SNAPSHOT pom @@ -31,7 +31,7 @@ org.eclipse.tycho.extras tycho-p2-extras-plugin - 1.7.0 + 2.6.0 prepare-package