From f0044969aa1cbdcfbe24e09b48d4b2e367d4d767 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Sun, 15 Dec 2019 16:31:30 +0700 Subject: [PATCH] [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-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 ++-- .../openjpa-maven-plugin/src/it/sqlActionDropSchema/pom.xml | 4 ++-- .../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 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..7d9792678 100644 --- a/openjpa-integration/validation/pom.xml +++ b/openjpa-integration/validation/pom.xml @@ -95,7 +95,7 @@ 4.0.2.GA test - + org.hibernate.java-persistence jpa-api diff --git a/openjpa-jest/pom.xml b/openjpa-jest/pom.xml index bb1f9fe29..a1bc36b13 100644 --- a/openjpa-jest/pom.xml +++ b/openjpa-jest/pom.xml @@ -42,8 +42,8 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jpa_2.2_spec + org.eclipse.persistence + jakarta.persistence org.apache.openjpa diff --git a/openjpa-persistence/pom.xml b/openjpa-persistence/pom.xml index 029997201..ed763f848 100644 --- a/openjpa-persistence/pom.xml +++ b/openjpa-persistence/pom.xml @@ -42,8 +42,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..bb232349a 100644 --- a/openjpa-slice/pom.xml +++ b/openjpa-slice/pom.xml @@ -47,8 +47,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/pom.xml b/openjpa-tools/openjpa-fetch-statistics/pom.xml index 32bede63e..9ccb64142 100644 --- a/openjpa-tools/openjpa-fetch-statistics/pom.xml +++ b/openjpa-tools/openjpa-fetch-statistics/pom.xml @@ -34,8 +34,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/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/pom.xml b/pom.xml index 2c3907158..072f9aaad 100644 --- a/pom.xml +++ b/pom.xml @@ -1713,9 +1713,9 @@ - org.apache.geronimo.specs - geronimo-jpa_2.2_spec - 1.0 + org.eclipse.persistence + jakarta.persistence + 2.2.3 org.apache.geronimo.specs