Merge pull request #716 from virtualsatellite/integration

Release 4.12.0

.codebeatignore

@@ -0,0 +1,10 @@
+**/src-gen/**
+**/xtend-gen/**
+**/src-dmf/**
+**/templates-gen/**
+**/Activator.java
+**/ui/**
+*.test/**
+**/migrator/**
+**/validator/**
+**/externalLib/**

.codebeatsettings

@@ -0,0 +1,12 @@
+{
+    "JAVA": {
+        "ABC": [30, 40, 60, 80],
+        "ARITY": [10, 15, 20, 25],
+        "CYCLO": [30, 40, 55, 70],
+        "LOC": [85, 90, 95, 100],
+        "TOTAL_COMPLEXITY": [200, 280, 380, 500],
+        "TOTAL_LOC": [350, 400, 500, 600],
+        "TOO_MANY_FUNCTIONS": [70, 80, 90, 100],
+        "BLOCK_NESTING": [5, 6, 7, 8]
+    }
+}

.gitattributes

@@ -0,0 +1,5 @@
+# Mark all generated code, so they won't appear in diffs of PRS anymore
+**/src-gen/**/* linguist-generated=true
+**/xtend-gen/**/* linguist-generated=true
+**/templates-gen/**/* linguist-generated=true
+**/about_files/maven/ linguist-generated=true

.github/ISSUE_TEMPLATE/default.md

@@ -0,0 +1,12 @@
+---
+name: Default
+about: Create a report to help us improve
+title: 'Issue ... '
+labels: 
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what this ticket is about.
+

.github/ISSUE_TEMPLATE/release.md

@@ -23,7 +23,7 @@ This ticket captures all release related work of the VirtualSatellite4-Core rele
   - [ ] Adjust DVLM version number in EquationDSL.xtext and run GenerateEquationDSL.mwe2
   - [ ] Regenerate concept.xmi of all relevant projects (launch "VirSat Core Concept IDE", import projects (with nested), build all)
 - [ ] Update the Java API Doc being registered in the Java doc plugin
-- [ ] Make sure application launches without errors
+- [ ] Make sure application launches without errors from the product launcher
 - [ ] Merge integration branch into development branch (Pull Request named "Integration 4.x.x - Remerge Versions")
 
 2. Perform integration on integration branch:

.mailmap

@@ -12,10 +12,13 @@ SaMuellerDLR <sa.mueller@dlr.de>				Sascha Müller <sa.mueller@dlr.de>
 
 PhilMFischer <philipp.fischer@dlr.de>			Philipp M. Fischer <35496033+PhilMFischer@users.noreply.github.com>
 PhilMFischer <philipp.fischer@dlr.de>			Philipp M. Fischer <philipp.fischer@dlr.de>
+PhilMFischer <philipp.fischer@dlr.de>			philmfischer <philipp.fischer@dlr.de>
 PhilMFischer <philipp.fischer@dlr.de>			fisc_ph <fisc_ph@SC-010165.intra.dlr.de>
 
 JAmmermann-DLR <Joshua.Ammermann@dlr.de>		amme_jo <amme_jo@SC-010135.intra.dlr.de>
 
 Anna-Lena-DLR <anna-lena.gefke@dlr.de>			Anna-Lena Gefke <anna-lena.gefke@dlr.de>
 
 dianapeters-dlr <diana.peters@dlr.de>			Diana Peters <diana.peters@dlr.de>
+
+watollah-dlr <Hannes.Watolla@dlr.de>			wato_ha <wato_ha@SC-010058.intra.dlr.de>

.travis.yml

