Merge pull request #38 from virtualsatellite/integration

Release 4.11.0

.travis.yml

@@ -50,11 +50,17 @@ jobs:
     # -----------------------------------------------------------
     # --- The Job for feature branches only. Assemble the product, but don't deploy
     - stage: build-assemble-deploy
-      if: branch NOT IN (integration, development, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
+      if: branch NOT IN (integration, development, integration_snapshot, development_snapshot) AND NOT (branch =~ /^master/) AND NOT (tag =~ /^Release/)
       name: Build-Assemble-Deploy - Feature
       script:
       - bash/maven_build.sh -j assemble -p development   
 
+    - stage: build-assemble-deploy
+      if: (branch =~ /^master/) AND NOT (tag =~ /^Release/)
+      name: Build-Assemble - Release (no Deploy)
+      script:
+      - bash/maven_build.sh -j assemble -p release   
+
     # -----------------------------------------------------------
     # Deploy Jobs for unsecured Development.
     #------------------------------------------------------------

NOTICE.md

@@ -6,10 +6,16 @@ This content is produced and maintained by German Aerospace Center (DLR), Simula
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License 2.0 which is available at
-http://www.eclipse.org/legal/epl-2.0.
+<http://www.eclipse.org/legal/epl-2.0>.
+
 
 SPDX-License-Identifier: EPL-2.0
 
+## DLR logo and images
+
+(c) Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2020. The DLR logo and DLR images are under copyright of DLR (German Aerospace Center), <https://www.dlr.de/>. The DLR logo and images cannot be altered or used without DLR&apos;s permission. DLR logo and images are provided for the use under the following conditions <https://www.dlr.de/EN/Service/Imprint/imprint_node.html>. 
+
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

bash/verify_commit_authors.sh

@@ -40,12 +40,15 @@ echo "[Info] ------------------------------------"
 
 echo "[Info] Checking .mailmap"
 
-git diff --quiet development .mailmap
+# here we need to use the ... to actually see the diff of a file for just the branch
+# using .. would compare the head of development with head of the current branch. Thus
+# showing both differences.
+git diff --quiet development... .mailmap
 CHANGED_MAILMAP=$?
 
 echo "[Info] Checking known_authors.txt"
 
-git diff --quiet development known_authors.txt
+git diff --quiet development... known_authors.txt
 CHANGED_KNOWN_AUTHORS=$?
 
 echo "[Info] ------------------------------------"
@@ -75,14 +78,17 @@ echo "[Info] Create commit authors file"
 echo "[Info] ------------------------------------"
 echo "[Info] "
 
-git log development... --pretty=format:"%aN" | sort | uniq > ./commit_authors.txt
+# here we have to use .. and not ... . Only .. shows the log of the particular branch
+# and negates the ones from the first one, which is development. Be aware this is opposite behavior 
+# compared to the git diff
+git log development.. --pretty=format:"%aN" | sort | uniq > ./commit_authors.txt
 
 echo "[Info] ------------------------------------"
 echo "[Info] List of Commits and Authors"
 echo "[Info] ------------------------------------"
 echo "[Info] "
 
-git --no-pager log development... --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%aN>%Creset" --abbrev-commit --reverse
+git --no-pager log development.. --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%aN>%Creset" --abbrev-commit --reverse
 
 echo ""
 echo "[Info] ------------------------------------"
@@ -171,4 +177,4 @@ else
   echo -e "[Warn] ${CR}Report shows anomalies!${CN}"
   echo    "[Warn] ------------------------------------"
   exit 1
-fi
+fi

build.xml

@@ -7,13 +7,13 @@ http://www.eclipse.org/legal/epl-2.0.
 
 SPDX-License-Identifier: EPL-2.0
 -->
-	
-<project name="VirSat Core" default="updateVersions" basedir=".">
+
+<project name="VirSat Core" default="updateVersions" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
 	<description>
   	  Additional Build Preparations for VirSat
   	</description>
 
-	<property name="version">4.10.0</property>
+	<property name="version">4.11.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>
@@ -73,7 +73,7 @@ SPDX-License-Identifier: EPL-2.0
 		     ===================================================== -->
 		<input message="Please enter the new Version Number (e.g.: 4.0.3):" 
 			addproperty="version.new" 
-			defaultvalue="4.0.3" />
+			defaultvalue="${version}" />
 		<property name="version.new.qualified">${version.new}.qualifier</property>
 
 		<!-- =====================================================
@@ -86,7 +86,7 @@ SPDX-License-Identifier: EPL-2.0
 				<include name="build.xml" />
 			</fileset>
 		</replaceregexp>
-		
+
 		<!-- =====================================================
 		     Task: updateVersion - Update master pom
 		     ===================================================== -->
@@ -106,8 +106,8 @@ SPDX-License-Identifier: EPL-2.0
 			<regexp pattern="&lt;build.version&gt;${version.pattern}&lt;/build.version&gt;" />
 			<substitution expression="&lt;build.version&gt;${version.new}&lt;/build.version&gt;" />
 			<fileset dir=".">
-				<exclude name="de.dlr.sc.**/target/"/>
-				<include name="de.dlr.sc.**/**/pom.xml" />
+				<exclude name="**/target/"/>
+				<include name="**/pom.xml" />
 			</fileset>
 		</replaceregexp>
 
@@ -175,35 +175,5 @@ SPDX-License-Identifier: EPL-2.0
 				<include name="de.dlr.sc.**/**/updateSitePom/pom.xml" />
 			</fileset>
 		</replaceregexp>
-
-
-		<!-- =====================================================
-		     Task: updateVersion - Update Product Version
-		     ===================================================== -->
-		<replaceregexp byline="true">
-			<regexp pattern="version=&quot;${version.pattern.qualified}&quot;" />
-			<substitution expression="version=&quot;${version.new.qualified}&quot;" />
-			<fileset dir=".">
-				<exclude name="de.dlr.sc.**/target/"/>
-				<include name="de.dlr.sc.**/**/*.product" />
-			</fileset>
-		</replaceregexp>
-		<replaceregexp byline="true">
-			<regexp pattern="Version${version.pattern}" />
-			<substitution expression="Version ${version.new}" />
-			<fileset dir=".">
-				<exclude name="de.dlr.sc.**/target/"/>
-				<include name="de.dlr.sc.**/**/*.product" />
-			</fileset>
-		</replaceregexp>
-		<replaceregexp byline="true">
-			<regexp pattern="Version${version.pattern}" />
-			<substitution expression="Version ${version.new}" />
-			<fileset dir=".">
-				<exclude name="de.dlr.sc.**/target/"/>
-				<include name="de.dlr.sc.**/**/plugin.xml" />
-			</fileset>
-		</replaceregexp>
-
 	</target>
 </project>

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.10.0.qualifier"
+      version="4.11.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">
@@ -29,8 +29,8 @@ by German Aerospace Center (DLR e.V.)
       <import feature="org.eclipse.epp.mpc"/>
       <import feature="org.eclipse.epp.logging.aeri.feature"/>
       <import feature="org.eclipse.oomph.setup"/>
-      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.10.0.qualifier"/>
-      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.10.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.license.feature" version="4.11.0.qualifier"/>
+      <import feature="de.dlr.sc.virsat.ide.docs.feature" version="4.11.0.qualifier"/>
    </requires>
 
    <plugin

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.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.feature</artifactId>

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.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Vendor: DLR (German Aerospace Center)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.platform,

de.dlr.sc.virsat.ide.branding.ui/about.html

@@ -8,7 +8,7 @@
 <body lang="EN-US">
 <h2>About This Content</h2>
 
-<p>December 18, 2018</p>	
+<p>March 04, 2020</p>	
 <h3>License</h3>
 
 <p>The German Aerospace Center (DLR) makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
@@ -23,5 +23,30 @@ <h3>License</h3>
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to this content.<p>
 
+<h3>Third Party Content</h3>
+
+<p>
+The Content includes items that have been sourced from third parties as set out below. If you 
+did not receive this Content directly from the German Aerospace Center (DLR e.V.), the following is provided 
+for informational purposes only, and you should look to the Redistributor&rsquo;s license for 
+terms and conditions of use. Third party licenses may be aggregated in the &quot;about_files&quot; folder of this plugin.
+</p>
+
+<h4>DLR Logo and Images</h4>
+
+<p>
+The DLR logo and DLR images are under copyright of DLR (German Aerospace Center), <a href="https://www.dlr.de/">www.dlr.de</a>.
+The DLR logo and images cannot be altered or used without DLR's permission.
+DLR logo and images are provided for the use under the following conditions <a href="https://www.dlr.de/EN/Service/Imprint/imprint_node.html">www.dlr.de/EN/Service/Imprint/imprint_node.html<a> . 
+</p>
+
+<h4>Eclipse Logo and Images</h4>
+
+<p>
+Eclipse and the Eclipse logo are trademarks of the Eclipse Foundation, Inc., <a href="https://www.eclipse.org/">www.eclipse.org/</a>.
+The Eclipse logo cannot be altered without Eclipse's permission.
+Eclipse logos are provided for use under the Eclipse logo and trademark guidelines, <a href="https://www.eclipse.org/logotm/">https://www.eclipse.org/logotm/</a>.
+</p>
+
 </body>
 </html>

de.dlr.sc.virsat.ide.branding.ui/about.ini

@@ -9,7 +9,7 @@
 aboutText=%blurb
 
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
+featureImage=VirSatIDEAbout.png
 
 # Property "windowImage" contains path to window icon (16x16)
 # needed for primary features only

de.dlr.sc.virsat.ide.branding.ui/about.mappings

@@ -5,3 +5,4 @@
 
 0=@eclipse.simultaneous.release.build@
 1=@eclipse.simultaneous.release.name@
+2=@build.version@

de.dlr.sc.virsat.ide.branding.ui/build.properties

@@ -13,4 +13,5 @@ bin.includes = META-INF/,\
                plugin_customization.ini,\
                plugin.properties,\
                plugin.xml,\
-               splash.bmp
+               splash.bmp,\
+               VirSatIDEAbout.png

de.dlr.sc.virsat.ide.branding.ui/plugin.xml

@@ -14,7 +14,7 @@
          </property>
          <property
                name="aboutText"
-               value="Virtual Satellite IDE&#x0A;&#x0A;Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2017.&#x0A;&#x0A;based on Eclipse for RCP and RAP Developers&#x0A;&#x0A;Version: {1}&#x0A;Build id: {0}&#x0A;&#x0A;(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&apos;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.&#x0A;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.">
+               value="Virtual Satellite IDE&#x0D;&#x0A;&#x0D;&#x0A;(c) Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2020. The DLR logo and DLR images are under copyright of DLR (German Aerospace Center), https://www.dlr.de/. The DLR logo and images cannot be altered or used without DLR&apos;s permission. DLR logo and images are provided for the use under the following conditions https://www.dlr.de/EN/Service/Imprint/imprint_node.html . &#x0D;&#x0A;&#x0D;&#x0A;based on Eclipse for RCP and RAP Developers&#x0D;&#x0A;&#x0D;&#x0A;Virtual Satellite Version: {2}.{0}&#x0D;&#x0A;Eclipse Version: {1}&#x0D;&#x0A;&#x0D;&#x0A;(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&apos;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.&#x0D;&#x0A;&#x0D;&#x0A;This product includes software developed by other open source projects including the Apache Software Foundation, https://www.apache.org/.">
          </property>
          <property
                name="startupForegroundColor"

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.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.branding.ui</artifactId>

de.dlr.sc.virsat.ide.docs.feature/docs/NOTICE.md

@@ -6,10 +6,16 @@ This content is produced and maintained by German Aerospace Center (DLR), Simula
 
 This program and the accompanying materials are made available under the
 terms of the Eclipse Public License 2.0 which is available at
-http://www.eclipse.org/legal/epl-2.0.
+<http://www.eclipse.org/legal/epl-2.0>.
+
 
 SPDX-License-Identifier: EPL-2.0
 
+## DLR logo and images
+
+(c) Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2020. The DLR logo and DLR images are under copyright of DLR (German Aerospace Center), <https://www.dlr.de/>. The DLR logo and images cannot be altered or used without DLR&apos;s permission. DLR logo and images are provided for the use under the following conditions <https://www.dlr.de/EN/Service/Imprint/imprint_node.html>. 
+
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

de.dlr.sc.virsat.ide.docs.feature/docs/VirSat_IDE_ReleaseNotes.txt

@@ -1,6 +1,17 @@
 VirSat IDE Release Notes
 -------------------------
 
+Release 4.11.0    (4th March 2020)
+----------------------------------
+
+New Features:
+    Added Concept language and generators of Virtual Satellite Core 4.11.0
+
+Usability Updates:
+
+Fixed Bugs:
+    Updated Feature Logo to Virtual Satellite specific one
+
 Release 4.10.0 (4th December 2019)
 ----------------------------------
 

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.10.0.qualifier"
+      version="4.11.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">

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.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.docs.feature</artifactId>

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.10.0.qualifier"
+      version="4.11.0.qualifier"
       provider-name="DLR (German Aerospace Center)">
 
    <description>

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.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.license.feature</artifactId>

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.10.0-SNAPSHOT</version>
+		<version>4.11.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>de.dlr.sc.virsat.ide.product</artifactId>

de.dlr.sc.virsat.ide.product/virsat_ide.product

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Virtual Satellite IDE for RCP and RAP Developers" uid="de.dlr.sc.virsat.ide.product" id="de.dlr.sc.virsat.ide.branding.ui.product" application="org.eclipse.ui.ide.workbench" version="4.10.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Virtual Satellite IDE for RCP and RAP Developers" uid="de.dlr.sc.virsat.ide.product" id="de.dlr.sc.virsat.ide.branding.ui.product" application="org.eclipse.ui.ide.workbench" version="4.11.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/de.dlr.sc.virsat.ide.branding.ui/eclipse_lg.png"/>
       <text>
          Virtual Satellite IDE
 
-Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2018.
+(c) Copyright by DLR (German Aerospace Center) Simulation and Software Technology 2020. The DLR logo and DLR images are under copyright of DLR (German Aerospace Center), https://www.dlr.de/. The DLR logo and images cannot be altered or used without DLR&apos;s permission. DLR logo and images are provided for the use under the following conditions https://www.dlr.de/EN/Service/Imprint/imprint_node.html . 
 
 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&apos;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/.
@@ -38,8 +41,8 @@ This product includes software developed by other open source projects including
 
    <splash
       location="de.dlr.sc.virsat.ide.branding.ui"
-      startupProgressRect="72,90,251,8"
-      startupMessageRect="72,110,251,20"
+      startupProgressRect="5,280,230,15"
+      startupMessageRect="7,260,230,20"
       startupForegroundColor="9c9696" />
    <launcher name="eclipse">
       <win useIco="false">