Merge pull request #129 from virtualsatellite/integration

Release 4.12.0
virtualsatellite · Jul 31, 2020 · 42f1c3f · 42f1c3f
2 parents 0f775ca + 80c2e71
commit 42f1c3f
Show file tree

Hide file tree

Showing 222 changed files with 3,650 additions and 1,900 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bugreport.md b/.github/ISSUE_TEMPLATE/bugreport.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: 'Bug ... '
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 7]
+ - Version [e.g. 22]
+
diff --git a/.github/ISSUE_TEMPLATE/default.md b/.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.
+
diff --git a/.github/ISSUE_TEMPLATES/Release.md → .github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATES/Release.md → .github/ISSUE_TEMPLATE/release.md
diff --git a/.travis.yml b/.travis.yml
@@ -55,14 +55,6 @@ env:
   # API Token for access to github
   # ---------------------------------------------
   - secure: "ayOj6xJ/IcL1v+a+IHoHhmJJYwA+AAPGRPivdti0G09fOS8XeKi9UPPDJKy7VOhjxdQFcjDvO5vNF1AOs7zC8uwvkT9i00zZ+cA959zan/3rkOOjaS9egqp0N9E7LvAsBLmbmNkRvDVI7Z/6DpOl/Whl7oru+imqEZvlemnUXFuFHqs68a3d8c0/A3M1mpXRT1iTGe2Fj+VL5r1wjTlq8/kHAOLeYSSMUDeG+5MMqT8+wQMqzpAG9LgCvc+8ZR9OlMDBi+NI7NwuseLk2csjgDKTGBtm56t+FT9Tni0EUyNW0dmwIiFqeHEu7KKtRuYWiKhP/FzsLz5w3lCqq50Dn7XV38EDuGZegSgMgYjf9a8ADTSniPQXpzcOu72KFmM0EBVgv4h3xJGNkTa6RXruescgtPQx3ZmYOamfDxK4gnk+BbpcNDru1ahWfGutkUWuQKdonzK+MgaDiLx9QaVjZdCxM8zCLd7QdE0cYI2GSF7ASYGLTkiGx6/ex7Yq95c7uB5esKl8aMZ1RH0qYthJfNhJcngRWhnegoluuEoccVd4MtrXpgxbgo2xyypqKNuLjfvg9aOvWAncEOyz0q7pnxKv7u1UGcm1b059v4aiVVpea+pwRLFpI9RLV4C/MMJMgOz32XDJNIbwc3cpSCtu5thblUpJVl21zKUeDg81IKg="
-  # ---------------------------------------------
-  # 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
-  - curl -L -o ./OverTarget/OverTarget.jar $OVERTARGET_REPO/$OVERTARGET_GROUP.language_$OVERTARGET_VERSION.jar
-  - 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
   # --------------------------------------------------------------
@@ -103,7 +93,7 @@ after_failure:
   # then try to deploy the screenshots from 
   # SWTBot to see what happened 
   # ----------------------------------------
-  - bash/deploy_sourceforge.sh -k $encrypted_f25ed140d658_key -i $encrypted_f25ed140d658_iv -u swtbot
+  - bash/deploy_sourceforge.sh -u swtbot
   # ---------------------------------------
   # Show the debug output of Surefire Junit
   # ---------------------------------------
@@ -139,7 +129,7 @@ jobs:
     # ----------------------------
     # --- Release Tags
     - stage: build-test
-      if: (tag =~ /^Release/) OR (branch =~ /^master/)
+      if: (branch =~ /^master/) OR (tag =~ /^Release/)
       name: Build and Test - SpotBugs - Release
       script:
       - bash/maven_build.sh -j spotbugs -p release   
@@ -152,21 +142,21 @@ jobs:
       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/) OR (branch =~ /^master/)
+      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
@@ -187,7 +177,7 @@ jobs:
     # ----------------------------
     # --- Release Tags
     - stage: build-test
-      if: (tag =~ /^Release/) OR (branch =~ /^master/)
+      if: (branch =~ /^master/) OR (tag =~ /^Release/)
       name: Build and Test - Checkstyle - Release
       script:
       - bash/maven_build.sh -j checkstyle -p release   
@@ -198,13 +188,12 @@ 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 (branch =~ /^master/) AND NOT (tag =~ /^Release/)
+      if: branch NOT IN (integration, development, integration_snapshot, development_snapshot) AND NOT (tag =~ /^Release/)
       name: Build-Assemble-Deploy - Feature
       script:
       - bash/maven_build.sh -j assemble -p development   
 
