You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/05/07 16:35:19 UTC

svn commit: r1593025 - in /tomee/deps/branches/openjpa-2.4.0-1591689: ./ openjpa-all/ openjpa-examples/ openjpa-examples/image-gallery/ openjpa-examples/openbooks/ openjpa-examples/simple/ openjpa-integration/ openjpa-integration/daytrader/ openjpa-int...

Author: andygumbrecht
Date: Wed May  7 14:35:18 2014
New Revision: 1593025

URL: http://svn.apache.org/r1593025
Log:
2.4.0-nonfinal-1591689-SNAPSHOT
maven-bundle-plugin

Modified:
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-all/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/image-gallery/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/openbooks/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/simple/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/daytrader/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/examples/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/jmx/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/slf4j/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/tck/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/validation/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jdbc/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jest/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-kernel/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-lib/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-jdbc/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-locking/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-project/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-slice/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-xmlstore/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/openjpa/pom.xml
    tomee/deps/branches/openjpa-2.4.0-1591689/pom.xml

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-all/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-all/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-all/pom.xml Wed May  7 14:35:18 2014
@@ -26,12 +26,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-all</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Aggregate Jar with Dependencies</name>
@@ -124,7 +124,7 @@
             determine the transitive dependencies to include from it.
         -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/image-gallery/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/image-gallery/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/image-gallery/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/image-gallery/pom.xml Wed May  7 14:35:18 2014
@@ -25,9 +25,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-      <groupId>org.apache.openjpa</groupId>
+      <groupId>org.apache.openejb.patch</groupId>
       <artifactId>openjpa-examples</artifactId>
-      <version>2.4.0-SNAPSHOT</version>
+      <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.openjpa.openjpa-examples</groupId>
@@ -47,7 +47,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openjpa</groupId>
+      <groupId>org.apache.openejb.patch</groupId>
       <artifactId>openjpa-all</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -83,7 +83,7 @@
     <plugins>
       <plugin>
           <!-- Use the openjpa maven plugin to enhance the domain model classes -->
