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 @@
jar
OpenJPA Aggregate Jar with Dependencies
+
+ org.apache.openjpa.all
+
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 @@
1024m
-Xmx${test.jvm.maxheapsize}
${test.jvm.arguments}
+ org.apache.openjpa.examples.gallery
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
+ org.apache.openjpa.examples.openbooks
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
+ org.apache.openjpa.examples.simple
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 @@
2
10000
MaxTotal=${dbcp.maxTotal},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}
+ org.apache.openjpa.integration.daytrader
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 @@
com.sun.management.jmxremote.authenticate=false
-Xmx${test.jvm.maxheapsize} -D${test.jvm.jmxprovider} -D${test.jvm.jmxauth}
${test.jvm.arguments}
+ org.apache.openjpa.integration.jmx
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
slf4j
+ org.apache.openjpa.integration.slf4j
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}
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
- compile
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.openjpa
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
+ org.apache.openjpa.integration.validation
@@ -95,7 +96,7 @@
4.0.2.GA
test
-
+
org.hibernate.java-persistence
jpa-api
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 @@
OpenJPA JDBC
OpenJPA JDBC
+
+ org.apache.openjpa.jdbc
+
org.apache.openjpa
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 @@
jar
OpenJPA JEST
+
+ org.apache.openjpa.jest
+
org.apache.openjpa
@@ -42,8 +45,8 @@
${project.version}
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.openjpa
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 @@
OpenJPA Kernel
OpenJPA Kernel
+
+ org.apache.openjpa.kernel
+
org.apache.openjpa
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 @@
OpenJPA Utilities Library
OpenJPA Utilities Library
+
+ org.apache.openjpa.lib
+
jakarta-regexp
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 @@
OpenJPA Persistence JDBC
OpenJPA Persistence JDBC
+
+ org.apache.openjpa.persistence.jdbc
+
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 @@
5
+ org.apache.openjpa.persistence.locking
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 @@
OpenJPA Persistence
OpenJPA Persistence
+
+ org.apache.openjpa.persistence
+
org.apache.openjpa
@@ -42,8 +45,8 @@
${project.version}
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
org.apache.commons:commons-dbcp2
org.apache.geronimo.specs:geronimo-jta_1.1_spec
- org.apache.geronimo.specs:geronimo-jpa_2.2_spec
+ org.eclipse.persistence:jakarta.persistence
org.apache.geronimo.specs:geronimo-jms_1.1_spec
org.apache.geronimo.specs:geronimo-validation_1.0_spec
org.apache.bval:org.apache.bval.bundle
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 @@
org.apache.commons:commons-dbcp2
org.apache.geronimo.specs:geronimo-jta_1.1_spec
- org.apache.geronimo.specs:geronimo-jpa_2.2_spec
+ org.eclipse.persistence:jakarta.persistence
org.apache.geronimo.specs:geronimo-jms_1.1_spec
org.apache.geronimo.specs:geronimo-validation_1.0_spec
org.apache.bval:org.apache.bval.bundle
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 @@
OpenJPA Slice
OpenJPA Slice
+
+ org.apache.openjpa.slice
+
org.apache.openjpa
@@ -47,8 +50,8 @@
${project.version}
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
test
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
+ org.apache.openjpa.tools.statistics.was
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 @@
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml
${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml
+ org.apache.openjpa.tools.statistics
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
enhance
1.0-SNAPSHOT
-
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
1.0-SNAPSHOT
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
1.0-SNAPSHOT
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
+ org.eclipse.persistence
+ jakarta.persistence
org.apache.geronimo.specs
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 @@
OpenJPA XML Store
OpenJPA XML Store
+
+ org.apache.openjpa.xmlstore
+
org.apache.openjpa
diff --git a/pom.xml b/pom.xml
index 2c3907158..bc55e4df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
1.1.2
2.9.0
+ -SUBMODULES-NEED-TO-OVERRIDE-THIS-
@@ -1713,9 +1714,9 @@
- org.apache.geronimo.specs
- geronimo-jpa_2.2_spec
- 1.0
+ org.eclipse.persistence
+ jakarta.persistence
+ 2.2.3
org.apache.geronimo.specs
@@ -2074,6 +2075,7 @@
${buildNumber}
${timestamp}
+ ${automatic-module-name}