From 44c4d8dc0203664a1d178b395174e4347fa9faaf Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax666@gmail.com>
Date: Sun, 15 Mar 2020 15:59:45 +0700
Subject: [PATCH] [OPENJPA-2798] Automatic-Module-Name is added

---
 openjpa-all/pom.xml                                | 3 +++
 openjpa-examples/image-gallery/pom.xml             | 1 +
 openjpa-examples/openbooks/pom.xml                 | 1 +
 openjpa-examples/simple/pom.xml                    | 1 +
 openjpa-integration/daytrader/pom.xml              | 1 +
 openjpa-integration/jmx/pom.xml                    | 1 +
 openjpa-integration/slf4j/pom.xml                  | 1 +
 openjpa-integration/validation/pom.xml             | 1 +
 openjpa-jdbc/pom.xml                               | 3 +++
 openjpa-jest/pom.xml                               | 3 +++
 openjpa-kernel/pom.xml                             | 3 +++
 openjpa-lib/pom.xml                                | 3 +++
 openjpa-persistence-jdbc/pom.xml                   | 3 +++
 openjpa-persistence-locking/pom.xml                | 1 +
 openjpa-persistence/pom.xml                        | 3 +++
 openjpa-slice/pom.xml                              | 3 +++
 openjpa-tools/openjpa-fetch-statistics-was/pom.xml | 1 +
 openjpa-tools/openjpa-fetch-statistics/pom.xml     | 1 +
 openjpa-xmlstore/pom.xml                           | 3 +++
 pom.xml                                            | 2 ++
 20 files changed, 39 insertions(+)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 87435fc6c..cf8598128 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -35,6 +35,9 @@
     <packaging>jar</packaging>
     <name>OpenJPA Aggregate Jar with Dependencies</name>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.all</automatic-module-name>
+    </properties>
     <build>
         <plugins>
             <!-- disable creating javadoc for this module -->
diff --git a/openjpa-examples/image-gallery/pom.xml b/openjpa-examples/image-gallery/pom.xml
index ab0417da8..bff6ae3f9 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -44,6 +44,7 @@
     <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
     <test.jvm.arguments>-Xmx${test.jvm.maxheapsize}</test.jvm.arguments>
     <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
+    <automatic-module-name>org.apache.openjpa.examples.gallery</automatic-module-name>
   </properties>
 
   <dependencies>
diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index febdb8059..b33c758b4 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -42,6 +42,7 @@
     <properties>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <automatic-module-name>org.apache.openjpa.examples.openbooks</automatic-module-name>
     </properties>
     <dependencies>
         <dependency>
diff --git a/openjpa-examples/simple/pom.xml b/openjpa-examples/simple/pom.xml
index 1fc8bcacb..7e9c7dffa 100644
--- a/openjpa-examples/simple/pom.xml
+++ b/openjpa-examples/simple/pom.xml
@@ -49,6 +49,7 @@
     <properties>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <automatic-module-name>org.apache.openjpa.examples.simple</automatic-module-name>
     </properties>
     <build>
         <plugins>
diff --git a/openjpa-integration/daytrader/pom.xml b/openjpa-integration/daytrader/pom.xml
index 2b1bee96d..ee08f2382 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -44,6 +44,7 @@
         <dbcp.minIdle>2</dbcp.minIdle>
         <dbcp.maxWait>10000</dbcp.maxWait>
         <dbcp.args>MaxTotal=${dbcp.maxTotal},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
+        <automatic-module-name>org.apache.openjpa.integration.daytrader</automatic-module-name>
     </properties>
 
     <dependencies>
diff --git a/openjpa-integration/jmx/pom.xml b/openjpa-integration/jmx/pom.xml
index 9acea478f..cf779a0cb 100644
--- a/openjpa-integration/jmx/pom.xml
+++ b/openjpa-integration/jmx/pom.xml
@@ -45,6 +45,7 @@
     <test.jvm.jmxauth>com.sun.management.jmxremote.authenticate=false</test.jvm.jmxauth>
     <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -D${test.jvm.jmxprovider} -D${test.jvm.jmxauth}</test.jvm.arguments>
     <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
