Move SPDX header comments and remove copyright dates

Keep the SPDX header comments, but move them underneath the ASF headers
to make files human-friendly first and machine-friendly second.

Remove copyright dates from header comments. The ASF recommends against
adding an ASF copyright in the header comment, but does not forbid it.
Keep the copyright headers for compliance with the REUSE specification,
but remove the dates to reduce maintenance burder.

Author: tilgovi

.eslintrc.js

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 module.exports = {

.mocharc.js

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 module.exports = {

Makefile

@@ -1,5 +1,3 @@
-# SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
-# SPDX-License-Identifier: Apache-2.0
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License. You may obtain a copy of
 # the License at
@@ -11,6 +9,9 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations under
 # the License.
+#
+# SPDX-FileCopyrightText: The Apache Software Foundation
+# SPDX-License-Identifier: Apache-2.0
 
 # What is the prerelease version?
 vsn_pre = $(shell git describe --tags --always --first-parent \

babel.config.js

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 const path = require('path');

husky/pre-commit

@@ -1,6 +1,4 @@
 #!/bin/sh
-# SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
-# SPDX-License-Identifier: Apache-2.0
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -10,13 +8,16 @@
 # with the License.  You may obtain a copy of the License at
 #
 #  http://www.apache.org/licenses/LICENSE-2.0
-
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+# SPDX-FileCopyrightText: The Apache Software Foundation
+# SPDX-License-Identifier: Apache-2.0
 
 . "$(dirname "$0")/_/husky.sh"
 

packages/apache-annotator/src/dom.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**

packages/apache-annotator/src/selector.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**

packages/dom/src/css.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import { finder } from '@medv/finder';

packages/dom/src/highlight-text.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import { ownerDocument } from './owner-document.js';

packages/dom/src/index.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 export * from './css.js';

packages/dom/src/normalize-range.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import { ownerDocument } from './owner-document.js';

packages/dom/src/owner-document.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**

packages/dom/src/range/cartesian.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /**

packages/dom/src/range/index.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 export * from './match.js';

packages/dom/src/range/match.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type {

packages/dom/src/text-node-chunker.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type { Chunk, Chunker, ChunkRange } from '@apache-annotator/selector';

packages/dom/src/text-position/describe.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type { TextPositionSelector } from '@apache-annotator/selector';

packages/dom/src/text-position/index.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 export * from './describe.js';

packages/dom/src/text-position/match.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type { Matcher, TextPositionSelector } from '@apache-annotator/selector';

packages/dom/src/text-quote/describe.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type {

packages/dom/src/text-quote/index.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 export * from './describe.js';

packages/dom/src/text-quote/match.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import type { Matcher, TextQuoteSelector } from '@apache-annotator/selector';

packages/dom/src/to-range.ts

@@ -1,6 +1,4 @@
 /**
- * SPDX-FileCopyrightText: 2016-2022 The Apache Software Foundation
- * SPDX-License-Identifier: Apache-2.0
  * @license
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ * SPDX-FileCopyrightText: The Apache Software Foundation
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 import { ownerDocument } from './owner-document.js';