Merge pull request #242 from virtualsatellite/integration

Release 4.18.0
virtualsatellite · Nov 15, 2024 · 6a5dff3 · 6a5dff3
2 parents 0825836 + fa665f9
commit 6a5dff3
Show file tree

Hide file tree

Showing 62 changed files with 179 additions and 171 deletions.
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.17.0</property>
+	<property name="version">4.18.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.cef.branding.feature/feature.xml b/de.dlr.sc.virsat.cef.branding.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.cef.branding.feature"
       label="VirSat CEF Branding Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       license-feature="de.dlr.sc.virsat.cef.license.feature">
 

diff --git a/de.dlr.sc.virsat.cef.branding.feature/pom.xml b/de.dlr.sc.virsat.cef.branding.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.branding.ui/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.branding.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Branding
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.branding.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: de.dlr.sc.virsat.cef.branding.ui.BrandingPlugin
 Bundle-Vendor: DLR (German Aerospace Center)
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/de.dlr.sc.virsat.cef.branding.ui/plugin.xml b/de.dlr.sc.virsat.cef.branding.ui/plugin.xml
@@ -25,7 +25,7 @@
          </property>
          <property
                name="aboutText"
-               value="Virtual Satellite 4 - CEF&#x0D;&#x0A;&#x0D;&#x0A;Version 4.17.0&#x0D;&#x0A;&#x0D;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2020. &#x0D;&#x0A;&#x0D;&#x0A;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. &#x0D;&#x0A;&#x0D;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as the 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&#x0D;&#x0A;&#x0D;&#x0A;The CEF logo and images cannot be altered or used without DLR&apos;s permission.&#x0D;&#x0A;&#x0D;&#x0A;German Aerospace Center (DLR) e.V.&#x0D;&#x0A;Lilienthalplatz 7&#x0D;&#x0A;38108 Braunschweig&#x0D;&#x0A;Germany">
+               value="Virtual Satellite 4 - CEF&#x0A;&#x0A;Version 4.18.0&#x0A;&#x0A;© Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2024. &#x0A;&#x0A;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. &#x0A;&#x0A;Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as the images, photographs, videos and texts which are indicated as being under DLR´s copyright through copyright notice (i. g. © DLR 2024)  are provided for use under the Terms of use as provided for on DLRs webpage www.dlr.de&#x0A;&#x0A;The CEF logo and images cannot be altered or used without DLR&apos;s permission.&#x0A;&#x0A;German Aerospace Center (DLR) e.V.&#x0A;Lilienthalplatz 7&#x0A;38108 Braunschweig&#x0A;Germany">
          </property>
          <property
                name="aboutImage"

diff --git a/de.dlr.sc.virsat.cef.branding.ui/pom.xml b/de.dlr.sc.virsat.cef.branding.ui/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.calculation.test/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.calculation.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Calculation Tests
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.calculation.test
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: de.dlr.sc.virsat.cef.calculation
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: DLR (German Aerospace Center)

diff --git a/de.dlr.sc.virsat.cef.calculation.test/pom.xml b/de.dlr.sc.virsat.cef.calculation.test/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.calculation/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.calculation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Calculation
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.calculation;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Eclipse-ExtensibleAPI: true
 Require-Bundle: org.eclipse.ui,

diff --git a/de.dlr.sc.virsat.cef.calculation/pom.xml b/de.dlr.sc.virsat.cef.calculation/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.docs.feature/docs/VirSat_CEF_ReleaseNotes.txt b/de.dlr.sc.virsat.cef.docs.feature/docs/VirSat_CEF_ReleaseNotes.txt
@@ -3,8 +3,15 @@ VirSat CEF Release Notes
 
 VirSat CEF is based on VirSat Core. Please don't forget to read the Release Notes of VirSat Core as well!
 
+Release 4.18.0 (14th November 2024)
+-----------------------------------
+
+Maintenance:
+	Update to Virtual Satellite Core 4.18.0
+
+
 Release 4.17.0 (12th September 2024)
-----------------------------------
+------------------------------------
 
 New Features:
 	Server is now hsoting the swagger UI by itself and is exploring the API at runtime

diff --git a/de.dlr.sc.virsat.cef.docs.feature/feature.xml b/de.dlr.sc.virsat.cef.docs.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.cef.docs.feature"
       label="VirSat CEF Documents and Release Notes Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.cef.branding.ui"
       license-feature="de.dlr.sc.virsat.cef.license.feature">