-          <groupId>org.apache.openjpa</groupId>
+          <groupId>org.apache.openejb.patch</groupId>
           <artifactId>openjpa-maven-plugin</artifactId>
           <configuration>
             <includes>org/apache/openjpa/examples/gallery/model/*.class</includes>
@@ -102,7 +102,7 @@
           </executions>
           <dependencies>
             <dependency>
-              <groupId>org.apache.openjpa</groupId>
+              <groupId>org.apache.openejb.patch</groupId>
               <artifactId>openjpa-all</artifactId>
               <version>${project.version}</version>
             </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/openbooks/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/openbooks/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/openbooks/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/openbooks/pom.xml Wed May  7 14:35:18 2014
@@ -27,9 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-examples</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.openjpa.openjpa-examples</groupId>
@@ -41,7 +41,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/pom.xml Wed May  7 14:35:18 2014
@@ -26,12 +26,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-examples</artifactId>
     <packaging>pom</packaging>
 

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/simple/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/simple/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-examples/simple/pom.xml Wed May  7 14:35:18 2014
@@ -26,9 +26,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-examples</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.openjpa.openjpa-examples</groupId>
@@ -40,7 +40,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/daytrader/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/daytrader/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/daytrader/pom.xml Wed May  7 14:35:18 2014
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-daytrader</artifactId>
@@ -46,7 +46,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -63,7 +63,7 @@
         </dependency>
         -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
@@ -97,7 +97,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>
@@ -139,7 +139,7 @@
 
             <!-- new way of using openjpa-maven-plugin to enhance classes -->
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <configuration>
                     <includes>org/apache/openjpa/integration/daytrader/*Bean.class</includes>
@@ -159,7 +159,7 @@
                 <dependencies>
                     <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                     <dependency>
-                        <groupId>org.apache.openjpa</groupId>
+                        <groupId>org.apache.openejb.patch</groupId>
                         <artifactId>openjpa-persistence-jdbc</artifactId>
                         <version>${project.version}</version>
                     </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/examples/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/examples/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/examples/pom.xml Wed May  7 14:35:18 2014
@@ -35,12 +35,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-integration-examples</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests - Examples</name>
@@ -98,7 +98,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/jmx/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/jmx/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/jmx/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/jmx/pom.xml Wed May  7 14:35:18 2014
@@ -26,9 +26,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-jmx</artifactId>
@@ -48,12 +48,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.openjpa</groupId>
+      <groupId>org.apache.openejb.patch</groupId>
       <artifactId>openjpa-all</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
-       <groupId>org.apache.openjpa</groupId>
+       <groupId>org.apache.openejb.patch</groupId>
        <artifactId>openjpa-persistence-jdbc</artifactId>
        <version>${project.version}</version>
        <type>test-jar</type>
@@ -87,7 +87,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>
@@ -102,7 +102,7 @@
 
             <plugin>
                 <!-- Use openjpa maven plugin to enhance the domain model classes -->
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <configuration>
                     <includes>org/apache/openjpa/integration/jmx/*.class</includes>
@@ -121,7 +121,7 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.openjpa</groupId>
+                        <groupId>org.apache.openejb.patch</groupId>
                         <artifactId>openjpa-all</artifactId>
                         <version>${project.version}</version>
                     </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/pom.xml Wed May  7 14:35:18 2014
@@ -26,12 +26,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-integration</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests</name>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/slf4j/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/slf4j/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/slf4j/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/slf4j/pom.xml Wed May  7 14:35:18 2014
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa-integration-slf4j</artifactId>
@@ -52,12 +52,12 @@
             <version>${slf4jVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -81,7 +81,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>
@@ -96,7 +96,7 @@
 
             <!-- new way of using openjpa-maven-plugin to enhance classes
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <configuration>
                     <includes>org/apache/openjpa/integration/slf4j/*.class</includes>
@@ -115,7 +115,7 @@
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.openjpa</groupId>
+                        <groupId>org.apache.openejb.patch</groupId>
                         <artifactId>openjpa</artifactId>
                         <version>${project.version}</version>
                     </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/tck/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/tck/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/tck/pom.xml Wed May  7 14:35:18 2014
@@ -73,12 +73,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-integration-tck</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests - JPA TCK</name>
@@ -218,7 +218,7 @@
         <!-- Just pull in openjpa-all, which will include all required deps -->
         <dependencies>
           <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
           </dependency>
@@ -462,7 +462,7 @@ databaseName=${db.name}
             <scope>compile</scope>
           </dependency>
           <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
           </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/validation/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/validation/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/validation/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-integration/validation/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-integration</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-integration-validation</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Integration Tests - Bean Validation</name>
@@ -50,7 +50,7 @@
             <dependencies>
                 <!-- use openjpa-all which includes Apache BVal and depends -->
                 <dependency>
-                    <groupId>org.apache.openjpa</groupId>
+                    <groupId>org.apache.openejb.patch</groupId>
                     <artifactId>openjpa-all</artifactId>
                     <version>${project.version}</version>
                 </dependency>
@@ -67,7 +67,7 @@
             </activation>
             <dependencies>
                 <dependency>
-                    <groupId>org.apache.openjpa</groupId>
+                    <groupId>org.apache.openejb.patch</groupId>
                     <artifactId>openjpa</artifactId>
                     <version>${project.version}</version>
                     <!-- allow profiles to decide which validation spec to use -->
@@ -135,7 +135,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa</artifactId>
             <version>${project.version}</version>
             <!-- allow profiles to decide which validation spec to use -->
@@ -147,7 +147,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -186,7 +186,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jdbc/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jdbc/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jdbc/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-jdbc</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA JDBC</name>
@@ -38,7 +38,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jest/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jest/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jest/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-jest/pom.xml Wed May  7 14:35:18 2014
@@ -26,19 +26,19 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-jest</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA JEST</name>
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -47,7 +47,7 @@
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -58,7 +58,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-kernel/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-kernel/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-kernel/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-kernel/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-kernel</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Kernel</name>
@@ -38,7 +38,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-lib</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-lib/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-lib/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-lib/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-lib/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-lib</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Utilities Library</name>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-jdbc/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-jdbc/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-jdbc/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-persistence-jdbc</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Persistence JDBC</name>
@@ -842,12 +842,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-locking/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-locking/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence-locking/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-persistence-locking</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Persistence Locking Tests</name>
@@ -773,12 +773,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -816,7 +816,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-persistence/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-persistence</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Persistence</name>
@@ -38,7 +38,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-project/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-project/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-project/pom.xml Wed May  7 14:35:18 2014
@@ -37,12 +37,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>apache-openjpa</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Project Docs and Assemblies</name>
@@ -54,7 +54,7 @@
         </openjpa.release.keyAlias>
 
         <openjpa.assembly.finalName>
-            ${artifactId}-${version}</openjpa.assembly.finalName>
+            ${project.artifactId}-${project.version}</openjpa.assembly.finalName>
         <openjpa.assembly.outputDirectory>
         ${project.basedir}/target/site/downloads
         </openjpa.assembly.outputDirectory>
@@ -416,12 +416,12 @@
     <!-- need to explicitly list dependencies for assembly to work -->
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-all</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-slice/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-slice/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-slice/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-slice</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Slice</name>
@@ -38,12 +38,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -53,13 +53,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics-was/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics-was/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics-was/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics-was/pom.xml Wed May  7 14:35:18 2014
@@ -16,9 +16,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.openjpa</groupId>
+		<groupId>org.apache.openejb.patch</groupId>
 		<artifactId>openjpa-tools</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>openjpa-fetch-statistics-was</artifactId>
@@ -30,7 +30,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.openjpa</groupId>
+			<groupId>org.apache.openejb.patch</groupId>
 			<artifactId>openjpa-fetch-statistics</artifactId>
 			<version>${project.version}</version>
 		</dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-fetch-statistics/pom.xml Wed May  7 14:35:18 2014
@@ -16,9 +16,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.openjpa</groupId>
+		<groupId>org.apache.openejb.patch</groupId>
 		<artifactId>openjpa-tools</artifactId>
-		<version>2.4.0-SNAPSHOT</version>
+		<version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>openjpa-fetch-statistics</artifactId>
@@ -38,19 +38,19 @@
 			<artifactId>geronimo-jta_1.1_spec</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openjpa</groupId>
+			<groupId>org.apache.openejb.patch</groupId>
 			<artifactId>openjpa-kernel</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.openjpa</groupId>
+			<groupId>org.apache.openejb.patch</groupId>
 			<artifactId>openjpa-lib</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.openjpa</groupId>
+			<groupId>org.apache.openejb.patch</groupId>
 			<artifactId>openjpa-persistence-jdbc</artifactId>
 			<version>${project.version}</version>
 		</dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/pom.xml Wed May  7 14:35:18 2014
@@ -25,9 +25,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-tools</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -86,23 +86,23 @@
 
         <!-- dependencies for OpenJPA itself -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <!-- needed for db specific hooks -->
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/default_settings/pom.xml Wed May  7 14:35:18 2014
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-tools</artifactId>
         <version>@pom.version@</version>
     </parent>
@@ -51,17 +51,17 @@
 
 
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>@pom.version@</version>
         </dependency>
@@ -82,7 +82,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <version>@pom.version@</version>
                 <executions>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/pom.xml Wed May  7 14:35:18 2014
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-tools</artifactId>
         <version>@pom.version@</version>
     </parent>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/dependingArtifact/prjB/pom.xml Wed May  7 14:35:18 2014
@@ -41,17 +41,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>@pom.version@</version>
         </dependency>
@@ -71,7 +71,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <version>@pom.version@</version>
                 <executions>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/nonDefaultPersistenceXml/pom.xml Wed May  7 14:35:18 2014
@@ -25,7 +25,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-tools</artifactId>
         <version>@pom.version@</version>
     </parent>
@@ -50,7 +50,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>@pom.version@</version>
         </dependency>
@@ -72,7 +72,7 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <version>@pom.version@</version>
                 <configuration>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/pom.xml Wed May  7 14:35:18 2014
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-tools</artifactId>
         <version>@pom.version@</version>
     </parent>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/openjpa-maven-plugin/src/it/testDependencies/prjB/pom.xml Wed May  7 14:35:18 2014
@@ -33,17 +33,17 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>@pom.version@</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>@pom.version@</version>
         </dependency>
@@ -64,7 +64,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <version>@pom.version@</version>
                 <executions>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-tools/pom.xml Wed May  7 14:35:18 2014
@@ -25,13 +25,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
 <!--        <relativePath>../pom.xml</relativePath>-->
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-tools</artifactId>
     <packaging>pom</packaging>
 

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-xmlstore/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-xmlstore/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-xmlstore/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa-xmlstore/pom.xml Wed May  7 14:35:18 2014
@@ -25,12 +25,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-xmlstore</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA XML Store</name>
@@ -38,18 +38,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
@@ -73,7 +73,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.openjpa</groupId>
+                                    <groupId>org.apache.openejb.patch</groupId>
                                     <artifactId>openjpa-persistence-jdbc</artifactId>
                                     <version>${project.version}</version>
                                     <type>test-jar</type>
@@ -88,7 +88,7 @@
 
             <!-- new way of using openjpa-maven-plugin to enhance classes -->
             <plugin>
-                <groupId>org.apache.openjpa</groupId>             
+                <groupId>org.apache.openejb.patch</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <configuration>
                     <excludes>org/apache/openjpa/xmlstore/**/Test*.class</excludes>
