Merge pull request #140 from modelica/issue44_BSD3License

MartinOtter · web-flow · commit 8f43b5255112 · 2025-10-27T16:11:18.000+01:00
Change license from Modelica License 1.1 to 3-Clause BSD
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,30 @@
+BSD 3-Clause License
+
+Copyright (C) 2013-2025, Modelica Association and contributors
+Copyright (C) 2005-2013, Dassault Systèmes, DLR and Modelon
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -2,9 +2,10 @@
 
 Free library from the Modelica Association for interface definitions and architectures for vehicle system modeling
 
-## Build status
+## Status
 
 [![CI checks](https://github.com/modelica/VehicleInterfaces/workflows/CI/badge.svg)](https://github.com/modelica/VehicleInterfaces/actions)
+[![GitHub](https://github.com/modelica/VehicleInterfaces)](LICENSE)
 
 ## Library description
 
@@ -25,11 +26,11 @@ Download [VehicleInterfaces v2.0.2 (2025-03-21)](../../releases/tag/v2.0.2)
 Browse the [Releases](../../releases) page in order to get access to older releases of the library.
 
 ## License
-Copyright &copy; 2005-2013, Dassault Systémes, DLR and Modelon<br>
-Copyright &copy; 2013-2025, Modelica Association
+Copyright &copy; 2013-2025, Modelica Association and contributors<br>
+Copyright &copy; 2005-2013, Dassault Syst&egrave;mes, DLR and Modelon
 
 This Modelica package is free software and the use is completely at your own risk;
-it can be redistributed and/or modified under the terms of the [Modelica License 1.1](https://modelica.org/licenses/ModelicaLicense1.1).
+it can be redistributed and/or modified under the terms of the [3-Clause BSD License](LICENSE).
 
 ## Development and contribution
 The development is organised by individual members of the [Modelica Association](https://www.modelica.org/association).
diff --git a/VehicleInterfaces/UsersGuide.mo b/VehicleInterfaces/UsersGuide.mo
@@ -1179,67 +1179,6 @@ on the library.
 </html>"));
   end ReleaseNotes;
 
-  class License "Copyright and License"
-
-    annotation (
-      Documentation(info="<html>
-<h4>Copyright</h4>
-<p>
-&copy; 2005-2013: Dassault Syst&egrave;mes, DLR and Modelon<br>
-&copy; 2013-2025: Modelica Association
-</p>
-<h4>License</h4>
-<p>The VehicleInterfaces library is distributed under the Modelica License (Version 1.1).</p>
-<p>Redistribution and use in source and binary forms, with or without
-modification are permitted, provided that the following conditions are met:
-</p>
-<ol>
-<li>
-The author and copyright notices in the source files, these license conditions
-and the disclaimer below are (a) retained and (b) reproduced in the documentation
-provided with the distribution.</li>
-<li>
-Modifications of the original source files are allowed, provided that a
-prominent notice is inserted in each changed file and the accompanying
-documentation, stating how and when the file was modified, and provided
-that the conditions under (1) are met.</li>
-<li>
-It is not allowed to charge a fee for the original version or a modified
-version of the software, besides a reasonable fee for distribution and support.
-Distribution in aggregate with other (possibly commercial) programs
-as part of a larger (possibly commercial) software distribution is permitted,
-provided that it is not advertised as a product of your own.</li>
-</ol>
-
-<h4>Disclaimer</h4>
-<p>The software (sources, binaries, etc.) in their original or in a modified
-form are provided
-&quot;as is&quot; and the copyright holders assume no responsibility for its contents
-what so ever. Any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for a
-particular purpose are <strong>disclaimed</strong>. <strong>In no event</strong> shall the
-copyright holders, or any party who modify and/or redistribute the package,
-<strong>be liable</strong> for any direct, indirect, incidental, special, exemplary, or
-consequential damages, arising in any way out of the use of this software,
-even if advised of the possibility of such damage.
-</p>
-</html>"),
-      Icon(graphics={
-          Ellipse(
-            extent={{-100,100},{100,-100}},
-            lineColor={0,0,0},
-            fillColor={245,245,245},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,50},{50,-54}},
-            lineColor={0,0,0}),
-          Rectangle(
-            extent={{38,22},{74,-20}},
-            lineColor={245,245,245},
-            fillColor={245,245,245},
-            fillPattern=FillPattern.Solid)}));
-  end License;
-
   class Contact "Contact"
     extends Modelica.Icons.Contact;
 
diff --git a/VehicleInterfaces/package.mo b/VehicleInterfaces/package.mo
@@ -39,5 +39,25 @@ package VehicleInterfaces "VehicleInterfaces Library (Version 2.0.2) - Interface
 And last but not least, check also
 <a href=\"modelica://VehicleInterfaces.UsersGuide.License\">Copyright and License agreement</a>
 before using the library.</p>
+
+<p>
+<strong>Licensed by the Modelica Association under the 3-Clause BSD License</strong><br>
+Copyright &copy; 2013-2025: Modelica Association and <a href=\"modelica://VehicleInterfaces.UsersGuide.Contact\">contributors</a>.<br>
+Copyright &copy; 2005-2013: Dassault Syst&egrave;mes, DLR and Modelon.
+</p>
+
+<p>
+<em>
+This Modelica package is <u>free</u> software and the use is completely at
+<u>your own risk</u>; it can be redistributed and/or modified under the terms of
+the 3-Clause BSD license. For license conditions (including the disclaimer of
+warranty) visit
+<a href=\"https://modelica.org/licenses/modelica-3-clause-bsd\">https://modelica.org/licenses/modelica-3-clause-bsd</a>.
+</em>
+</p>
+
+<p>
+<strong>Modelica&reg;</strong> is a registered trademark of the Modelica Association.
+</p>
 </html>"));
 end VehicleInterfaces;