diff --git a/de.dlr.sc.virsat.cef.docs.feature/pom.xml b/de.dlr.sc.virsat.cef.docs.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.license.feature/feature.xml b/de.dlr.sc.virsat.cef.license.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.cef.license.feature"
       label="VirSat CEF License Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)">
 
    <description>

diff --git a/de.dlr.sc.virsat.cef.license.feature/pom.xml b/de.dlr.sc.virsat.cef.license.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.p2updatesite/category.xml b/de.dlr.sc.virsat.cef.p2updatesite/category.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/de.dlr.sc.virsat.cef.branding.feature_4.17.0.qualifier.jar" id="de.dlr.sc.virsat.cef.branding.feature" version="4.17.0.qualifier">
+   <feature url="features/de.dlr.sc.virsat.cef.branding.feature_4.18.0.qualifier.jar" id="de.dlr.sc.virsat.cef.branding.feature" version="4.18.0.qualifier">
       <category name="VirSat_CEF_Features"/>
    </feature>
-   <feature url="features/de.dlr.sc.virsat.model.extension.cef.feature_4.17.0.qualifier.jar" id="de.dlr.sc.virsat.model.extension.cef.feature" version="4.17.0.qualifier">
+   <feature url="features/de.dlr.sc.virsat.model.extension.cef.feature_4.18.0.qualifier.jar" id="de.dlr.sc.virsat.model.extension.cef.feature" version="4.18.0.qualifier">
       <category name="VirSat_CEF_Features"/>
    </feature>
-   <feature url="features/de.dlr.sc.virsat.cef.license.feature_4.17.0.qualifier.jar" id="de.dlr.sc.virsat.cef.license.feature" version="4.17.0.qualifier">
+   <feature url="features/de.dlr.sc.virsat.cef.license.feature_4.18.0.qualifier.jar" id="de.dlr.sc.virsat.cef.license.feature" version="4.18.0.qualifier">
       <category name="VirSat_CEF_Features"/>
    </feature>
-   <feature url="features/de.dlr.sc.virsat.model.extension.cef.interfaces.feature_4.17.0.qualifier.jar" id="de.dlr.sc.virsat.model.extension.cef.interfaces.feature" version="4.17.0.qualifier">
+   <feature url="features/de.dlr.sc.virsat.model.extension.cef.interfaces.feature_4.18.0.qualifier.jar" id="de.dlr.sc.virsat.model.extension.cef.interfaces.feature" version="4.18.0.qualifier">
       <category name="VirSat_CEF_Features"/>
    </feature>
    <feature id="de.dlr.sc.virsat.model.extension.cefx.feature">

diff --git a/de.dlr.sc.virsat.cef.p2updatesite/pom.xml b/de.dlr.sc.virsat.cef.p2updatesite/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.product/plugin_customization.ini b/de.dlr.sc.virsat.cef.product/plugin_customization.ini
@@ -0,0 +1 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
diff --git a/de.dlr.sc.virsat.cef.product/pom.xml b/de.dlr.sc.virsat.cef.product/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.product/virsat_cef.product b/de.dlr.sc.virsat.cef.product/virsat_cef.product
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="VirSat CEF Edition" uid="de.dlr.virsat.cef.product" id="de.dlr.sc.virsat.cef.branding.ui.VirSat_CEF" application="org.eclipse.ui.ide.workbench" version="4.17.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="VirSat CEF Edition" uid="de.dlr.virsat.cef.product" id="de.dlr.sc.virsat.cef.branding.ui.VirSat_CEF" application="org.eclipse.ui.ide.workbench" version="4.18.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/de.dlr.sc.virsat.cef.branding.ui/resources/images/Branding/CEF_256x330.gif"/>
       <text>
          Virtual Satellite 4 - CEF
 
-Version 4.17.0
+Version 4.18.0
 
 © Copyright by DLR (Deutsches Zentrum fuer Luft- und Raumfahrt e. V., German Aerospace Center) 2024. 
 

diff --git a/de.dlr.sc.virsat.cef.swtbot.test/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.swtbot.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF UI Tests with SwtBot
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.swtbot.test
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: 
  DLR (German Aerospace Center)
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/de.dlr.sc.virsat.cef.swtbot.test/pom.xml b/de.dlr.sc.virsat.cef.swtbot.test/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath>../maven/pom.xml</relativePath>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.cef.swtbot.test</artifactId>

diff --git a/de.dlr.sc.virsat.cef.target.feature/feature.xml b/de.dlr.sc.virsat.cef.target.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.cef.target.feature"
       label="VirSat CEF Target Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.cef.branding.ui"
       license-feature="de.dlr.sc.virsat.cef.license.feature">

