[db-jdo] 01/01: JDO-813: Avoid duplicated license and notice files in distribution artifact

[mb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch JDO-813
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit e2305875c23cfccdee46afa84ea6a221175e5b87
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Fri May 20 22:04:07 2022 +0200

    JDO-813: Avoid duplicated license and notice files in distribution artifact
---
 LICENSE.txt => LICENSE | 0
 NOTICE.txt => NOTICE   | 2 +-
 api/pom.xml            | 1 +
 parent-pom/pom.xml     | 3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE
diff --git a/NOTICE.txt b/NOTICE
similarity index 72%
rename from NOTICE.txt
rename to NOTICE
index 1243a0a2..793e9a4a 100644
--- a/NOTICE.txt
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Java Data Objects (JDO)
-Copyright 2005-2006 The Apache Software Foundation
+Copyright 2005-2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/api/pom.xml b/api/pom.xml
index 2d221c91..2124fc8a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -28,6 +28,7 @@
     <groupId>javax.jdo</groupId>
     <artifactId>jdo-api</artifactId>
     <version>3.2.1-RC2-SNAPSHOT</version>
+    <!-- The name is used when generating a NOTICE file -->
     <name>JDO API</name>
 
     <dependencies>
diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 1acb0a37..45def9d9 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -38,7 +38,8 @@
     <url>http://db.apache.org/jdo</url>
     <inceptionYear>2005</inceptionYear>
     <organization>
-        <name>Apache Software Foundation</name>
+        <!-- The name is used when generating a NOTICE file -->
+        <name>The Apache Software Foundation</name>
         <url>http://www.apache.org</url>
     </organization>