@@ -108,7 +108,7 @@
                 <dependencies>
                     <!-- use o-p-j instead of openjpa to avoid cyclical dependency in maven graph -->
                     <dependency>
-                        <groupId>org.apache.openjpa</groupId>
+                        <groupId>org.apache.openejb.patch</groupId>
                         <artifactId>openjpa-persistence-jdbc</artifactId>
                         <version>${project.version}</version>
                     </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/openjpa/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/openjpa/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/openjpa/pom.xml Wed May  7 14:35:18 2014
@@ -26,9 +26,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.openjpa</groupId>
+        <groupId>org.apache.openejb.patch</groupId>
         <artifactId>openjpa-parent</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
     </parent>
 
     <artifactId>openjpa</artifactId>
@@ -130,17 +130,17 @@
     <dependencies>
         <!-- JARs to include in aggregate JAR via maven-shade-plugin -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-lib</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${project.version}</version>
             <!-- 
@@ -197,27 +197,27 @@
         </dependency>
         <!-- end optional openjpa-jdbc depends -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-xmlstore</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-slice</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
+            <groupId>org.apache.openejb.patch</groupId>
             <artifactId>openjpa-jest</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: tomee/deps/branches/openjpa-2.4.0-1591689/pom.xml
URL: http://svn.apache.org/viewvc/tomee/deps/branches/openjpa-2.4.0-1591689/pom.xml?rev=1593025&r1=1593024&r2=1593025&view=diff
==============================================================================
--- tomee/deps/branches/openjpa-2.4.0-1591689/pom.xml (original)
+++ tomee/deps/branches/openjpa-2.4.0-1591689/pom.xml Wed May  7 14:35:18 2014
@@ -27,10 +27,10 @@
     <parent>
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
-      <version>7</version>
+      <version>14</version>
     </parent>
 
