From 7ec0015edf61a738fd6a5cc22ed7c69002b74948 Mon Sep 17 00:00:00 2001
From: Maxim Solodovnik <solomax666@gmail.com>
Date: Thu, 16 Jan 2020 20:00:56 +0700
Subject: [PATCH] [OPENJPA-2798] java11 friendly (#57)

* [OPENJPA-2798] geronimo-jpa_2.2_spec is replaced with jakarta.persistence, Automatic module names are 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/tck/pom.xml                           | 5 ++---
 openjpa-integration/validation/pom.xml                    | 3 ++-
 openjpa-jdbc/pom.xml                                      | 3 +++
 openjpa-jest/pom.xml                                      | 7 +++++--
 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                               | 7 +++++--
 openjpa-project/assembly.xml                              | 2 +-
 openjpa-project/bin-assembly.xml                          | 2 +-
 openjpa-slice/pom.xml                                     | 7 +++++--
 openjpa-tools/openjpa-fetch-statistics-was/pom.xml        | 1 +
 openjpa-tools/openjpa-fetch-statistics/pom.xml            | 5 +++--
 openjpa-tools/openjpa-maven-plugin/pom.xml                | 4 ++--
 .../openjpa-maven-plugin/src/it/default_settings/pom.xml  | 5 ++---
 .../openjpa-maven-plugin/src/it/dependingArtifact/pom.xml | 4 ++--
 .../src/it/enhanceIncludesExcludes/pom.xml                | 4 ++--
 .../src/it/nonDefaultPersistenceXml/pom.xml               | 4 ++--
 .../src/it/sqlActionDropSchema/pom.xml                    | 4 ++--
 .../openjpa-maven-plugin/src/it/testDependencies/pom.xml  | 4 ++--
 openjpa-xmlstore/pom.xml                                  | 3 +++
 pom.xml                                                   | 8 +++++---
 30 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index d6cc78e6f..5a85dffc0 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 ead9d954b..fde420abf 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 eab6b05c7..86107c967 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 1d92b3453..4cec74162 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 5ae69031b..a837651ef 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 72e15fbf2..a26913443 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 31bae0cf2..104030e60 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/tck/pom.xml b/openjpa-integration/tck/pom.xml
index efdf22e2c..cea8287d7 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -446,9 +446,8 @@ databaseName=${db.name}
 
         <dependencies>
           <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
-            <scope>compile</scope>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
           </dependency>
           <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index 6ce778b62..d2b4c1319 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>
@@ -95,7 +96,7 @@
                     <version>4.0.2.GA</version>
                     <scope>test</scope>
                     <exclusions>
-                        <!-- force usage of the geronimo-jpa_2.1_spec -->
+                        <!-- force usage of own jpa -->
                         <exclusion>
                             <groupId>org.hibernate.java-persistence</groupId>
                             <artifactId>jpa-api</artifactId>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index 0f4aedbc8..9381e7ae0 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 bb1f9fe29..17bf398a6 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>
@@ -42,8 +45,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 37f7757f4..b94f067f8 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 97c1909e5..19b26daae 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 47ad4d19d..4ffb38a7b 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 252658632..1ac71a05c 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 029997201..802ab71e1 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>
@@ -42,8 +45,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index e8e42dbed..3e763c296 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -139,7 +139,7 @@
                 <include>org.apache.commons:commons-dbcp2</include>
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</include>
+                <include>org.eclipse.persistence:jakarta.persistence</include>
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index ff532ac9b..dc8e8d1d6 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -78,7 +78,7 @@
                 <include>org.apache.commons:commons-dbcp2</include>
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
-                <include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</include>
+                <include>org.eclipse.persistence:jakarta.persistence</include>
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index df670b9f1..8a430bd55 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>
@@ -47,8 +50,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
index 0cf52eed7..6c9b6e850 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 32bede63e..a510807c7 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -30,12 +30,13 @@
     <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>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml
index 40f487179..01858b643 100644
--- a/openjpa-tools/openjpa-maven-plugin/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/pom.xml
@@ -118,8 +118,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
index 7d12270dc..4f10bdbff 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
@@ -34,10 +34,9 @@
     <artifactId>enhance</artifactId>
     <version>1.0-SNAPSHOT</version>
     <dependencies>
-
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
index 2970cdc0d..ac04e9e6c 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
@@ -42,8 +42,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml
index 04703a0d9..4ee2f1499 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml
@@ -36,8 +36,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
index 3d0aa0689..77e47f53f 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
@@ -35,8 +35,8 @@
     <version>1.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml
index f4ab5433e..101ec01c0 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml
@@ -35,8 +35,8 @@
     <version>1.0-SNAPSHOT</version>
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
index 34f9d826e..d12eddb2b 100644
--- a/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
@@ -35,8 +35,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_2.2_spec</artifactId>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>jakarta.persistence</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index d3b2d33db..220e4b101 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 2c3907158..bc55e4df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,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>
@@ -1713,9 +1714,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_2.2_spec</artifactId>
-                <version>1.0</version>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>jakarta.persistence</artifactId>
+                <version>2.2.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -2074,6 +2075,7 @@
                                     <manifestEntries>
                                         <Implementation-Build>${buildNumber}</Implementation-Build>
                                         <Implementation-Date>${timestamp}</Implementation-Date>
+                                        <Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
                                     </manifestEntries>
                                 </archive>
                             </configuration>