diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index cf8598128..87435fc6c 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -35,9 +35,6 @@
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 bff6ae3f9..ab0417da8 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -44,7 +44,6 @@
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 b33c758b4..febdb8059 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -42,7 +42,6 @@
${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 7e9c7dffa..1fc8bcacb 100644
--- a/openjpa-examples/simple/pom.xml
+++ b/openjpa-examples/simple/pom.xml
@@ -49,7 +49,6 @@
${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 ee08f2382..2b1bee96d 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -44,7 +44,6 @@
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 cf779a0cb..9acea478f 100644
--- a/openjpa-integration/jmx/pom.xml
+++ b/openjpa-integration/jmx/pom.xml
@@ -45,7 +45,6 @@
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 b1b83f31b..258e4d79f 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -40,7 +40,6 @@
${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 d317954eb..e230ccdb7 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -446,8 +446,9 @@ databaseName=${db.name}
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
+ compile
org.apache.openjpa
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index a260d1f04..ac456f6ea 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -38,7 +38,6 @@
${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
@@ -96,7 +95,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 c8d21d615..bd68070c0 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -35,9 +35,6 @@
OpenJPA JDBC
OpenJPA JDBC
-
- org.apache.openjpa.jdbc
-
org.apache.openjpa
diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml
index b8371e8b1..19736831f 100644
--- a/openjpa-jest/pom.xml
+++ b/openjpa-jest/pom.xml
@@ -35,9 +35,6 @@
jar
OpenJPA JEST
-
- org.apache.openjpa.jest
-
org.apache.openjpa
@@ -45,8 +42,8 @@
${project.version}
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
org.apache.openjpa
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 0762eba2f..e0ec3287b 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -35,9 +35,6 @@
OpenJPA Kernel
OpenJPA Kernel
-
- org.apache.openjpa.kernel
-
org.apache.openjpa
diff --git a/openjpa-lib/pom.xml b/openjpa-lib/pom.xml
index da0704e3b..ce01f7abf 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -35,9 +35,6 @@
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 2789cab71..6f2020170 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -35,9 +35,6 @@
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 b7b35d2cf..ffc2f3dab 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -41,7 +41,6 @@
5
- org.apache.openjpa.persistence.locking
diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml
index 05cde5848..0a7261a3e 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -35,9 +35,6 @@
OpenJPA Persistence
OpenJPA Persistence
-
- org.apache.openjpa.persistence
-
org.apache.openjpa
@@ -45,8 +42,8 @@
${project.version}
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
org.apache.geronimo.specs
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 3e763c296..e8e42dbed 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.eclipse.persistence:jakarta.persistence
+ org.apache.geronimo.specs:geronimo-jpa_2.2_spec
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 dc8e8d1d6..ff532ac9b 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.eclipse.persistence:jakarta.persistence
+ org.apache.geronimo.specs:geronimo-jpa_2.2_spec
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 2adf6647f..abdae0a8b 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -35,9 +35,6 @@
OpenJPA Slice
OpenJPA Slice
-
- org.apache.openjpa.slice
-
org.apache.openjpa
@@ -50,8 +47,8 @@
${project.version}
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
test
diff --git a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
index 973fe0e3a..966ab577b 100644
--- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
@@ -30,7 +30,6 @@
${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 dc5a7c0a8..9a5a4d60c 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -30,13 +30,12 @@
${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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
org.apache.geronimo.specs
diff --git a/openjpa-tools/openjpa-maven-plugin/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml
index 5a3326f9a..f83508f5e 100644
--- a/openjpa-tools/openjpa-maven-plugin/pom.xml
+++ b/openjpa-tools/openjpa-maven-plugin/pom.xml
@@ -118,8 +118,8 @@
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 4f10bdbff..7d12270dc 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,9 +34,10 @@
enhance
1.0-SNAPSHOT
+
- org.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 ac04e9e6c..2970cdc0d 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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 4ee2f1499..04703a0d9 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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 77e47f53f..3d0aa0689 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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 101ec01c0..f4ab5433e 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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
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 d12eddb2b..34f9d826e 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.eclipse.persistence
- jakarta.persistence
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
org.apache.geronimo.specs
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index eb8e1a4f6..83421d33f 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -35,9 +35,6 @@
OpenJPA XML Store
OpenJPA XML Store
-
- org.apache.openjpa.xmlstore
-
org.apache.openjpa
diff --git a/pom.xml b/pom.xml
index 653811588..e91e9201e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
1.1.2
2.9.0
- -SUBMODULES-NEED-TO-OVERRIDE-THIS-
@@ -1716,9 +1715,9 @@
- org.eclipse.persistence
- jakarta.persistence
- 2.2.3
+ org.apache.geronimo.specs
+ geronimo-jpa_2.2_spec
+ 1.0
org.apache.geronimo.specs
@@ -2087,7 +2086,6 @@
${buildNumber}
${timestamp}
- ${automatic-module-name}