Skip to content

Commit 2c7a3c5

Browse files
committed
Change license from Modelica License 1.1 to 3-Clause BSD
1 parent b4592ff commit 2c7a3c5

File tree

5 files changed

+54
-95
lines changed

5 files changed

+54
-95
lines changed

LICENSE

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
BSD 3-Clause License
2+
3+
Copyright (C) 2005-2013, Dassault Systèmes, DLR and Modelon
4+
Copyright (C) since 2013, Modelica Association
5+
6+
All rights reserved.
7+
8+
Redistribution and use in source and binary forms, with or without
9+
modification, are permitted provided that the following conditions are met:
10+
11+
* Redistributions of source code must retain the above copyright notice, this
12+
list of conditions and the following disclaimer.
13+
14+
* Redistributions in binary form must reproduce the above copyright notice,
15+
this list of conditions and the following disclaimer in the documentation
16+
and/or other materials provided with the distribution.
17+
18+
* Neither the name of the copyright holder nor the names of its
19+
contributors may be used to endorse or promote products derived from
20+
this software without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
26+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ Download [VehicleInterfaces v2.0.2 (2025-03-21)](../../releases/tag/v2.0.2)
2525
Browse the [Releases](../../releases) page in order to get access to older releases of the library.
2626

2727
## License
28-
Copyright &copy; 2005-2013, Dassault Systémes, DLR and Modelon<br>
29-
Copyright &copy; 2013-2025, Modelica Association
28+
Copyright &copy; 2005-2013, Dassault Syst&egrave;mes, DLR and Modelon<br>
29+
Copyright &copy; since 2013, Modelica Association
3030

3131
This Modelica package is free software and the use is completely at your own risk;
32-
it can be redistributed and/or modified under the terms of the [Modelica License 1.1](https://modelica.org/licenses/ModelicaLicense1.1).
32+
it can be redistributed and/or modified under the terms of the [3-Clause BSD License](LICENSE).
3333

3434
## Development and contribution
3535
The development is organised by individual members of the [Modelica Association](https://www.modelica.org/association).

VehicleInterfaces/UsersGuide.mo

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,67 +1179,6 @@ on the library.
11791179
</html>"));
11801180
end ReleaseNotes;
11811181

1182-
class License "Copyright and License"
1183-
1184-
annotation (
1185-
Documentation(info="<html>
1186-
<h4>Copyright</h4>
1187-
<p>
1188-
&copy; 2005-2013: Dassault Syst&egrave;mes, DLR and Modelon<br>
1189-
&copy; 2013-2025: Modelica Association
1190-
</p>
1191-
<h4>License</h4>
1192-
<p>The VehicleInterfaces library is distributed under the Modelica License (Version 1.1).</p>
1193-
<p>Redistribution and use in source and binary forms, with or without
1194-
modification are permitted, provided that the following conditions are met:
1195-
</p>
1196-
<ol>
1197-
<li>
1198-
The author and copyright notices in the source files, these license conditions
1199-
and the disclaimer below are (a) retained and (b) reproduced in the documentation
1200-
provided with the distribution.</li>
1201-
<li>
1202-
Modifications of the original source files are allowed, provided that a
1203-
prominent notice is inserted in each changed file and the accompanying
1204-
documentation, stating how and when the file was modified, and provided
1205-
that the conditions under (1) are met.</li>
1206-
<li>
1207-
It is not allowed to charge a fee for the original version or a modified
1208-
version of the software, besides a reasonable fee for distribution and support.
1209-
Distribution in aggregate with other (possibly commercial) programs
1210-
as part of a larger (possibly commercial) software distribution is permitted,
1211-
provided that it is not advertised as a product of your own.</li>
1212-
</ol>
1213-
1214-
<h4>Disclaimer</h4>
1215-
<p>The software (sources, binaries, etc.) in their original or in a modified
1216-
form are provided
1217-
&quot;as is&quot; and the copyright holders assume no responsibility for its contents
1218-
what so ever. Any express or implied warranties, including, but not
1219-
limited to, the implied warranties of merchantability and fitness for a
1220-
particular purpose are <strong>disclaimed</strong>. <strong>In no event</strong> shall the
1221-
copyright holders, or any party who modify and/or redistribute the package,
1222-
<strong>be liable</strong> for any direct, indirect, incidental, special, exemplary, or
1223-
consequential damages, arising in any way out of the use of this software,
1224-
even if advised of the possibility of such damage.
1225-
</p>
1226-
</html>"),
1227-
Icon(graphics={
1228-
Ellipse(
1229-
extent={{-100,100},{100,-100}},
1230-
lineColor={0,0,0},
1231-
fillColor={245,245,245},
1232-
fillPattern=FillPattern.Solid),
1233-
Ellipse(
1234-
extent={{-50,50},{50,-54}},
1235-
lineColor={0,0,0}),
1236-
Rectangle(
1237-
extent={{38,22},{74,-20}},
1238-
lineColor={245,245,245},
1239-
fillColor={245,245,245},
1240-
fillPattern=FillPattern.Solid)}));
1241-
end License;
1242-
12431182
class Contact "Contact"
12441183
extends Modelica.Icons.Contact;
12451184

VehicleInterfaces/package.mo

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,25 @@ package VehicleInterfaces "VehicleInterfaces Library (Version 2.0.2) - Interface
3939
And last but not least, check also
4040
<a href=\"modelica://VehicleInterfaces.UsersGuide.License\">Copyright and License agreement</a>
4141
before using the library.</p>
42+
43+
<p>
44+
<strong>Licensed by the Modelica Association under the 3-Clause BSD License</strong><br>
45+
Copyright &copy; 2005-2013: Dassault Syst&egrave;mes, DLR and Modelon.<br>
46+
Copyright &copy; since 2013: Modelica Association.
47+
</p>
48+
49+
<p>
50+
<em>
51+
This Modelica package is <u>free</u> software and the use is completely at
52+
<u>your own risk</u>; it can be redistributed and/or modified under the terms of
53+
the 3-Clause BSD license. For license conditions (including the disclaimer of
54+
warranty) visit
55+
<a href=\"https://modelica.org/licenses/modelica-3-clause-bsd\">https://modelica.org/licenses/modelica-3-clause-bsd</a>.
56+
</em>
57+
</p>
58+
59+
<p>
60+
<strong>Modelica&reg;</strong> is a registered trademark of the Modelica Association.
61+
</p>
4262
</html>"));
4363
end VehicleInterfaces;

0 commit comments

Comments
 (0)