Merge pull request #76 from virtualsatellite/integration

dellerDLR · web-flow · commit 6d8ebba7154c · 2023-08-31T10:04:20.000+02:00
Release 4.16.0
diff --git a/.mailmap b/.mailmap
@@ -15,3 +15,8 @@ PhilMFischer <philipp.fischer@dlr.de>			fisc_ph <fisc_ph@SC-010165.intra.dlr.de>
 TjorveKujathDLR <tjorve.kujath@dlr.de>			Tjorve Kujath <tjorve.kujath@dlr.de>
 
 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>
+
+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.15.0</property>
+	<property name="version">4.16.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>
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.15.0.qualifier"
+      version="4.16.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">
@@ -28,8 +28,8 @@ by German Aerospace Center (DLR e.V.)
    <requires>
       <import feature="org.eclipse.epp.mpc"/>
       <import feature="org.eclipse.oomph.setup"/>
-      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.15.0.qualifier"/>
-      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.15.0.qualifier"/>
+      <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
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.15.0-SNAPSHOT</version>
+		<version>4.16.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>
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,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
@@ -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.15.0-SNAPSHOT</version>
+		<version>4.16.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,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
+    
+
 Release 4.15.0  (09th August 2022)
 ------------------------------------
 
@@ -10,9 +21,11 @@ New Features:
     Migrated to Eclipse 2022-03
     
 Usability Updates:
+
 	    
 Fixed Bugs:
 
+
 Release 4.14.0  (18th February 2022)
 ------------------------------------
 
@@ -109,4 +122,4 @@ Usability Updates:
 
 Fixed Bugs:
 
-    
+    
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.15.0.qualifier"
+      version="4.16.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.15.0-SNAPSHOT</version>
+		<version>4.16.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.15.0.qualifier"
+      version="4.16.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.15.0-SNAPSHOT</version>
+		<version>4.16.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.license.feature</artifactId>
diff --git a/de.dlr.sc.virsat.ide.product/pom.xml b/de.dlr.sc.virsat.ide.product/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.15.0-SNAPSHOT</version>
+		<version>4.16.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.product</artifactId>
diff --git a/de.dlr.sc.virsat.ide.product/virsat_ide.product b/de.dlr.sc.virsat.ide.product/virsat_ide.product
@@ -124,11 +124,7 @@ This product includes software developed by other open source projects including
 
 
    <repositories>
-      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
-      <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
-      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
-      <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
-      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/" enabled="true" />
+      <repository location="https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/integration/" enabled="true" />
       <repository location="https://sourceforge.net/projects/overtarget/files/development/" enabled="true" />
    </repositories>
 
diff --git a/known_authors.txt b/known_authors.txt
@@ -4,3 +4,5 @@ SaMuellerDLR
 PhilMFischer
 Anna-Lena-DLR
 GeorgeNasrDLR
+pchrszon-dlr
+dellerDLR
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -12,15 +12,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.dlr.sc.virsat.ide</groupId>
 	<artifactId>de.dlr.sc.virsat.ide.parent</artifactId>
-	<version>4.15.0-SNAPSHOT</version>
+	<version>4.16.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
 		<tycho-version>2.6.0</tycho-version>
 		<maven.resources.version>2.6</maven.resources.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<build.version>4.15.0</build.version>
+		<build.version>4.16.0</build.version>
 		<build.qualifier>'t'yyyyMMddHHmm</build.qualifier>
 		<maven.build.timestamp.format>'t'yyyyMMddHHmm</maven.build.timestamp.format>
 
@@ -106,7 +106,7 @@
 				<build.file.win32>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Win32.zip</build.file.win32>
 				<build.file.linux>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}_Linux.tar.gz</build.file.linux>
 				<p2.repo.virsat.id>DVLM-Tools-Feature-Release</p2.repo.virsat.id>
-				<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/ebcfe996102db4a8b251736cfbf2afd7dece51fb</p2.repo.virsat.url>
+				<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/24188989bef19563442734fd0bd66431ccff11b9</p2.repo.virsat.url>
 				<p2.repo.overtarget.id>Overtarget-Feature-Release</p2.repo.overtarget.id>
 				<p2.repo.overtarget.url>https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd/</p2.repo.overtarget.url>
 			</properties>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.dlr.sc.virsat.ide</groupId>
 	<artifactId>de.dlr.sc.virsat.ide</artifactId>
-	<version>4.15.0-SNAPSHOT</version>
+	<version>4.16.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<profiles>

-Original file line number
+Diff line change
 TjorveKujathDLR <[email protected]>			Tjorve Kujath <[email protected]>
 Anna-Lena-DLR <[email protected]>			Anna-Lena-DLR <[email protected]>
++
 +dellerDLR <[email protected]>					Dennis Eller <[email protected]>
 +dellerDLR <[email protected]>					elle_de <[email protected]>
++
 +pchrszon-dlr <[email protected]>			Chrszon, Philipp <[email protected]>