Merge pull request #84 from virtualsatellite/integration

PhilMFischer · web-flow · commit 36dafee772f4 · 2024-08-12T15:02:07.000+02:00
Integration 4.17.0 - Remerge Versions
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>
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,8 +26,8 @@ by German Aerospace Center (DLR e.V.)
    </license>
 
    <requires>
-      <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
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/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.16.0.qualifier
+Bundle-Version: 4.17.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 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.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>
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.16.0-SNAPSHOT</version>
+		<version>4.17.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.product</artifactId>
diff --git a/known_authors.txt b/known_authors.txt
@@ -1,4 +1,4 @@
 franzTobiasDLR
 PhilMFischer
 pchrszon-dlr
-dellerDLR
+dellerDLR
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -11,15 +11,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<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>
 	<packaging>pom</packaging>
 
 	<properties>
 		<tycho-version>3.0.5</tycho-version>
 		<maven.resources.version>2.6</maven.resources.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<build.version>4.16.0</build.version>
+		<build.version>4.17.0</build.version>
 		<build.qualifier>'t'yyyyMMddHHmm</build.qualifier>
 		<maven.build.timestamp.format>'t'yyyyMMddHHmm</maven.build.timestamp.format>
 
@@ -77,7 +77,7 @@
 				<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/development/</p2.repo.virsat.url>
 				<!-- p2.repo.virsat.url>file:/C:/git/VirtualSatellite4-Core/builds/p2/VirSat4_Dvlm_ConceptIDE/development</p2.repo.virsat.url -->
 				<p2.repo.overtarget.id>Overtarget-Feature-Development</p2.repo.overtarget.id>
-				<p2.repo.overtarget.url>https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd//</p2.repo.overtarget.url>
+				<p2.repo.overtarget.url>https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd/</p2.repo.overtarget.url>
 			</properties>
 		</profile>
 		<profile>
@@ -90,7 +90,7 @@
 				<p2.repo.virsat.id>DVLM-Tools-Feature-Integration</p2.repo.virsat.id>
 				<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/integration/${build.version}/</p2.repo.virsat.url>
 				<p2.repo.overtarget.id>Overtarget-Feature-Integration</p2.repo.overtarget.id>
-				<p2.repo.overtarget.url>https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd//</p2.repo.overtarget.url>
+				<p2.repo.overtarget.url>https://sourceforge.net/projects/overtarget/files/release/${overtarget.version}/9014ba468eeed12f9b9624b20bf8feef1f513fdd/</p2.repo.overtarget.url>
 			</properties>
 		</profile>
 		<profile>
@@ -102,7 +102,7 @@
 				<build.folder.type>release/${build.version}/${env.GITHUB_SHA}</build.folder.type>
 				<build.file>VirSat_IDE_Release_${build.version}_${env.GITHUB_SHA}</build.file>
 				<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}/24188989bef19563442734fd0bd66431ccff11b9</p2.repo.virsat.url>
+				<p2.repo.virsat.url>https://sourceforge.net/projects/virtualsatellite/files/VirtualSatellite4-DVLM/release/${build.version}/aaa5063b79d7a21ee35f69d4cb3291f1c116ac4d</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.16.0-SNAPSHOT</version>
+	<version>4.17.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<profiles>

-Original file line number
+Diff line change
 dellerDLR <[email protected]>					Dennis Eller <[email protected]>
 dellerDLR <[email protected]>					elle_de <[email protected]>
 +dellerDLR <[email protected]>					Dennis Eller <[email protected]>
 pchrszon-dlr <[email protected]>			Chrszon, Philipp <[email protected]>