geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r945650 - in /geronimo/server/branches/3.0-M1: ./ plugins/axis/axis/ plugins/axis/geronimo-axis/ plugins/client/client/src/main/history/ plugins/connector-1_6/connector-deployer-1_6/src/main/history/ plugins/connector-1_6/geronimo-connector...
Date Tue, 18 May 2010 13:48:20 GMT
Author: rickmcguire
Date: Tue May 18 13:48:20 2010
New Revision: 945650

URL: http://svn.apache.org/viewvc?rev=945650&view=rev
Log:
update branch to use the special openejb release

Modified:
    geronimo/server/branches/3.0-M1/plugins/axis/axis/pom.xml
    geronimo/server/branches/3.0-M1/plugins/axis/geronimo-axis/pom.xml
    geronimo/server/branches/3.0-M1/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
    geronimo/server/branches/3.0-M1/plugins/corba/client-corba-yoko/pom.xml
    geronimo/server/branches/3.0-M1/plugins/mejb/geronimo-mejb/pom.xml
    geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml
    geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml
    geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml
    geronimo/server/branches/3.0-M1/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/branches/3.0-M1/pom.xml

Modified: geronimo/server/branches/3.0-M1/plugins/axis/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/axis/axis/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/axis/axis/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/axis/axis/pom.xml Tue May 18 13:48:20 2010
@@ -74,7 +74,7 @@
 
 <!-- openejb-axis may be needed, but does not seem to be ready yet -->
         <!--<dependency>-->
-            <!--<groupId>org.apache.openejb</groupId>-->
+            <!--<groupId>${openejbGroup}</groupId>-->
             <!--<artifactId>openejb-axis</artifactId>-->
         <!--</dependency>-->
 

Modified: geronimo/server/branches/3.0-M1/plugins/axis/geronimo-axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/axis/geronimo-axis/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/axis/geronimo-axis/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/axis/geronimo-axis/pom.xml Tue May 18 13:48:20
2010
@@ -68,7 +68,7 @@
 
         <!-- not sure about the scope -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-axis</artifactId>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/branches/3.0-M1/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/client/client/src/main/history/dependencies.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/client/client/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M1/plugins/client/client/src/main/history/dependencies.xml
Tue May 18 13:48:20 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>client</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -22,11 +22,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-math</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>sxc-jaxb</artifactId>
         <type>jar</type>
@@ -52,6 +47,51 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-client</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-ejbd</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-javaagent</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-loader</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-multicast</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-server</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>client-system</artifactId>
         <type>car</type>
@@ -188,47 +228,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-client</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-ejbd</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-javaagent</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-jee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-loader</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-multicast</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>commons-dbcp-all</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
Tue May 18 13:48:20 2010
@@ -3,7 +3,7 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>connector-deployer-1_6</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
@@ -17,6 +17,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>geronimo-cli</artifactId>
         <type>jar</type>
@@ -92,11 +97,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-jee</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
         <type>jar</type>

Modified: geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
(original)
+++ geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
Tue May 18 13:48:20 2010
@@ -98,9 +98,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-jee</artifactId>
-            <version>3.1.3-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/3.0-M1/plugins/corba/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/corba/client-corba-yoko/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/corba/client-corba-yoko/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/corba/client-corba-yoko/pom.xml Tue May 18 13:48:20
2010
@@ -50,7 +50,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-client</artifactId>
         </dependency>
 
@@ -61,7 +61,7 @@
 
         <!-- client CORBABean needs the ApplicationServer class -->
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-core</artifactId>
             <exclusions>
                 <exclusion>
@@ -69,19 +69,19 @@
                     <artifactId>activmq-core</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.openejb</groupId>
+                    <groupId>${openejbGroup}</groupId>
                     <artifactId>openejb-loader</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.openejb</groupId>
+                    <groupId>${openejbGroup}</groupId>
                     <artifactId>openejb-javaagent</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.openejb</groupId>
+                    <groupId>${openejbGroup}</groupId>
                     <artifactId>asm-finder</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.apache.openejb</groupId>
+                    <groupId>${openejbGroup}</groupId>
                     <artifactId>openejb-jee</artifactId>
                 </exclusion>
                 <exclusion>