@@ -55,14 +55,6 @@ env:
   # API Token for access to github
   # ---------------------------------------------
   - secure: "POYGzbPXLBDe2BsehzJ7QUZ4toQ1Pbi2VdH8ZTSN9zqipLbBVnsMghs7Zf80C+AK1nKbY2DPWHwaWR6LE3MRhA9X3xeyYgJ/53J4JeMw1ORYpavVXJC9t8d+fMVCJhALzjQYz7PmE4ba/MHgr/UnoeNL2v1M/9mUpMbfD490jPUdOQjqpy0/FvM5HhXcQEwexUPsNsR+DffVSSmJ62aXHPM2pgKYaH0pnY5OYwm4t7v7lp8GgQf+b163+rD2LyLIEeLiQ1msXAqaRSBznuu2wqi7N3ZC176i864fRHf8M4RYbWqA0BneCd0keAQJLvpcPBoyE1T0XKYvjz5JdjbuNDX1p4waLo7CnU+UJzuCQ5hnkrDm7YJhwQY007T2kudUTPl0dP0TeoJsDtz30vvBC82equJA5+0xPb1BvvDmdKFkfF7gOGh05qjhAo3TJ8D5CXXFmdPr9VApYv0zqzh0hR5p+5FHkDmKhzJ7xg4jpo04IXa8ztBCjoB4dyLnUDhyTABtA5/uoRuMA4I7nc25mKL6Z9fz8O8HadAInlJFXyodQOrvD68k2Bf9WJWreZMKcLJiOWQC0bbPNa6ABrRpiuzdUdWEpzNjJJYktmPl+JwHAJ4Fa3CHaNFILaLLC9Z3gtrdNT2+PkME8u0sfVWZ1nU4nNO9EGUItcBEFhkCnZE="
-  # ---------------------------------------------
-  # Setup Overtarget Repository and Version
-  # ---------------------------------------------
-  - OVERTARGET_VERSION=1.1.0.r201903120902
-  - OVERTARGET_REPO=https://sourceforge.net/projects/overtarget/files/release/1.1.0/25/plugins
-  - OVERTARGET_GROUP=de.dlr.sc.overtarget
-  - JUNIT_DEBUG_PROJECT_TEST_CASE=true
-  - SWTBOT_SCREENSHOT=true
 
 before_script:
   # -----------------------------------
@@ -72,9 +64,7 @@ before_script:
   # -------------------------------------------------------------------
   # create adirectory for Overtarget and try to receive language plugin
   # -------------------------------------------------------------------
-  - mkdir -p ./OverTarget
-  - travis_retry curl -v -L -o ./OverTarget/OverTarget.jar ${OVERTARGET_REPO}/${OVERTARGET_GROUP}.language_${OVERTARGET_VERSION}.jar/download#
-  - mvn install:install-file -Dfile=./OverTarget/OverTarget.jar -DgroupId=${OVERTARGET_GROUP} -DartifactId=${OVERTARGET_GROUP}.language -Dversion=${OVERTARGET_VERSION} -Dpackaging=jar
+  - bash/maven_build.sh -j dependencies -p dependencies
   # --------------------------------------------------------------
   # Setup environment variables for correct linking of vtk and zmq
   # --------------------------------------------------------------
@@ -100,11 +90,11 @@ after_failure:
   # then try to deploy the screenshots from 
   # SWTBot to see what happened 
   # ----------------------------------------
-  - bash/deploy_sourceforge.sh -u swtbot
+  - bash/deploy_sourceforge.sh -u swtbot
   # ---------------------------------------
   # Show the debug output of Surefire Junit
   # ---------------------------------------
-  - cat $TRAVIS_BUILD_DIR/de.dlr.sc.virsat.test/target/surefire-reports/de.dlr.sc.virsat.test.ProjectAllTest-output.txt
+  - cat $TRAVIS_BUILD_DIR/de.dlr.sc.virsat.test/target/surefire-reports/de.dlr.sc.virsat.test.ProjectAllTest-output.txt
 
 jobs:
   include:
@@ -122,7 +112,7 @@ jobs:
     # -----------------------------------------------------
     # --- Development and Feature Branches
     - stage: build-test
-      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
+      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (branch =~ /^master/) AND NOT (tag =~ /^Release/)
       name: Build and Test - SpotBugs - Development and Features
       script:
       - bash/maven_build.sh -j spotbugs -p development
