Put SPDX header on its own header, add BSD-2-Clause choice

carlosame · carlosame · commit d6de39758bbf · 2025-12-13T20:39:16.000+01:00
diff --git a/junit/io/sf/carte/util/BufferSimpleWriterTest.java b/junit/io/sf/carte/util/BufferSimpleWriterTest.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/junit/io/sf/carte/util/DefaultSimpleWriterTest.java b/junit/io/sf/carte/util/DefaultSimpleWriterTest.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/junit/io/sf/carte/util/SingleElementIteratorTest.java b/junit/io/sf/carte/util/SingleElementIteratorTest.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/junit/io/sf/carte/util/agent/AgentUtilTest.java b/junit/io/sf/carte/util/agent/AgentUtilTest.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util.agent;
 
diff --git a/src/io/sf/carte/util/BufferSimpleWriter.java b/src/io/sf/carte/util/BufferSimpleWriter.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/DefaultSimpleWriter.java b/src/io/sf/carte/util/DefaultSimpleWriter.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/Diff.java b/src/io/sf/carte/util/Diff.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/SimpleWriter.java b/src/io/sf/carte/util/SimpleWriter.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/SingleElementIterator.java b/src/io/sf/carte/util/SingleElementIterator.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/Visitor.java b/src/io/sf/carte/util/Visitor.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util;
 
diff --git a/src/io/sf/carte/util/agent/AgentUtil.java b/src/io/sf/carte/util/agent/AgentUtil.java
@@ -2,12 +2,13 @@
 
  Copyright (c) 2005-2025, Carlos Amengual.
 
- SPDX-License-Identifier: BSD-3-Clause
-
  Licensed under a BSD-style License. You can find the license here:
  https://css4j.github.io/LICENSE.txt
 
  */
+/*
+  SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+ */
 
 package io.sf.carte.util.agent;
 
diff --git a/src/module-info.java b/src/module-info.java
@@ -2,12 +2,13 @@
  *
  * Copyright (c) 2005-2025, Carlos Amengual.
  *
- * SPDX-License-Identifier: BSD-3-Clause
- *
  * Licensed under a BSD-style License. You can find the license here:
  * https://css4j.github.io/LICENSE.txt
  *
  */
+ /*
+   SPDX-License-Identifier: BSD-3-Clause OR BSD-2-Clause
+  */
 
 /**
  * Utility packages.
