Merge branch 'develop' into 102-port-tests-from-qmake-to-cmake

cmake/FindOSI.cmake

 ################################################################################
 # Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################

cmake/FindProtobuf.cmake

 ################################################################################
 # Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################

cmake/install_xmlSchemas.cmake

 ################################################################################
 # Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################
 
 # sets install command to copy xml Schema files from repository to installation directory
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/schemas DESTINATION .)
-message("-- xml schema file will be installed in the schema folder of the installation directory")
\ No newline at end of file
+message("-- xml schema file will be installed in the schema folder of the installation directory")

doc/source/README.md

@@ -2,9 +2,9 @@
 Copyright (c) 2021 in-tech GmbH
 Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 
-This program and the accompanying materials are made
-available under the terms of the Eclipse Public License 2.0
-which is available at https://www.eclipse.org/legal/epl-2.0/
+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.
 
 SPDX-License-Identifier: EPL-2.0
 ************************************************************-->

doc/source/_ext/api_doc.py

-###############################################################################
+################################################################################
 # Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
-###############################################################################
+################################################################################
 
 import os
 import shutil

sim/src/components/Algorithm_FmuWrapper/src/fmuFileHelper.h

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 
 #ifndef OPENPASS_FMUFILEHELPER_H
 #define OPENPASS_FMUFILEHELPER_H

sim/src/core/opSimulation/modules/World_OSI/OWL/MovingObject.cpp

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 
 #include "MovingObject.h"
 #include "OWL/OsiDefaultValues.h"

sim/src/core/opSimulation/modules/World_OSI/OWL/MovingObject.h

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
+
 #ifndef OPENPASS_MOVINGOBJECT_H
 #define OPENPASS_MOVINGOBJECT_H
 

sim/src/core/opSimulation/modules/World_OSI/OWL/OsiDefaultValues.h

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 
 #ifndef OPENPASS_OSIDEFAULTVALUES_H
 #define OPENPASS_OSIDEFAULTVALUES_H

sim/src/core/opSimulation/modules/World_OSI/OWL/TrafficLight.cpp

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 
 #include "TrafficLight.h"
 
@@ -632,4 +632,4 @@ void TrafficLightBase::Log(CbkLogLevel logLevel, const char *file, int line, con
                        line,
                        message);
     }
-}
\ No newline at end of file
+}

sim/src/core/opSimulation/modules/World_OSI/OWL/TrafficLight.h

-/*******************************************************************************
-* Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-*
-* This program and the accompanying materials are made
-* available under the terms of the Eclipse Public License 2.0
-* which is available at https://www.eclipse.org/legal/epl-2.0/
-*
-* SPDX-License-Identifier: EPL-2.0
-*******************************************************************************/
+/********************************************************************************
+ * Copyright (c) 2021 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ * 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.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ********************************************************************************/
 
 #ifndef OPENPASS_TRAFFICLIGHT_H
 #define OPENPASS_TRAFFICLIGHT_H

sim/tests/endToEndTests/pyOpenPASS/resources/html/report.css

 /*
  * Copyright (c) 2020, 2021 in-tech GmbH
  *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
+ * 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.
  *
  * SPDX-License-Identifier: EPL-2.0
  */

sim/tests/endToEndTests/test_end_to_end.json

@@ -278,7 +278,7 @@
                 "Sensor0_DetectedAgents": "str"
             }
         },
-        "disabled_PCM": {
+        "PCM": {
             "config_sets": [
                 "PCM"
             ],
@@ -286,7 +286,7 @@
             "invocations": 1,
             "description": "Run a pcm case and check if the end state is as expected",
             "queries": [
-                "count(AgentId | XPosition == -5.422331 and AgentId == 0 and Timestep == 10000) == 1"
+                "count(AgentId | XPosition == -5.505401 and AgentId == 0 and Timestep == 10000) == 1"
             ],
             "success_rate": 1
         },
@@ -321,4 +321,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

utils/ci/Jenkinsfile

-/*******************************************************************************
+/********************************************************************************
  * Copyright (c) 2021 in-tech GmbH
  *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
+ * 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.
  *
  * SPDX-License-Identifier: EPL-2.0
- *******************************************************************************/
+ ********************************************************************************/
 
 pipeline {
   agent none

utils/ci/scripts/10_prepare.sh

@@ -4,9 +4,9 @@
 # Copyright (c) 2021 in-tech GmbH
 #               2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################

utils/ci/scripts/15_prepare_thirdParty.sh

@@ -4,9 +4,9 @@
 # Copyright (c) 2021 ITK Engineering GmbH
 #               2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################

utils/ci/scripts/20_configure.sh

@@ -4,9 +4,9 @@
 # Copyright (c) 2021 in-tech GmbH
 #               2022 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
 #
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
+# 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.
 #
 # SPDX-License-Identifier: EPL-2.0
 ################################################################################