@@ -136,7 +126,7 @@ jobs:
     # ----------------------------
     # --- Release Tags
     - stage: build-test
-      if: tag =~ /^Release/
+      if: (branch =~ /^master/) OR (tag =~ /^Release/)
       name: Build and Test - SpotBugs - Release
       script:
       - bash/maven_build.sh -j spotbugs -p release   
@@ -146,31 +136,31 @@ jobs:
     # -----------------------------------------------------
     # --- Development and Feature Branches
     - stage: build-test
-      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
+      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (branch =~ /^master/) AND NOT (tag =~ /^Release/)
       name: Build and Test - Surefire - Development and Features
       script:
-      - bash/maven_build.sh -j surefire -p development   
+      - bash/maven_build.sh -j surecoverage -p development   
     # ----------------------------
     # --- Integration Branches
     - stage: build-test
       if: branch = integration
       name: Build and Test - Surefire - Integration
       script:
-      - bash/maven_build.sh -j surefire -p integration   
+      - bash/maven_build.sh -j surecoverage -p integration   
     # ----------------------------
     # --- Release Tags
     - stage: build-test
-      if: tag =~ /^Release/
+      if: (branch =~ /^master/) OR (tag =~ /^Release/)
       name: Build and Test - Surefire - Release
       script:
-      - bash/maven_build.sh -j surefire -p release   
+      - bash/maven_build.sh -j surecoverage -p release   
 
     # -----------------------------------------------------
     # Build and Test - Checkstyle Jobs
     # -----------------------------------------------------
     # --- Development and Feature Branches
     - stage: build-test
-      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
+      if: branch NOT IN (integration, integration_snapshot, development_snapshot) AND NOT (branch =~ /^master/) AND NOT (tag =~ /^Release/)
       name: Build and Test - Checkstyle - Development and Features
       script:
       - bash/maven_build.sh -j checkstyle -p development   
@@ -184,7 +174,7 @@ jobs:
     # ----------------------------
     # --- Release Tags
     - stage: build-test
-      if: tag =~ /^Release/
+      if: (branch =~ /^master/) OR (tag =~ /^Release/)
       name: Build and Test - Checkstyle - Release
       script:
       - bash/maven_build.sh -j checkstyle -p release   
@@ -200,6 +190,13 @@ jobs:
       script:
       - bash/maven_build.sh -j assemble -p development   
 
+    # For simulating the assemble steps but not actually deploying
+    - 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

@@ -1,6 +1,6 @@
 # Virtual Satellite
 
-This content is produced and maintained by German Aerospace Center (DLR), Simulation and Software Technology.
+This content was engendered by Deutsches Zentrum fuer Luft- und Raumfahrt e.V., German Aerospace Center, DLR and is protected under DLR copyright, © DLR 2020.
 
 ## Project License
 
@@ -20,17 +20,29 @@ Apache Commons CLI
 
  * License: Apache License, 2.0
 
+Apache Commons CSV
+
+ * License: Apache License, 2.0
+
 Apache Commons Math
 
  * License: Apache License, 2.0
 
+Jersey JAX RS RI 
+
+* License: Eclipse Public License, 2.0
+
 JFreeChart
 
  * License: GNU Lesser General Public Licence (LGPL), 2.1
 
 JSON Simple
 
  * License: Apache License, 2.0
+
+MAT File Library
+
+ * License: Apache License, 2.0
 
 Nebula Widgets Incubation
 
@@ -57,6 +69,13 @@ ZeroMQ 4.1.4 and Jzmq 3.1.0
  * License: GNU Lesser General Public Licence (LGPL), 3
 
 
+## DLR trade mark and copyrighted material other than S/W
+
+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. 
+
+Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as 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 <https://www.dlr.de>.
+
+
 ## Cryptography
 
 Content may contain encryption software. The country in which you are currently

README.md

