#43 Using SPDX license headers

gunnarmorling · gunnarmorling · commit 1cda15c725c1 · 2024-02-18T21:54:43.000+01:00
diff --git a/etc/license.txt b/etc/license.txt
@@ -1,15 +1,5 @@
-SPDX-License-Identifier: Apache-2.0
+ SPDX-License-Identifier: Apache-2.0
 
-Copyright ${project.inceptionYear} - 2021 The original authors.
+ Copyright The original authors
 
-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
-
-    https://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.
+ Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
diff --git a/oss-quickstart-simple-archetype/pom.xml b/oss-quickstart-simple-archetype/pom.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    SPDX-License-Identifier: Apache-2.0
+     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2021 - 2021 The original authors.
+     Copyright The original authors
 
-    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
-
-        https://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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <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">
@@ -24,7 +14,7 @@
   <parent>
     <groupId>org.moditect.ossquickstart</groupId>
     <artifactId>ossquickstart-aggregator</artifactId>
-    <version>1.0.0.Alpha1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>oss-quickstart-simple-archetype</artifactId>
@@ -45,8 +35,8 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <configuration combine.self="override">
-          <header>${rootdir}/etc/license.txt</header>
+        <configuration>
+          <header>../etc/license.txt</header>
           <strictCheck>true</strictCheck>
           <excludes>
             <exclude>src/main/resources/**</exclude>
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/etc/eclipse-formatter-config.xml b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/etc/eclipse-formatter-config.xml
@@ -4,19 +4,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-     Copyright 2021 The original authors
+     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
+     Copyright The original authors
 
-         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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <profiles version="12">
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/etc/license.txt b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/etc/license.txt
@@ -1,16 +1,8 @@
 #set( $symbol_pound = '#' )
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
- Copyright 2021 The original authors
+ 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
+ Copyright The original authors
 
-     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.
+ Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/pom.xml b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/pom.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-     Copyright 2021 The original authors
+     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
+     Copyright The original authors
 
-         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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/main/java/App.java b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/main/java/App.java
@@ -2,19 +2,11 @@
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package ${package};
 
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/main/java/module-info.java b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/main/java/module-info.java
@@ -2,20 +2,12 @@
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
-module ${moduleName} {
+module ${package} {
     exports ${package};
 }
diff --git a/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java b/oss-quickstart-simple-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -2,19 +2,11 @@
 #set( $symbol_dollar = '$' )
 #set( $symbol_escape = '\' )
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package ${package};
 
diff --git a/oss-quickstart-simple-template/etc/eclipse-formatter-config.xml b/oss-quickstart-simple-template/etc/eclipse-formatter-config.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
 
-     Copyright 2021 The original authors
+     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
+     Copyright The original authors
 
-         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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <profiles version="12">
diff --git a/oss-quickstart-simple-template/etc/license.txt b/oss-quickstart-simple-template/etc/license.txt
@@ -1,13 +1,5 @@
- Copyright 2021 The original authors
+ 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
+ Copyright The original authors
 
-     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.
+ Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
diff --git a/oss-quickstart-simple-template/pom.xml b/oss-quickstart-simple-template/pom.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0"?>
 <!--
 
-     Copyright 2021 The original authors
+     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
+     Copyright The original authors
 
-         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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
@@ -34,7 +26,7 @@
 
   <name>OSS Quickstart Single-Module Archetype Template</name>
   <description>Template for the OSS Quickstart Single-Module Archetype</description>
-  <inceptionYear>2021</inceptionYear>
+  <inceptionYear>2024</inceptionYear>
   <url>https://github.com/moditect/oss-quickstart</url>
 
   <licenses>
diff --git a/oss-quickstart-simple-template/src/main/java/com/example/acme/App.java b/oss-quickstart-simple-template/src/main/java/com/example/acme/App.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package com.example.acme;
 
diff --git a/oss-quickstart-simple-template/src/main/java/module-info.java b/oss-quickstart-simple-template/src/main/java/module-info.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 module com.example.acme {
     exports com.example.acme;
diff --git a/oss-quickstart-simple-template/src/test/java/com/example/acme/AppTest.java b/oss-quickstart-simple-template/src/test/java/com/example/acme/AppTest.java
@@ -1,17 +1,9 @@
 /*
- *  Copyright 2021 The original authors
+ *  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
+ *  Copyright The original authors
  *
- *      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.
+ *  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
  */
 package com.example.acme;
 
diff --git a/pom.xml b/pom.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    SPDX-License-Identifier: Apache-2.0
+     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2021 - 2021 The original authors.
+     Copyright The original authors
 
-    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
-
-        https://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.
+     Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -118,8 +108,8 @@
       <plugin>
         <groupId>com.mycila</groupId>
         <artifactId>license-maven-plugin</artifactId>
-        <configuration combine.self="override">
-          <header>${rootdir}/etc/license.txt</header>
+        <configuration>
+          <header>etc/license.txt</header>
           <strictCheck>true</strictCheck>
           <excludes>
             <exclude>README.md</exclude>
diff --git a/update-from-templates.sh b/update-from-templates.sh
@@ -1,20 +1,10 @@
 #!/bin/sh
 #
-# SPDX-License-Identifier: Apache-2.0
+#  SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2021 - 2021 The original authors.
+#  Copyright The original authors
 #
-# 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
-#
-#     https://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.
+#  Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
 #
 
 set -eo pipefail
