Skip to content

Commit 53a4fb9

Browse files
ibauersachsibauersachs
committed
Relicense dnsjava to BSD-3-Close
Some of the unit test files were originally contributed under BSD-3-Clause and wrongfully marked as BSD-2-Clause in 0a493aa. Align everything to BSD-3-clause as adding an additional clause is easier than removing one. It also enables going ahead with #172. Signed-off-by: Ingo Bauersachs <[email protected]> Signed-off-by: Brian Wellington <[email protected]> Signed-off-by: Noa Resare <[email protected]>
1 parent 097c636 commit 53a4fb9

282 files changed

Lines changed: 315 additions & 328 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎LICENSE‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,29 @@
1-
Copyright (c) 1998-2011, Brian Wellington.
1+
Copyright (c) 1998-2019, Brian Wellington
2+
Copyright (c) 2019-2021, dnsjava authors
3+
24
All rights reserved.
35

46
Redistribution and use in source and binary forms, with or without
57
modification, are permitted provided that the following conditions are met:
68

7-
* Redistributions of source code must retain the above copyright notice,
8-
this list of conditions and the following disclaimer.
9+
1. Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
12+
2. Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
915

10-
* Redistributions in binary form must reproduce the above copyright notice,
11-
this list of conditions and the following disclaimer in the documentation
12-
and/or other materials provided with the distribution.
16+
3. Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
1319

1420
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1521
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
17-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
18-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
19-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
20-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
21-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
22-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
23-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24-
POSSIBILITY OF SUCH DAMAGE.
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎README.md‎

Lines changed: 1 addition & 2 deletions

‎checkstyle/header.template.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
</organization>
2222
<licenses>
2323
<license>
24-
<name>BSD-2-Clause</name>
25-
<url>https://opensource.org/licenses/BSD-2-Clause</url>
24+
<name>BSD-3-Clause</name>
25+
<url>https://opensource.org/licenses/BSD-3-Clause</url>
2626
<distribution>repo</distribution>
2727
</license>
2828
</licenses>

‎src/main/java/org/xbill/DNS/A6Record.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 1999-2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

‎src/main/java/org/xbill/DNS/AAAARecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 1999-2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

‎src/main/java/org/xbill/DNS/AFSDBRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

‎src/main/java/org/xbill/DNS/APLRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

‎src/main/java/org/xbill/DNS/ARecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 1999-2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

‎src/main/java/org/xbill/DNS/Address.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-License-Identifier: BSD-2-Clause
1+
// SPDX-License-Identifier: BSD-3-Clause
22
// Copyright (c) 1999-2004 Brian Wellington ([email protected])
33

44
package org.xbill.DNS;

0 commit comments

Comments
 (0)