Merge remote-tracking branch 'origin/master' into

25-change-callbacks-to-use-functional-interfaces

Conflicts:
	CHANGES.md

Author: dhendriks

.checkstyle

@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+Copyright (c) 2021, 2022 John Whaley and others
+
+See the CONTRIBUTORS file(s) distributed with this work for additional
+information regarding copyright ownership.
+
+This program and the accompanying materials are made available under the
+terms of the GNU Library General Public License v2 or later, which is
+available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+
+SPDX-License-Identifier: LGPL-2.0-or-later
+-->
+
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
   <local-check-config name="JavaBDD Checkstyle" location="checkstyle.xml" type="project" description="JavaBDD Checkstyle.">
     <additional-data name="protect-config-file" value="false"/>

.gitignore

@@ -1,3 +1,16 @@
+##############################################################################
+# Copyright (c) 2020, 2022 John Whaley and others
+#
+# See the CONTRIBUTORS file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the GNU Library General Public License v2 or later, which is
+# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+#
+# SPDX-License-Identifier: LGPL-2.0-or-later
+##############################################################################
+
 /target/
 /pom.xml.releaseBackup
 /release.properties

COPYING

@@ -30,6 +30,8 @@ It is based on trunk revision r483 from 2011-11-24.
 
 See [CHANGES.md](CHANGES.md) for all changes that have been made in this fork.
 
+See [CONTRIBUTORS.md][CONTRIBUTORS.md] for all contributors.
+
 ## License
 
 This project inherits the license from the Sourceforge project it is forked

README.md

@@ -1,3 +1,16 @@
+##############################################################################
+# Copyright (c) 2020, 2022 John Whaley and others
+#
+# See the CONTRIBUTORS file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the GNU Library General Public License v2 or later, which is
+# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+#
+# SPDX-License-Identifier: LGPL-2.0-or-later
+##############################################################################
+
 source.. = src/main/java/
 bin.includes = .,\
                META-INF/

build.properties

@@ -1,3 +1,16 @@
+<!--
+Copyright (c) 2020, 2022 John Whaley and others
+
+See the CONTRIBUTORS file(s) distributed with this work for additional
+information regarding copyright ownership.
+
+This program and the accompanying materials are made available under the
+terms of the GNU Library General Public License v2 or later, which is
+available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+
+SPDX-License-Identifier: LGPL-2.0-or-later
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -1,5 +1,18 @@
 #!/usr/bin/bash
 
+##############################################################################
+# Copyright (c) 2020, 2022 John Whaley and others
+#
+# See the CONTRIBUTORS file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the GNU Library General Public License v2 or later, which is
+# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+#
+# SPDX-License-Identifier: LGPL-2.0-or-later
+##############################################################################
+
 if [[ ! -f release.properties ]]; then
     echo "Need to prepare release first."
     exit 1

release-perform

@@ -1,5 +1,18 @@
 #!/usr/bin/bash
 
+##############################################################################
+# Copyright (c) 2020, 2022 John Whaley and others
+#
+# See the CONTRIBUTORS file(s) distributed with this work for additional
+# information regarding copyright ownership.
+#
+# This program and the accompanying materials are made available under the
+# terms of the GNU Library General Public License v2 or later, which is
+# available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+#
+# SPDX-License-Identifier: LGPL-2.0-or-later
+##############################################################################
+
 mvn clean
 rm -f pom.xml.releaseBackup
 rm -f release.properties

release-prepare

@@ -1,6 +1,15 @@
-// BDD.java, created Jan 29, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDD.java

@@ -1,6 +1,15 @@
-// BDDBitVector.java, created Jul 14, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDBitVector.java

@@ -1,6 +1,15 @@
-// BDDDomain.java, created Jan 29, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDDomain.java

@@ -1,6 +1,15 @@
-// BDDException.java, created Jan 29, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDException.java

@@ -1,6 +1,15 @@
-// BDDFactory.java, created Jan 29, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDFactory.java

@@ -1,6 +1,15 @@
-// BDDFactoryIntImpl.java, created Jul 16, 2006 2:59:55 PM by jwhaley
-// Copyright (C) 2004-2006 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2004, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDFactoryIntImpl.java

@@ -1,6 +1,15 @@
-// BDDPairing.java, created Jan 29, 2003 9:50:57 PM by jwhaley
-// Copyright (C) 2003 John Whaley
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDPairing.java

@@ -1,6 +1,15 @@
-// BDDVarSet.java, created Jul 13, 2006 8:53:13 PM by jwhaley
-// Copyright (C) 2004-2006 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2004, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BDDVarSet.java

@@ -1,6 +1,15 @@
-// BitString.java, created Wed May 16 17:26:33 2001 by joewhaley
-// Copyright (C) 2001-3 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2001, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/BitString.java

@@ -1,6 +1,15 @@
-// FindBestOrder.java, created Apr 2, 2004 10:43:21 PM 2004 by jwhaley
-// Copyright (C) 2004 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2004, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/FindBestOrder.java

@@ -1,6 +1,15 @@
-// JFactory.java, created Aug 1, 2003 7:06:47 PM by joewhaley
-// Copyright (C) 2003 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2003, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;
 

src/main/java/com/github/javabdd/JFactory.java

@@ -1,6 +1,15 @@
-// TryVarOrder.java, created Apr 2, 2004 10:43:21 PM 2004 by jwhaley
-// Copyright (C) 2004 John Whaley <[email protected]>
-// Licensed under the terms of the GNU LGPL; see COPYING for details.
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2004, 2022 John Whaley and others
+//
+// See the CONTRIBUTORS file(s) distributed with this work for additional
+// information regarding copyright ownership.
+//
+// This program and the accompanying materials are made available under the
+// terms of the GNU Library General Public License v2 or later, which is
+// available at https://spdx.org/licenses/LGPL-2.0-or-later.html
+//
+// SPDX-License-Identifier: LGPL-2.0-or-later
+//////////////////////////////////////////////////////////////////////////////
 
 package com.github.javabdd;