@@ -87,7 +87,13 @@ Copyright 2019 German Aerospace Center (DLR)
 
 The German Aerospace Center (DLR) makes available all content in this plug-in ("Content").  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL").  A copy of the EPL is available at https://www.eclipse.org/legal/epl-2.0. For purposes of the EPL, "Program" will mean the Content.
 
-If you did not receive this Content directly from German Aerospace Center (DLR), the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content.  Check the Redistributor's license that was 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>
+If you did not receive this Content directly from German Aerospace Center (DLR), the Content is being redistributed by another party ("Redistributor") and different terms and conditions may apply to your use of any object code in the Content.  Check the Redistributor's license that was 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.
+
+## DLR trade mark and copyrighted material other than S/W
+
+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. 
+
+Copyrighted content other than the S/W provided under the indicated Eclipse License Conditions such as 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 <https://www.dlr.de>.
 
 ## Third Party Licenses
 

bash/deploy_sourceforge.sh

@@ -24,8 +24,20 @@ printUsage() {
 }
 
 uploadSwtBot() {
-	cp $TRAVIS_BUILD_DIR/de.dlr.sc.virsat.swtbot.test/target/surefire-reports/* $TRAVIS_BUILD_DIR/swtbot/
-	rsync -e ssh -avP $TRAVIS_BUILD_DIR/swtbot/  dlrscmns@frs.sourceforge.net:/home/frs/project/virtualsatellite/VirtualSatellite4-Core/swtbot/
+	if [ "$(ls -A ${TRAVIS_BUILD_DIR}/swtbot)" ]; then
+		echo "Test Artifacts: Collecting all reports in: ${TRAVIS_BUILD_DIR}/swtbot"
+		cp $TRAVIS_BUILD_DIR/de.dlr.sc.virsat.swtbot.test/target/surefire-reports/* $TRAVIS_BUILD_DIR/swtbot/
+		TEST_ARTEFACTS_ZIP=SwtBot_${TRAVIS_REPO_SLUG}_${TRAVIS_BRANCH}_${TRAVIS_JOB_NUMBER}_${TRAVIS_COMMIT}
+		# Remove "/" "\" and "." from filename and attach .zip to it
+		TEST_ARTEFACTS_ZIP=$(sed  -e 's/[\/.]/\_/g' <<< ${TEST_ARTEFACTS_ZIP}).zip
+		echo "Test Artifacts: About to zip all artifacts into: ${TEST_ARTEFACTS_ZIP}"
+		zip ${TRAVIS_BUILD_DIR}/swtbot/${TEST_ARTEFACTS_ZIP} swtbot/*
+		echo "Test Artifacts: Starting upload to SourceForge..."
+		ls -lh ${TRAVIS_BUILD_DIR}/swtbot/
+		rsync -e ssh -avP ${TRAVIS_BUILD_DIR}/swtbot/${TEST_ARTEFACTS_ZIP} dlrscmns@frs.sourceforge.net:/home/frs/project/virtualsatellite/VirtualSatellite4-Core/swtbot/
+	else
+		echo "Test Artifacts:No files in folder: ${TRAVIS_BUILD_DIR}/swtbot"
+	fi
 }
 
 uploadDevelopment() {

bash/maven_build.sh

@@ -21,28 +21,44 @@ set -e
 # displayed in case of usage issues
 COMMAND=$0
 
+# set general variables to correctly execute the build process
+export OVERTARGET_VERSION=1.1.0.r201903120902
+export OVERTARGET_REPO=https://sourceforge.net/projects/overtarget/files/release/1.1.0/25/plugins
+export OVERTARGET_GROUP=de.dlr.sc.overtarget
+export JUNIT_DEBUG_PROJECT_TEST_CASE=true
+export SWTBOT_SCREENSHOT=true
+
 # this method gives some little usage info
 printUsage() {
-	echo "usage: ${COMMAND} -j [surefire|spotbugs|checkstyle|assemble] -p [development|integration|release]"
+	echo "usage: ${COMMAND} -j [dependencies|surefire|spotbugs|checkstyle|assemble] -p [dependencies|development|integration|release]"
 	echo ""
 	echo "Options:"
 	echo " -j, --jobs <jobname>	    The name of the Travis-CI job to be build."
 	echo " -p, --profile <profile>  The name of the maven profile to be build."
 	echo ""
 	echo "Jobname:"
+	echo " dependencies  Downloads and installs maven dependencies, e.g. overtarget."
 	echo " surefire      To run all surefire tests including junit and swtbot."
+	echo " surecoverage  To run all surefire tests including junit and swtbot and finally upload reports to codecov."
 	echo " spotbugs      To run spotbugs static code analysis."
 	echo " checkstyle    To run checkstyle for testing style guidelines."
 	echo " assemble      To run full assemble including the java docs build."
 	echo ""
 	echo "Profile:"
+	echo " dependencies     To be set when calling the update dependencies."
 	echo " development      Maven profile for development and feature builds."
 	echo " integration      Maven profile for integration builds."
 	echo " release          Maven profile for release builds. Fails to overwrite deployments."
 	echo ""
 	echo "Copyright by DLR (German Aerospace Center)"
 }
 
+callMavenDependencies() {
+	mkdir -p ./OverTarget
+	curl -v -L -o ./OverTarget/OverTarget.jar ${OVERTARGET_REPO}/${OVERTARGET_GROUP}.language_${OVERTARGET_VERSION}.jar/download
+	mvn install:install-file -Dfile=./OverTarget/OverTarget.jar -DgroupId=${OVERTARGET_GROUP} -DartifactId=${OVERTARGET_GROUP}.language -Dversion=${OVERTARGET_VERSION} -Dpackaging=jar
+}
+
 checkforMavenProblems() {
 	echo "Check for Maven Problems on Product:"
 	(grep -n "\[\(WARN\|WARNING\|ERROR\)\]" maven.log \
@@ -60,17 +76,23 @@ callMavenSurefire() {
 	echo "Check for Maven Problems on Overtarget:"
 	(grep -n "\[\(WARN\|ERROR\)\]" maven.log || exit 0  && exit 1;)
 	mvn clean install -P ${MAVEN_PROFILE},surefire,product -B -V | tee maven.log
+	# Always try too upload coverage reports as soon as possible
 	checkforMavenProblems
 	echo "Check for failed test cases:"
 	(grep -n "<<< FAILURE!" maven.log || exit 0 && exit 1;)
 	echo "Ant jacoco Reports"
 	ant jacocoPrepareDependencies
 	ant jacocoReport 2>&1 | tee ant.log
 	(grep -n "\(Rule violated\|BUILD FAILED\)" ant.log || exit 0 && exit 1;)
+}
+
+callMavenSurefireAndCoverage() {
+	callMavenSurefire
 	echo "CodeCov"
 	bash <(curl -s https://codecov.io/bash)
 }
 
+
 callMavenSpotbugs() {
 	echo "Maven - Spotbugs - ${MAVEN_PROFILE}"
 	mvn clean compile -P $MAVEN_PROFILE,target -B -V | tee maven.log
@@ -125,6 +147,7 @@ while [ "$1" != "" ]; do
 done
 
 case $MAVEN_PROFILE in
+    dependencies )      ;;
     development )       ;;
     integration )       ;;
     release )           ;;
@@ -134,17 +157,23 @@ esac
 
 # Decide which job to run
 case $TRAVIS_JOB in
+    dependencies )      callMavenDependencies
+                        exit
+                        ;;
     surefire )          callMavenSurefire
-    					exit
+                        exit
+                        ;;
+    surecoverage )      callMavenSurefireAndCoverage
+                        exit
                         ;;
     spotbugs )      	callMavenSpotbugs
-    					exit
+                        exit
                         ;;
     checkstyle )      	callMavenCheckstyle
-    					exit
+                        exit
                         ;;
     assemble )      	callMavenAssemble
-    					exit
+                        exit
                         ;;
     * )                 printUsage
                         exit 1