upgrade to OpenJPA-3.0.0
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ee2b7db6 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ee2b7db6 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ee2b7db6 Branch: refs/heads/master Commit: ee2b7db6c983d311ef4a9b6cc070793dc7502073 Parents: 66fb928 Author: Mark Struberg <[email protected]> Authored: Fri Jun 15 11:18:36 2018 +0200 Committer: Mark Struberg <[email protected]> Committed: Fri Jun 15 11:18:36 2018 +0200 ---------------------------------------------------------------------- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml | 2 +- examples/multi-jpa-provider-testing/pom.xml | 2 +- examples/polling-parent/polling-client/pom.xml | 2 +- examples/polling-parent/polling-domain/pom.xml | 2 +- examples/rest-example/pom.xml | 2 +- itests/openejb-itests-beans/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- pom.xml | 6 +++++- 10 files changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml ---------------------------------------------------------------------- diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml index 5c6c9a9..e4593e8 100644 --- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml +++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml @@ -54,7 +54,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.1</version> + <version>${openjpa.version}</version> <configuration> <includes>org/apache/openejb/arquillian/tests/datasourcerealm/*.class</includes> <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/build-persistence.xml</persistenceXmlFile> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/alternate-descriptors/pom.xml ---------------------------------------------------------------------- diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml index 09816a5..bfdcf13 100644 --- a/examples/alternate-descriptors/pom.xml +++ b/examples/alternate-descriptors/pom.xml @@ -66,7 +66,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>2.3.0</version> + <version>3.0.0</version> <scope>provided</scope> <exclusions> <exclusion> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/deltaspike-fullstack/pom.xml ---------------------------------------------------------------------- diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml index 3bc949a..a0494ca 100644 --- a/examples/deltaspike-fullstack/pom.xml +++ b/examples/deltaspike-fullstack/pom.xml @@ -48,7 +48,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.0</version> + <version>3.0.0</version> <configuration> <includes>org/superbiz/deltaspike/domain/*.class</includes> </configuration> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/multi-jpa-provider-testing/pom.xml ---------------------------------------------------------------------- diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml index bb84643..c167202 100644 --- a/examples/multi-jpa-provider-testing/pom.xml +++ b/examples/multi-jpa-provider-testing/pom.xml @@ -135,7 +135,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>2.3.0</version> + <version>3.0.0</version> <scope>test</scope> </dependency> <dependency> <!-- just a facade pom which will bring hibernate for us --> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/polling-parent/polling-client/pom.xml ---------------------------------------------------------------------- diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml index 6822473..7b7c2f0 100644 --- a/examples/polling-parent/polling-client/pom.xml +++ b/examples/polling-parent/polling-client/pom.xml @@ -96,7 +96,7 @@ <dependency> <!-- because entities was enhanced --> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>2.3.0</version> + <version>3.0.0</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/polling-parent/polling-domain/pom.xml ---------------------------------------------------------------------- diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml index 0a02c9b..f898677 100644 --- a/examples/polling-parent/polling-domain/pom.xml +++ b/examples/polling-parent/polling-domain/pom.xml @@ -41,7 +41,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.0</version> + <version>3.0.0</version> <configuration> <includes>jug/domain/*.class</includes> <addDefaultConstructor>true</addDefaultConstructor> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/examples/rest-example/pom.xml ---------------------------------------------------------------------- diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml index a62ab7b..52cce9e 100644 --- a/examples/rest-example/pom.xml +++ b/examples/rest-example/pom.xml @@ -30,7 +30,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <tomee.version>8.0.0-SNAPSHOT</tomee.version> - <version.openjpa>2.4.0</version.openjpa> + <version.openjpa>3.0.0</version.openjpa> </properties> <repositories> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/itests/openejb-itests-beans/pom.xml ---------------------------------------------------------------------- diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml index c0aac97..6f21ffa 100644 --- a/itests/openejb-itests-beans/pom.xml +++ b/itests/openejb-itests-beans/pom.xml @@ -33,9 +33,9 @@ <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> + <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>1.2</version> + <version>${openjpa.version}</version> <configuration> <includes>org/apache/openejb/test/entity/**/*.class</includes> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index b6c247f..54706e0 100644 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -112,7 +112,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.1</version> + <version>${openjpa.version}</version> <configuration> <includes>**/entities/*.class</includes> <excludes>**/entities/XML*.class</excludes> @@ -133,7 +133,7 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> <!-- set the version to be the same as the level in your runtime --> - <version>2.4.1</version> + <version>3.0.0</version> </dependency> </dependencies> </plugin> http://git-wip-us.apache.org/repos/asf/tomee/blob/ee2b7db6/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 65b508d..f9b6e11 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ <!-- To easily change the javaee api version --> <version.javaee-api>8.0-SNAPSHOT</version.javaee-api> - <openjpa.version>3.0.0-SNAPSHOT</openjpa.version> + <openjpa.version>3.0.0</openjpa.version> <openwebbeans.version>2.0.6</openwebbeans.version> <jcs.version>2.1</jcs.version> <johnzon.version>1.1.7</johnzon.version> @@ -1202,6 +1202,10 @@ </exclusion> <exclusion> <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> </exclusion> <exclusion>
