Merge branch 'master' into OMCSession_renames

Author: adeas31

.github/workflows/FMITest.yml

@@ -16,9 +16,9 @@ jobs:
         omc-version: ['stable', 'nightly']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: "Set up OpenModelica Compiler"
-        uses: OpenModelica/setup-openmodelica@v1.0.4
+        uses: OpenModelica/setup-openmodelica@v1.0.5
         with:
           version: ${{ matrix.omc-version }}
           packages: |
@@ -28,7 +28,7 @@ jobs:
 
       - run: "omc --version"
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
         with:

.github/workflows/Test.yml

@@ -19,7 +19,7 @@ jobs:
         omc-version: ['stable', 'nightly']
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6
@@ -41,7 +41,7 @@ jobs:
         run: 'pre-commit run --all-files'
 
       - name: "Set up OpenModelica Compiler"
-        uses: OpenModelica/setup-openmodelica@v1.0.4
+        uses: OpenModelica/setup-openmodelica@v1.0.5
         with:
           version: ${{ matrix.omc-version }}
           packages: |
@@ -80,7 +80,7 @@ jobs:
         os: ['ubuntu-latest']
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

COPYING

@@ -1,26 +1,32 @@
- This project is part of OpenModelica.
+--- Start of Definition of OpenModelica Run-time System Public License ---
 
- Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
- c/o Linköpings universitet, Department of Computer and Information Science,
- SE-58183 Linköping, Sweden.
+/*
+ * This file belongs to the OpenModelica Run-Time System.
+ *
+ * Copyright (c) 1998-CurrentYear, Open Source Modelica Consortium (OSMC),
+ * c/o Linköpings universitet, Department of Computer and Information Science,
+ * SE-58183 Linköping, Sweden. All rights reserved.
+ *
+ * THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THE BSD NEW LICENSE OR THE
+ * AGPL VERSION 3 LICENSE OR THE OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.8.
+ * ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES RECIPIENT'S
+ * ACCEPTANCE OF THE BSD NEW LICENSE OR THE OSMC PUBLIC LICENSE OR THE AGPL
+ * VERSION 3, ACCORDING TO RECIPIENTS CHOICE.
+ *
+ * The OpenModelica software and the OSMC (Open Source Modelica Consortium)
+ * Public License (OSMC-PL) are obtained from OSMC, either from the above
+ * address, from the URLs: http://www.openmodelica.org or
+ * https://github.com/OpenModelica/ or
+ * http://www.ida.liu.se/projects/OpenModelica, and in the OpenModelica
+ * distribution. GNU AGPL version 3 is obtained from:
+ * https://www.gnu.org/licenses/licenses.html#GPL. The BSD NEW License is
+ * obtained from: http://www.opensource.org/licenses/BSD-3-Clause.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, EXCEPT AS
+ * EXPRESSLY SET FORTH IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE
+ * CONDITIONS OF OSMC-PL.
+ *
+ */
 
- All rights reserved.
-
- THIS PROGRAM IS PROVIDED UNDER THE TERMS OF THE BSD NEW LICENSE OR THE
- GPL VERSION 3 LICENSE OR THE OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
- ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES
- RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3,
- ACCORDING TO RECIPIENTS CHOICE.
-
- The OpenModelica software and the OSMC (Open Source Modelica Consortium)
- Public License (OSMC-PL) are obtained from OSMC, either from the above
- address, from the URLs: http://www.openmodelica.org or
- http://www.ida.liu.se/projects/OpenModelica, and in the OpenModelica
- distribution. GNU version 3 is obtained from:
- http://www.gnu.org/copyleft/gpl.html. The New BSD License is obtained from:
- http://www.opensource.org/licenses/BSD-3-Clause.
-
- This program is distributed WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE, EXCEPT AS
- EXPRESSLY SET FORTH IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE
- CONDITIONS OF OSMC-PL.
+--- End of OpenModelica Run-time System Public License ---