-    <groupId>org.apache.openjpa</groupId>
+    <groupId>org.apache.openejb.patch</groupId>
     <artifactId>openjpa-parent</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Parent POM</name>
@@ -40,18 +40,18 @@
         Changing this version needs to also be done in all children poms
         See: http://jira.codehaus.org/browse/MNG-624
     -->
-    <version>2.4.0-SNAPSHOT</version>
+    <version>2.4.0-nonfinal-1591689-SNAPSHOT</version>
 
     <properties>
-        <java.class.version>1.7</java.class.version>
-        <java.testclass.version>1.7</java.testclass.version>
+        <java.class.version>1.6</java.class.version>
+        <java.testclass.version>1.6</java.testclass.version>
 
         <openjpa.version>${project.version}</openjpa.version>
         <openjpa.Log>DefaultLevel=INFO</openjpa.Log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
         <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
-        
+
         <site.deploy.url>scp://people.apache.org/home/${site.deploy.user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
         <!-- the test settings can be overridden my specific profiles -->
         <test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
@@ -77,12 +77,12 @@
         <createSource>none</createSource>
         <createSources>false</createSources>
         <!-- common JDBC driver versions -->
-        <derby.version>10.8.2.2</derby.version>
+        <derby.version>10.10.2.0</derby.version>
         <hsqldb.version>1.8.0.10</hsqldb.version>
         <mysql.version>5.1.12</mysql.version>
         <postgresql.version>8.4-701.jdbc3</postgresql.version>
         <!-- other common versions -->