diff --git a/de.dlr.sc.virsat.cef.target.feature/pom.xml b/de.dlr.sc.virsat.cef.target.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.target/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.target/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Target
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.target
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
 Eclipse-ExtensibleAPI: true
 Automatic-Module-Name: de.dlr.sc.virsat.cef.target

diff --git a/de.dlr.sc.virsat.cef.target/pom.xml b/de.dlr.sc.virsat.cef.target/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.test.feature/feature.xml b/de.dlr.sc.virsat.cef.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.cef.test.feature"
       label="Virsat CEF Tests Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       license-feature="de.dlr.sc.virsat.license.feature">
 

diff --git a/de.dlr.sc.virsat.cef.test.feature/pom.xml b/de.dlr.sc.virsat.cef.test.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.test/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.cef.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Test Plugin
 Bundle-SymbolicName: de.dlr.sc.virsat.cef.test
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: de.dlr.sc.virsat.cef.plugin.Activator
 Bundle-Vendor: DLR (German Aerospace Center)
 Require-Bundle: org.eclipse.core.runtime,

diff --git a/de.dlr.sc.virsat.cef.test/pom.xml b/de.dlr.sc.virsat.cef.test/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.model.extension.cef.feature/feature.xml b/de.dlr.sc.virsat.model.extension.cef.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.model.extension.cef.feature"
       label="VirSat CEF Model Extension Data Model"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.cef.branding.ui"
       license-feature="de.dlr.sc.virsat.cef.license.feature">

diff --git a/de.dlr.sc.virsat.model.extension.cef.feature/pom.xml b/de.dlr.sc.virsat.model.extension.cef.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.feature/feature.xml b/de.dlr.sc.virsat.model.extension.cef.interfaces.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.dlr.sc.virsat.model.extension.cef.interfaces.feature"
       label="VirSat CEF Model Extension Interfaces Data Model Feature"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="DLR (German Aerospace Center)"
       plugin="de.dlr.sc.virsat.cef.branding.ui"
       license-feature="de.dlr.sc.virsat.cef.license.feature">

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.feature/pom.xml b/de.dlr.sc.virsat.model.extension.cef.interfaces.feature/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.test/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.model.extension.cef.interfaces.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Model Extension Interfaces Data Model Tests
 Bundle-SymbolicName: de.dlr.sc.virsat.model.extension.cef.interfaces.test;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: de.dlr.sc.virsat.model.extension.cef.interfaces;bundle-version="0.0.1"
 Bundle-ClassPath: .
 Bundle-Vendor: DLR (German Aerospace Center)

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.test/pom.xml b/de.dlr.sc.virsat.model.extension.cef.interfaces.test/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.ui/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.model.extension.cef.interfaces.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Model Extension Interfaces Data Model UI
 Bundle-SymbolicName: de.dlr.sc.virsat.model.extension.cef.interfaces.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: de.dlr.sc.virsat.model.extension.cef.interfaces,
  org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces.ui/pom.xml b/de.dlr.sc.virsat.model.extension.cef.interfaces.ui/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/META-INF/MANIFEST.MF b/de.dlr.sc.virsat.model.extension.cef.interfaces/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VirSat CEF Model Extension Interfaces Data Model
 Bundle-SymbolicName: de.dlr.sc.virsat.model.extension.cef.interfaces;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept.xmi b/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept.xmi
@@ -39,20 +39,20 @@
         </left>
         <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataDutyCycle"/>
       </expression>
-      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="8fb888a3-9a3e-4142-a2cf-1f1a300494f2" name="DataCombinedDutyCycle"/>
+      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="9a647c01-dfca-4eda-9c94-a022b4814235" name="DataCombinedDutyCycle"/>
     </equationDefinitions>
     <equationDefinitions>
       <expression xsi:type="dvlm_calc:AdditionAndSubtraction">
         <left xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitOnWithMargin"/>
-          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="8fb888a3-9a3e-4142-a2cf-1f1a300494f2"/>
+          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="9a647c01-dfca-4eda-9c94-a022b4814235"/>
         </left>
         <right xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitStbyWithMargin"/>
           <right xsi:type="dvlm_calc:Parenthesis">
             <right xsi:type="dvlm_calc:AdditionAndSubtraction" operator="-">
               <left xsi:type="dvlm_calc:NumberLiteral" value="1"/>
-              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="8fb888a3-9a3e-4142-a2cf-1f1a300494f2"/>
+              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="9a647c01-dfca-4eda-9c94-a022b4814235"/>
             </right>
           </right>
         </right>