You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2020/03/13 10:10:18 UTC
[openjpa] branch master updated: Revert "[OPENJPA-2798] java11
friendly (#57)"
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new 962cbbc Revert "[OPENJPA-2798] java11 friendly (#57)"
962cbbc is described below
commit 962cbbc624a671dba7075f020a515b2ff0eb89d8
Author: Mark Struberg <st...@apache.org>
AuthorDate: Sat Feb 29 16:05:56 2020 +0100
Revert "[OPENJPA-2798] java11 friendly (#57)"
this introduces a dependency which requires attribution. No need to imo
This reverts commit 7ec0015edf61a738fd6a5cc22ed7c69002b74948.
---
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 ++--
.../openjpa-maven-plugin/src/it/enhanceIncludesExcludes/pom.xml | 4 ++--
.../openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml | 4 ++--
.../openjpa-maven-plugin/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, 32 insertions(+), 69 deletions(-)
diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index cf85981..87435fc 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -35,9 +35,6 @@
<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 bff6ae3..ab0417d 100644
--- a/openjpa-examples/image-gallery/pom.xml
+++ b/openjpa-examples/image-gallery/pom.xml
@@ -44,7 +44,6 @@
<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 b33c758..febdb80 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -42,7 +42,6 @@
<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 7e9c7df..1fc8bca 100644
--- a/openjpa-examples/simple/pom.xml
+++ b/openjpa-examples/simple/pom.xml
@@ -49,7 +49,6 @@
<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 ee08f23..2b1bee9 100644
--- a/openjpa-integration/daytrader/pom.xml
+++ b/openjpa-integration/daytrader/pom.xml
@@ -44,7 +44,6 @@
<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 cf779a0..9acea47 100644
--- a/openjpa-integration/jmx/pom.xml
+++ b/openjpa-integration/jmx/pom.xml
@@ -45,7 +45,6 @@
<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 b1b83f3..258e4d7 100644
--- a/openjpa-integration/slf4j/pom.xml
+++ b/openjpa-integration/slf4j/pom.xml
@@ -40,7 +40,6 @@
<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 d317954..e230ccd 100644
--- a/openjpa-integration/tck/pom.xml
+++ b/openjpa-integration/tck/pom.xml
@@ -446,8 +446,9 @@ databaseName=${db.name}
<dependencies>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index a260d1f..ac456f6 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -38,7 +38,6 @@
<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>
@@ -96,7 +95,7 @@
<version>4.0.2.GA</version>
<scope>test</scope>
<exclusions>
- <!-- force usage of own jpa -->
+ <!-- force usage of the geronimo-jpa_2.1_spec -->
<exclusion>
<groupId>org.hibernate.java-persistence</groupId>
<artifactId>jpa-api</artifactId>
diff --git a/openjpa-jdbc/pom.xml b/openjpa-jdbc/pom.xml
index c8d21d6..bd68070 100644
--- a/openjpa-jdbc/pom.xml
+++ b/openjpa-jdbc/pom.xml
@@ -35,9 +35,6 @@
<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 b8371e8..1973683 100644
--- a/openjpa-jest/pom.xml
+++ b/openjpa-jest/pom.xml
@@ -35,9 +35,6 @@
<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>
@@ -45,8 +42,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-kernel/pom.xml b/openjpa-kernel/pom.xml
index 0762eba..e0ec328 100644
--- a/openjpa-kernel/pom.xml
+++ b/openjpa-kernel/pom.xml
@@ -35,9 +35,6 @@
<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 da0704e..ce01f7a 100644
--- a/openjpa-lib/pom.xml
+++ b/openjpa-lib/pom.xml
@@ -35,9 +35,6 @@
<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 2789cab..6f20201 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -35,9 +35,6 @@
<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 b7b35d2..ffc2f3d 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -41,7 +41,6 @@
<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 05cde58..0a7261a 100644
--- a/openjpa-persistence/pom.xml
+++ b/openjpa-persistence/pom.xml
@@ -35,9 +35,6 @@
<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>
@@ -45,8 +42,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index 3e763c2..e8e42db 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.eclipse.persistence:jakarta.persistence</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</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 dc8e8d1..ff532ac 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.eclipse.persistence:jakarta.persistence</include>
+ <include>org.apache.geronimo.specs:geronimo-jpa_2.2_spec</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 2adf664..abdae0a 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -35,9 +35,6 @@
<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>
@@ -50,8 +47,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 973fe0e..966ab57 100644
--- a/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
@@ -30,7 +30,6 @@
<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 dc5a7c0..9a5a4d6 100644
--- a/openjpa-tools/openjpa-fetch-statistics/pom.xml
+++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml
@@ -30,13 +30,12 @@
<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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 5a3326f..f83508f 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 4f10bdb..7d12270 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 @@
<artifactId>enhance</artifactId>
<version>1.0-SNAPSHOT</version>
<dependencies>
+
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 ac04e9e..2970cdc 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 4ee2f14..04703a0 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 77e47f5..3d0aa06 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 101ec01..f4ab543 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</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 d12eddb..34f9d82 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.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
diff --git a/openjpa-xmlstore/pom.xml b/openjpa-xmlstore/pom.xml
index eb8e1a4..83421d3 100644
--- a/openjpa-xmlstore/pom.xml
+++ b/openjpa-xmlstore/pom.xml
@@ -35,9 +35,6 @@
<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 6538115..e91e920 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
<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>
@@ -1716,9 +1715,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>jakarta.persistence</artifactId>
- <version>2.2.3</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.2_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -2087,7 +2086,6 @@
<manifestEntries>
<Implementation-Build>${buildNumber}</Implementation-Build>
<Implementation-Date>${timestamp}</Implementation-Date>
- <Automatic-Module-Name>${automatic-module-name}</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>