This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch OPENJPA-2798-java11-friendly in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit f0044969aa1cbdcfbe24e09b48d4b2e367d4d767 Author: Maxim Solodovnik <[email protected]> AuthorDate: Sun Dec 15 16:31:30 2019 +0700 [OPENJPA-2798] geronimo-jpa_2.2_spec is replaced with jakarta.persistence --- openjpa-integration/tck/pom.xml | 5 ++--- openjpa-integration/validation/pom.xml | 2 +- openjpa-jest/pom.xml | 4 ++-- openjpa-persistence/pom.xml | 4 ++-- openjpa-project/assembly.xml | 2 +- openjpa-project/bin-assembly.xml | 2 +- openjpa-slice/pom.xml | 4 ++-- openjpa-tools/openjpa-fetch-statistics/pom.xml | 4 ++-- openjpa-tools/openjpa-maven-plugin/pom.xml | 4 ++-- openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml | 5 ++--- openjpa-tools/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-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml | 4 ++-- pom.xml | 6 +++--- 16 files changed, 30 insertions(+), 32 deletions(-) diff --git a/openjpa-integration/tck/pom.xml b/openjpa-integration/tck/pom.xml index efdf22e..cea8287 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 6ce778b..7d97926 100644 --- a/openjpa-integration/validation/pom.xml +++ b/openjpa-integration/validation/pom.xml @@ -95,7 +95,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-jest/pom.xml b/openjpa-jest/pom.xml index bb1f9fe..a1bc36b 100644 --- a/openjpa-jest/pom.xml +++ b/openjpa-jest/pom.xml @@ -42,8 +42,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-persistence/pom.xml b/openjpa-persistence/pom.xml index 0299972..ed763f8 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -42,8 +42,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 e8e42db..3e763c2 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 ff532ac..dc8e8d1 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 df670b9..bb23234 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -47,8 +47,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/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml index 32bede6..9ccb641 100644 --- a/openjpa-tools/openjpa-fetch-statistics/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml @@ -34,8 +34,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/pom.xml b/openjpa-tools/openjpa-maven-plugin/pom.xml index 40f4871..01858b6 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 7d12270..4f10bdb 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 2970cdc..ac04e9e 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 04703a0..4ee2f14 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 3d0aa06..77e47f5 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 f4ab543..101ec01 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 34f9d82..d12eddb 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/pom.xml b/pom.xml index 2c39071..072f9aa 100644 --- a/pom.xml +++ b/pom.xml @@ -1713,9 +1713,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>
