Skip to content

Commit a0ad361

Browse files
swinslowswinslow
authored
Merge pull request #1259 from spdx/jlovejoy-patch-5
New license: BSD-3-Clause-No-Military-License
2 parents b2ebc17 + 76495bd commit a0ad361

File tree

2 files changed

+88
-0
lines changed

2 files changed

+88
-0
lines changed

‎src/BSD-3-Clause-No-Military-License.xml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SPDXLicenseCollection xmlns="http://www.spdx.org/license">
3+
<license isOsiApproved="false" licenseId="BSD-3-Clause-No-Military-License"
4+
name="BSD 3-Clause No Military License" listVersionAdded="3.13">
5+
<crossRefs>
6+
<crossRef>https://gitlab.syncad.com/hive/dhive/-/blob/master/LICENSE</crossRef>
7+
<crossRef>https://github.com/greymass/swift-eosio/blob/master/LICENSE</crossRef>
8+
</crossRefs>
9+
10+
<notes>This is the same as BSD-3-Clause-No-Nuclear-License-2014, except the acknowledgement in the last paragraph is that the software is not designed, licensed or intended for use in a military facility, instead of a nuclear facility.
11+
</notes>
12+
<text>
13+
<p>
14+
<copyrightText>
15+
Copyright (c) &lt;year&gt; &lt;copyright
16+
holder&gt;. All Rights Reserved.
17+
</copyrightText>
18+
</p>
19+
<p>
20+
Redistribution and use in source and binary
21+
forms, with or without modification, are permitted
22+
provided that the following conditions are met:
23+
</p>
24+
<list>
25+
<item>
26+
<bullet>1.</bullet>
27+
<p>
28+
Redistribution of source code must retain the above copyright
29+
notice, this list of conditions and the following disclaimer.
30+
</p>
31+
</item>
32+
<item>
33+
<bullet>2.</bullet>
34+
<p>
35+
Redistribution in binary form must reproduce the
36+
above copyright notice, this list of conditions and
37+
the following disclaimer in the documentation and/or
38+
other materials provided with the distribution.
39+
</p>
40+
</item>
41+
<item>
42+
<bullet>3.</bullet>
43+
<p>
44+
Neither the name of the copyright holder nor the
45+
names of its contributors may be used to endorse
46+
or promote products derived from this software
47+
without specific prior written permission.
48+
</p>
49+
</item>
50+
</list>
51+
<p>
52+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
53+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
54+
NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
55+
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
56+
SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
57+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
58+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
59+
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
60+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
61+
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
62+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
63+
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
64+
</p>
65+
<p>
66+
YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED,
67+
LICENSED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION,
68+
OPERATION OR MAINTENANCE OF ANY MILITARY FACILITY.
69+
</p>
70+
</text>
71+
</license>
72+
</SPDXLicenseCollection>

‎test/simpleTestForGenerator/BSD-3-Clause-No-Military-License.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Copyright (c) year copyright holder. All Rights Reserved.
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
1.
6+
Redistribution of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
7+
8+
2.
9+
Redistribution 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.
10+
11+
3.
12+
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.
13+
14+
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.
15+
16+
YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED, LICENSED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION, OPERATION OR MAINTENANCE OF ANY MILITARY FACILITY.

0 commit comments

Comments
 (0)