Modified: geronimo/server/branches/3.0-M1/plugins/mejb/geronimo-mejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/mejb/geronimo-mejb/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/mejb/geronimo-mejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/mejb/geronimo-mejb/pom.xml Tue May 18 13:48:20
2010
@@ -39,7 +39,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${openejbVersion}</version>
         </dependency>

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb-builder/pom.xml Tue May
18 13:48:20 2010
@@ -45,7 +45,7 @@
              -->
             <!--<exclusions>-->
               <!--<exclusion>-->
-                <!--<groupId>org.apache.openejb</groupId>-->
+                <!--<groupId>${openejbGroup}</groupId>-->
                 <!--<artifactId>container</artifactId>-->
               <!--</exclusion>-->
             <!--</exclusions>-->

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/geronimo-openejb/pom.xml Tue May 18 13:48:20
2010
@@ -61,42 +61,42 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-ejbd</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-multicast</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-client</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-server</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-loader</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-jee</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-javaagent</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb/pom.xml Tue May 18 13:48:20 2010
@@ -84,12 +84,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>${openejbGroup}</groupId>
             <artifactId>openejb-client</artifactId>
         </dependency>
 

Modified: geronimo/server/branches/3.0-M1/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/plugins/openejb/openejb/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M1/plugins/openejb/openejb/src/main/history/dependencies.xml
Tue May 18 13:48:20 2010
@@ -3,15 +3,10 @@
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <version>3.0-M1-SNAPSHOT</version>
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-math</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -37,78 +32,83 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>server-security-config</artifactId>
-        <type>car</type>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-api</artifactId>
+        <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-openejb</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-client</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-persistence-jpa20</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-core</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-ejbd</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-javaagent</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-api</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-loader</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-client</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-multicast</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-core</artifactId>
+        <groupId>org.apache.geronimo.ext.openejb</groupId>
+        <artifactId>openejb-server</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-ejbd</artifactId>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>server-security-config</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-openejb</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-javaagent</artifactId>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-persistence-jpa20</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-jee</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-interceptor_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-loader</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxws_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-multicast</artifactId>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-server</artifactId>
+        <artifactId>commons-dbcp-all</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/3.0-M1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M1/pom.xml?rev=945650&r1=945649&r2=945650&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M1/pom.xml (original)
+++ geronimo/server/branches/3.0-M1/pom.xml Tue May 18 13:48:20 2010
@@ -70,7 +70,8 @@
         <tomcatVersion>7.0.0.0</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.3-SNAPSHOT</openejbVersion>
+        <openejbVersion>3.1.3.0</openejbVersion>
+        <openejbGroup>org.apache.geronimo.ext.openejb</openejbGroup>
         <openjpaVersion>2.0.0</openjpaVersion>
         <derbyVersion>10.5.3.0_1</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>
@@ -1024,16 +1025,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-core</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1057,7 +1058,7 @@
                         <artifactId>activemq-core</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>commons-dbcp-all</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1104,16 +1105,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-client</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1128,16 +1129,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-multicast</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1148,7 +1149,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-ejbd</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
@@ -1157,27 +1158,27 @@
                         <artifactId>log4j</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-axis</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>openejb-webservices</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1196,16 +1197,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-server</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1220,16 +1221,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-loader</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1240,16 +1241,16 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-jee</artifactId>
                 <version>${openejbVersion}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>javaee-api</artifactId>
                     </exclusion>
                     <exclusion>
-                        <groupId>org.apache.openejb</groupId>
+                        <groupId>${openejbGroup}</groupId>
                         <artifactId>ejb31-api-experimental</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1268,7 +1269,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openejb</groupId>
+                <groupId>${openejbGroup}</groupId>
                 <artifactId>openejb-javaagent</artifactId>
                 <version>${openejbVersion}</version>
             </dependency>
@@ -2362,6 +2363,19 @@ only found in cxf
                 </repository>
 
                 <repository>
+                    <id>openejb</id>
+                    <name>openejb</name>
+                    <layout>default</layout>
+                    <url>https://repository.apache.org/content/repositories/orgapachegeronimo-037</url>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                </repository>
+
+                <repository>
                     <id>axis2-axiom-api</id>
                     <name>axis2-axiom-api</name>
                     <layout>default</layout>



Mime
View raw message