-    # --- a push merge etc. on the master should try to assemble everything from the master
-    # --- but it should not deploy anythin
+    # 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)

diff --git a/NOTICE.md b/NOTICE.md
@@ -1,6 +1,6 @@
-# Virtual Satellite
+# Virtual Satellite CEF
 
-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,14 +20,30 @@ 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
 
  * License: Eclipse Public License, 1.0
@@ -48,15 +64,18 @@ Microsoft Z3 Solver
 
  * License: MIT
 
-Microsoft Z3 Solver
-
- * License: MIT
-
 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

diff --git a/README.md b/README.md
@@ -74,6 +74,12 @@ The German Aerospace Center (DLR) makes available all content in this plug-in ("
 
 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>
 
+## 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
 
 Third party licenses are named in the plug-ins where used in the respective _aboutfiles_ folders. At runtime third party licenses can be viewed in the usual Eclipse About dialog. Also check out the [Notice](NOTICE.md) file.
diff --git a/bash/maven_build.sh b/bash/maven_build.sh
@@ -21,28 +21,45 @@ 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 " -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() {
+	echo "Installing OverTarget version ${OVERTARGET_VERSION}"
+	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 \
@@ -53,6 +70,9 @@ checkforMavenProblems() {
 }
 
 callMavenSurefire() {
+	echo "Setting VS_JAR_VTK to: $VS_JAR_VTK"
+	echo "Setting VS_JAR_ZMQ to: $VS_JAR_ZMQ"
+
 	echo "Maven - Surefire - ${MAVEN_PROFILE}"
 	mvn clean compile -P ${MAVEN_PROFILE},target -B -V | tee maven.log
 	echo "Check for Maven Problems on Overtarget:"
@@ -65,6 +85,10 @@ callMavenSurefire() {
 	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)
 }
@@ -123,6 +147,7 @@ while [ "$1" != "" ]; do
 done
 
 case $MAVEN_PROFILE in
+    dependencies )      ;;
     development )       ;;
     integration )       ;;
     release )           ;;
@@ -132,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

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.11.0</property>
+	<property name="version">4.12.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>
@@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0
 	     ===================================================== -->
 	<target name="jacocoPrepareDependencies" description="Install Jacoco Dependencies">
 		<mkdir dir="${user.home}/.ant/lib"/>
-		<get dest="${user.home}/.ant/lib/jacoco.jar" src="https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.8.3/org.jacoco.ant-0.8.3-nodeps.jar"/>
+		<get dest="${user.home}/.ant/lib/jacoco.jar" src="https://repo1.maven.org/maven2/org/jacoco/org.jacoco.ant/0.8.5/org.jacoco.ant-0.8.5-nodeps.jar"/>
 		<get dest="${user.home}/.ant/lib/ant-contrib.jar" src="https://repo1.maven.org/maven2/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar"/>
 	</target>
 

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.11.0.qualifier"
+      version="4.12.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
@@ -14,7 +14,7 @@
 	<parent>
 		<artifactId>de.dlr.sc.virsat.cef.parent</artifactId>
 		<groupId>de.dlr.sc.virsat.cef</groupId>
-		<version>4.11.0-SNAPSHOT</version>
+		<version>4.12.0-SNAPSHOT</version>
 		<relativePath>../maven/pom.xml</relativePath>
 	</parent>
 

diff --git a/de.dlr.sc.virsat.cef.branding.ui/.project b/de.dlr.sc.virsat.cef.branding.ui/.project
@@ -30,11 +30,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>de.dlr.sc.virsat.model.concept.resourceAccessBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>

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.11.0.qualifier
+Bundle-Version: 4.12.0.qualifier
 Bundle-Activator: de.dlr.sc.virsat.cef.branding.ui.BrandingPlugin
 Bundle-Vendor: DLR (German Aerospace Center)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/de.dlr.sc.virsat.cef.branding.ui/about.html b/de.dlr.sc.virsat.cef.branding.ui/about.html
@@ -23,5 +23,20 @@ <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 trade mark and copyrighted material other than S/W</h4> 
+<p> 
+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. 
+</p>
+<p> 
+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. &copy; DLR 2020) are provided for use under the Terms of use as provided for on DLR's webpage <a href="https://www.dlr.de">https://www.dlr.de</a>.
+</p>
+<p> 
+The CEF logo and images cannot be altered or used without DLR's permission.
+</p>
+
 </body>
 </html>