From 912d3fee96f34b9c156d0c27c57c5a9f5ec2f649 Mon Sep 17 00:00:00 2001 From: elle_de Date: Mon, 21 Aug 2023 15:29:14 +0200 Subject: [PATCH 1/5] Task #74 Update versions --- build.xml | 2 +- de.dlr.sc.virsat.ide.branding.feature/feature.xml | 6 +++--- de.dlr.sc.virsat.ide.branding.feature/pom.xml | 2 +- de.dlr.sc.virsat.ide.branding.ui/META-INF/MANIFEST.MF | 2 +- de.dlr.sc.virsat.ide.branding.ui/pom.xml | 2 +- de.dlr.sc.virsat.ide.docs.feature/feature.xml | 2 +- de.dlr.sc.virsat.ide.docs.feature/pom.xml | 2 +- de.dlr.sc.virsat.ide.license.feature/feature.xml | 2 +- de.dlr.sc.virsat.ide.license.feature/pom.xml | 2 +- de.dlr.sc.virsat.ide.product/pom.xml | 2 +- de.dlr.sc.virsat.ide.product/virsat_ide.product | 4 ---- maven/pom.xml | 4 ++-- pom.xml | 2 +- 13 files changed, 15 insertions(+), 19 deletions(-) diff --git a/build.xml b/build.xml index a530996..3441afe 100644 --- a/build.xml +++ b/build.xml @@ -13,7 +13,7 @@ SPDX-License-Identifier: EPL-2.0 Additional Build Preparations for VirSat - 4.15.0 + 4.16.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 280a3ac..663fde9 100644 --- a/de.dlr.sc.virsat.ide.branding.feature/feature.xml +++ b/de.dlr.sc.virsat.ide.branding.feature/feature.xml @@ -2,7 +2,7 @@ @@ -28,8 +28,8 @@ by German Aerospace Center (DLR e.V.) - - + + ../maven/pom.xml de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.15.0-SNAPSHOT + 4.16.0-SNAPSHOT de.dlr.sc.virsat.ide.branding.feature 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 4a59ad6..e6f35d3 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,7 +2,7 @@ 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.15.0.qualifier +Bundle-Version: 4.16.0.qualifier Bundle-Vendor: DLR (German Aerospace Center) Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.platform, diff --git a/de.dlr.sc.virsat.ide.branding.ui/pom.xml b/de.dlr.sc.virsat.ide.branding.ui/pom.xml index 204d995..8742341 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.15.0-SNAPSHOT + 4.16.0-SNAPSHOT de.dlr.sc.virsat.ide.branding.ui diff --git a/de.dlr.sc.virsat.ide.docs.feature/feature.xml b/de.dlr.sc.virsat.ide.docs.feature/feature.xml index 440e99f..a5f6a82 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 2d5556a..2915fb5 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.15.0-SNAPSHOT + 4.16.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 46143b4..23a9a16 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 5c6bc56..77c2b88 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.15.0-SNAPSHOT + 4.16.0-SNAPSHOT de.dlr.sc.virsat.ide.license.feature diff --git a/de.dlr.sc.virsat.ide.product/pom.xml b/de.dlr.sc.virsat.ide.product/pom.xml index 9d72599..f0ebdef 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.15.0-SNAPSHOT + 4.16.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 e3f98a9..180263b 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -126,10 +126,6 @@ This product includes software developed by other open source projects including - - - - diff --git a/maven/pom.xml b/maven/pom.xml index 7d498cd..e8e1a20 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -12,7 +12,7 @@ 4.0.0 de.dlr.sc.virsat.ide de.dlr.sc.virsat.ide.parent - 4.15.0-SNAPSHOT + 4.16.0-SNAPSHOT pom @@ -20,7 +20,7 @@ 2.6 UTF-8 - 4.15.0 + 4.16.0 't'yyyyMMddHHmm 't'yyyyMMddHHmm diff --git a/pom.xml b/pom.xml index 5531933..1fabb2e 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.15.0-SNAPSHOT + 4.16.0-SNAPSHOT pom From 0b4ad85ca59061a6587da4fecf2e41f53e111a5c Mon Sep 17 00:00:00 2001 From: elle_de Date: Mon, 21 Aug 2023 15:33:54 +0200 Subject: [PATCH 2/5] Update authors --- .mailmap | 5 +++++ known_authors.txt | 2 ++ 2 files changed, 7 insertions(+) diff --git a/.mailmap b/.mailmap index 40cb061..a2d8ceb 100644 --- a/.mailmap +++ b/.mailmap @@ -15,3 +15,8 @@ PhilMFischer fisc_ph TjorveKujathDLR Tjorve Kujath Anna-Lena-DLR Anna-Lena-DLR + +dellerDLR Dennis Eller +dellerDLR elle_de + +pchrszon-dlr Chrszon, Philipp \ No newline at end of file diff --git a/known_authors.txt b/known_authors.txt index ced1c6d..fb6f52e 100644 --- a/known_authors.txt +++ b/known_authors.txt @@ -4,3 +4,5 @@ SaMuellerDLR PhilMFischer Anna-Lena-DLR GeorgeNasrDLR +pchrszon-dlr +dellerDLR \ No newline at end of file From a2968b7985ece30bc7dec546b08d06b6e6fe87d8 Mon Sep 17 00:00:00 2001 From: Dennis Eller Date: Mon, 21 Aug 2023 15:36:21 +0200 Subject: [PATCH 3/5] Change path to integration --- de.dlr.sc.virsat.ide.product/virsat_ide.product | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product index 180263b..ec48854 100644 --- a/de.dlr.sc.virsat.ide.product/virsat_ide.product +++ b/de.dlr.sc.virsat.ide.product/virsat_ide.product @@ -124,7 +124,7 @@ This product includes software developed by other open source projects including - + From e5791592988a71bc433f17ddaacae9fe0add8654 Mon Sep 17 00:00:00 2001 From: franzTobiasDLR <49645871+franzTobiasDLR@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:14:57 +0200 Subject: [PATCH 4/5] Update VirSat_IDE_ReleaseNotes.txt --- .../docs/VirSat_IDE_ReleaseNotes.txt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) 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..4eafc3f 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,17 @@ VirSat IDE Release Notes ------------------------- +Release 4.16.0 (31th August 2023) +------------------------------------ + +New Features: + Added Concept language and generators of Virtual Satellite Core 4.16.0 + +Usability Updates: + Update generated plugin dependencies to match latest depency location + +Fixed Bugs: + Release 4.14.0 (18th February 2022) ------------------------------------ @@ -97,4 +108,4 @@ Usability Updates: Fixed Bugs: - \ No newline at end of file + From 96bae56003a478ccbefd967abd2df0d6f6c88ec6 Mon Sep 17 00:00:00 2001 From: franzTobiasDLR <49645871+franzTobiasDLR@users.noreply.github.com> Date: Wed, 30 Aug 2023 18:58:46 +0200 Subject: [PATCH 5/5] Fix dvlm release path --- maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven/pom.xml b/maven/pom.xml index 7672119..fcb8454 100644 --- a/maven/pom.xml +++ b/maven/pom.xml @@ -106,7 +106,7 @@ 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}/ebcfe996102db4a8b251736cfbf2afd7dece51fb + https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/24188989bef19563442734fd0bd66431ccff11b9 Overtarget-Feature-Release https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd/