You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/22 19:54:24 UTC
tomee git commit: TOMEE-1554 openjpa 2.4.0
Repository: tomee
Updated Branches:
refs/heads/master 47c000c23 -> 4efb36aed
TOMEE-1554 openjpa 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4efb36ae
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4efb36ae
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4efb36ae
Branch: refs/heads/master
Commit: 4efb36aedd9a940e7ed8cd8c2b6669b48078be4a
Parents: 47c000c
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Apr 22 19:54:14 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Apr 22 19:54:14 2015 +0200
----------------------------------------------------------------------
arquillian/arquillian-tomee-common/pom.xml | 2 +-
arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +-
container/openejb-core/pom.xml | 2 +-
examples/deltaspike-fullstack/pom.xml | 9 +--------
examples/polling-parent/polling-domain/pom.xml | 9 +--------
itests/openejb-itests-beans/pom.xml | 4 ++--
pom.xml | 8 ++++++--
tomee/pom.xml | 2 +-
utils/openejb-core-eclipselink/pom.xml | 2 +-
utils/openejb-core-hibernate/pom.xml | 2 +-
10 files changed, 16 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index a5a6a61..a958eda 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -184,7 +184,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index cd93dd2..411119d 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index d77e8c0..38d36f9 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -669,7 +669,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 0a0baf1..eb7fc28 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<configuration>
<includes>org/superbiz/deltaspike/domain/*.class</includes>
</configuration>
@@ -57,13 +57,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.openejb.maven</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/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 5100763..0d0594f 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.3.0</version>
+ <version>2.4.0</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -56,13 +56,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/itests/openejb-itests-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index 91913c0..9c11dab 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -62,9 +62,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 53fe233..d92015b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
<openejb.version>5.0.0-SNAPSHOT</openejb.version>
<tomee.version>2.0.0-SNAPSHOT</tomee.version>
- <openjpa.version>2.4.0-nonfinal-1598334</openjpa.version>
+ <openjpa.version>2.4.0</openjpa.version>
<org.apache.openwebbeans.version>1.5.0</org.apache.openwebbeans.version>
<jcs.version>2.0-SNAPSHOT</jcs.version>
@@ -1442,7 +1442,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
@@ -1451,6 +1451,10 @@
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jest</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
</exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 3877ac9..2999cac 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -127,7 +127,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/utils/openejb-core-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index f7a4d66..c6497e1 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
</exclusions>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4efb36ae/utils/openejb-core-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index 3bc1f51..0ef8bb4 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>