+    <automatic-module-name>org.apache.openjpa.integration.jmx</automatic-module-name>
   </properties>
 
   <dependencies>
diff --git a/openjpa-integration/slf4j/pom.xml b/openjpa-integration/slf4j/pom.xml
index 258e4d79f..b1b83f31b 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -40,6 +40,7 @@
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
         <!-- use SLF4JLogFactory for logging -->
         <openjpa.Log>slf4j</openjpa.Log>
+        <automatic-module-name>org.apache.openjpa.integration.slf4j</automatic-module-name>
     </properties>
 
     <dependencies>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index ac456f6ea..eb3b02d95 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -38,6 +38,7 @@
     <properties>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <automatic-module-name>org.apache.openjpa.integration.validation</automatic-module-name>
     </properties>
 
     <profiles>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index bd68070c0..c8d21d615 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA JDBC</name>
     <description>OpenJPA JDBC</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.jdbc</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml
index 19736831f..cba15f632 100644
--- a/openjpa-jest/pom.xml
+++ b/openjpa-jest/pom.xml
@@ -35,6 +35,9 @@
     <packaging>jar</packaging>
     <name>OpenJPA JEST</name>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.jest</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index e0ec3287b..0762eba2f 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA Kernel</name>
     <description>OpenJPA Kernel</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.kernel</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index ce01f7abf..da0704e3b 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA Utilities Library</name>
     <description>OpenJPA Utilities Library</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.lib</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>jakarta-regexp</groupId>
diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index 6f2020170..2789cab71 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA Persistence JDBC</name>
     <description>OpenJPA Persistence JDBC</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.persistence.jdbc</automatic-module-name>
+    </properties>
     <profiles>
         <!-- Profile for testing with test-dynamic-enhancer -->
         <profile>
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index ffc2f3dab..b7b35d2cf 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -41,6 +41,7 @@
         <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
         <!-- set this =** on cmdline to skip all tests -->
         <surefire.excludes.locking />
+        <automatic-module-name>org.apache.openjpa.persistence.locking</automatic-module-name>
     </properties>
 
     <profiles>
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 0a7261a3e..623ab1839 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA Persistence</name>
     <description>OpenJPA Persistence</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.persistence</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index abdae0a8b..bc2f06c49 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA Slice</name>
     <description>OpenJPA Slice</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.slice</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
index 966ab577b..973fe0e3a 100644
--- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
@@ -30,6 +30,7 @@
     <properties>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <automatic-module-name>org.apache.openjpa.tools.statistics.was</automatic-module-name>
     </properties>
 
     <dependencies>
diff --git a/openjpa-tools/openjpa-fetch-statistics/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml
index 9a5a4d60c..d2fbf61cd 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -30,6 +30,7 @@
     <properties>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
+        <automatic-module-name>org.apache.openjpa.tools.statistics</automatic-module-name>
     </properties>
 
     <dependencies>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index 83421d33f..eb8e1a4f6 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -35,6 +35,9 @@
     <name>OpenJPA XML Store</name>
     <description>OpenJPA XML Store</description>
 
+    <properties>
+        <automatic-module-name>org.apache.openjpa.xmlstore</automatic-module-name>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/pom.xml b/pom.xml
index 08f45945b..e0b14264c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
 
         <bval.version>1.1.2</bval.version>
         <jmock.version>2.9.0</jmock.version>
+        <automatic-module-name>-SUBMODULES-NEED-TO-OVERRIDE-THIS-</automatic-module-name>
     </properties>
 
     <licenses>
@@ -2086,6 +2087,7 @@
                                     <manifestEntries>
                                         <Implementation-Build>${buildNumber}</Implementation-Build>
                                         <Implementation-Date>${timestamp}</Implementation-Date>
+                                        <Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
                                     </manifestEntries>
                                 </archive>
                             </configuration>