-        <slf4jVersion>1.6.1</slf4jVersion>
+        <slf4jVersion>1.7.7</slf4jVersion>
         <!-- Compile Java source/target class level -->
         <compile.class.source>${java.class.version}</compile.class.source>
         <compile.class.target>${java.class.version}</compile.class.target>
@@ -247,6 +247,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
+                      <version>1.5</version>
                     </plugin>
                 </plugins>
             </build>
@@ -556,7 +557,7 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.13</version>
+                <version>1.2.17</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
@@ -625,7 +626,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
+                    <version>3.1</version>
                     <configuration>
                         <source>${compile.class.source}</source>
                         <target>${compile.class.target}</target>
@@ -635,7 +636,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.16</version>
                     <configuration>
                         <argLine>${surefire.jvm.args}</argLine>
                         <useFile>false</useFile>
@@ -696,7 +697,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>2.17</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -730,13 +731,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.8</version>
                 </plugin>
                 <!-- inherited from apache-7.pom, but need config updates -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.5</version>
                     <configuration>
                         <useReleaseProfile>false</useReleaseProfile>
                         <goals>deploy site site-deploy</goals>
@@ -839,7 +840,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
+                    <version>2.4.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <instructions>
@@ -851,7 +852,7 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>org.apache.openjpa</groupId>
+                    <groupId>org.apache.openejb.patch</groupId>
                     <artifactId>openjpa-maven-plugin</artifactId>
                     <version>${project.version}</version>
                 </plugin>
@@ -893,18 +894,13 @@
                         </execution>
                     </executions>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>2.3.1</version>
-                </plugin>
                 <!-- Newer versions of plugin will cause PDF build failures -->
                 <plugin>
                     <groupId>com.agilejava.docbkx</groupId>
                     <artifactId>docbkx-maven-plugin</artifactId>
                     <version>2.0.13</version>
                 </plugin>
-                
+
                 <!-- Ignore/Execute plugin execution -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -1007,7 +1003,7 @@
                                 <!--enhance plugin -->
                                 <pluginExecution>
                                     <pluginExecutionFilter>
-                                        <groupId>org.apache.openjpa</groupId>
+                                        <groupId>org.apache.openejb.patch</groupId>
                                         <artifactId>openjpa-maven-plugin</artifactId>
                                         <versionRange>[1.0.0,)</versionRange>
                                         <goals>
@@ -1022,7 +1018,7 @@
                                 <!--test-enhance plugin -->
                                 <pluginExecution>
                                     <pluginExecutionFilter>
-                                        <groupId>org.apache.openjpa</groupId>
+                                        <groupId>org.apache.openejb.patch</groupId>
                                         <artifactId>openjpa-maven-plugin</artifactId>
                                         <versionRange>[1.0.0,)</versionRange>
                                         <goals>
@@ -1164,7 +1160,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.7</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>