You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/12/02 07:56:31 UTC

svn commit: r481512 - in /incubator/openejb/trunk/openejb3: ./ assembly/openejb-itests-webapp/ assembly/openejb-standalone/ assembly/openejb-tomcat/ container/openejb-core/ container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/ conta...

Author: dblevins
Date: Fri Dec  1 22:56:29 2006
New Revision: 481512

URL: http://svn.apache.org/viewvc?view=rev&rev=481512
Log:
Major overhaul on the pom deps.  Keeps maven from complaining too loudly.

Modified:
    incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/pom.xml
    incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
    incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/MethodSignature.java
    incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
    incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml
    incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
    incubator/openejb/trunk/openejb3/pom.xml
    incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-itests-webapp/pom.xml Fri Dec  1 22:56:29 2006
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -60,6 +60,32 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
       <version>${pom.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-transaction</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-webservices</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-naming</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-timer</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-security</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
@@ -103,7 +129,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Fri Dec  1 22:56:29 2006
@@ -94,27 +94,27 @@
       <version>${pom.version}</version>
       <exclusions>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-kernel</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-transaction</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-webservices</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-naming</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-timer</artifactId>
         </exclusion>
         <exclusion>
-          <groupId>geronimo</groupId>
+          <groupId>org.apache.geronimo.modules</groupId>
           <artifactId>geronimo-security</artifactId>
         </exclusion>
       </exclusions>
@@ -178,7 +178,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Fri Dec  1 22:56:29 2006
@@ -60,6 +60,32 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-loader</artifactId>
       <version>${pom.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-kernel</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-transaction</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-webservices</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-naming</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-timer</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.modules</groupId>
+          <artifactId>geronimo-security</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
@@ -97,7 +123,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/pom.xml Fri Dec  1 22:56:29 2006
@@ -127,7 +127,6 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-ra</artifactId>
-      <version>4.1-incubator-SNAPSHOT</version>
     </dependency>
     <!-- End ActiveMQ -->
     <dependency>
@@ -138,21 +137,26 @@
     <dependency>
       <groupId>xerces</groupId>
       <artifactId>xerces</artifactId>
-      <version>2.4.0</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>oro</groupId>
       <artifactId>oro</artifactId>
-      <version>2.0.8</version>
     </dependency>
     <!-- end castor deps -->
 
     <dependency>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.modules</groupId>
+      <artifactId>geronimo-transaction</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-ejb_3.0_spec</artifactId>
     </dependency>
@@ -163,17 +167,14 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-      <version>1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
@@ -190,27 +191,22 @@
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
-      <version>2.2.3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-interceptor</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-security</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-transaction</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
@@ -219,46 +215,22 @@
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-timer</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-naming</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.modules</groupId>
       <artifactId>geronimo-webservices</artifactId>
-      <version>1.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.1_3</version>
     </dependency>
     <dependency>
       <groupId>org.tranql</groupId>
       <artifactId>tranql</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-ejb_2.1_spec</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>xstream</artifactId>
-      <version>PATCH-300-309</version>
-    </dependency>
-    <dependency>
-      <groupId>xpp3</groupId>
-      <artifactId>xpp3</artifactId>
-      <version>1.1.3.4.O</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -296,7 +268,6 @@
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
-      <version>${xbeanVersion}</version>
     </dependency>
     <!-- 
      FIXME: Why should it be specified here? Shouldn't xbean download what's necessary?

Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/MethodSignature.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/MethodSignature.java?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/MethodSignature.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/spring/MethodSignature.java Fri Dec  1 22:56:29 2006
@@ -16,6 +16,8 @@
  */
 package org.apache.openejb.assembler.spring;
 
+import org.apache.openejb.util.ClassLoading;
+
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -25,7 +27,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.geronimo.kernel.ClassLoading;
 
 /**
  *

Modified: incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-loader/pom.xml Fri Dec  1 22:56:29 2006
@@ -57,7 +57,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-persistence/pom.xml Fri Dec  1 22:56:29 2006
@@ -72,12 +72,10 @@
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jpa_3.0_spec</artifactId>
-      <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-      <version>1.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
@@ -108,25 +106,23 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-persistence-jdbc</artifactId>
       <version>0.9.0-incubating-SNAPSHOT</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        </exclusion>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.3.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/pom.xml Fri Dec  1 22:56:29 2006
@@ -35,7 +35,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: incubator/openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/pom.xml Fri Dec  1 22:56:29 2006
@@ -237,17 +237,17 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>apache-m1-snapshot</id>
-      <name>Apache Repository</name>
-      <url>http://people.apache.org/repository</url>
-      <layout>legacy</layout>
-    </repository>
-    <repository>
-      <id>DainDevRepo</id>
-      <name>Dain's Development Repository</name>
-      <url>http://people.apache.org/~dain/repository/m2-dev</url>
-    </repository>
+    <!--<repository>-->
+      <!--<id>apache-m1-snapshot</id>-->
+      <!--<name>Apache Repository</name>-->
+      <!--<url>http://people.apache.org/repository</url>-->
+      <!--<layout>legacy</layout>-->
+    <!--</repository>-->
+    <!--<repository>-->
+      <!--<id>DainDevRepo</id>-->
+      <!--<name>Dain's Development Repository</name>-->
+      <!--<url>http://people.apache.org/~dain/repository/m2-dev</url>-->
+    <!--</repository>-->
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -276,55 +276,38 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        <version>1.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.1_spec</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>asm</groupId>
+        <artifactId>asm-commons</artifactId>
+        <version>2.2.3</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>1.0.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-          </exclusion>
-        </exclusions>
+        <groupId>asm</groupId>
+        <artifactId>asm</artifactId>
+        <version>2.2.3</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.4_spec</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <groupId>castor</groupId>
+        <artifactId>castor</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <version>${xbeanVersion}</version>
+        <groupId>castor</groupId>
+        <artifactId>castor</artifactId>
+        <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <version>${removePropertyFromCorePomXbeanVersion}</version>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-nodep</artifactId>
+        <version>2.1_3</version>
       </dependency>
       <dependency>
-        <groupId>castor</groupId>
-        <artifactId>castor</artifactId>
-        <version>1.0</version>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging-api</artifactId>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.12</version>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
         <groupId>idb</groupId>
@@ -338,9 +321,14 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.0.4</version>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.12</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-ra</artifactId>
+        <version>4.1-incubator-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
@@ -349,24 +337,395 @@
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derbynet</artifactId>
+        <artifactId>derbyclient</artifactId>
         <version>10.2.1.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.derby</groupId>
-        <artifactId>derbyclient</artifactId>
+        <artifactId>derbynet</artifactId>
         <version>10.2.1.6</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deployment</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-interceptor</artifactId>
+        <version>1.2-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xstream</groupId>
+            <artifactId>xstream</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xpp3</groupId>
+            <artifactId>xpp3</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-naming</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-security</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-management</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-system</artifactId>
+          </exclusion>
+          <!--<exclusion>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>-->
+          <!--</exclusion>-->
+          <exclusion>
+            <groupId>activeio</groupId>
+            <artifactId>activeio</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>concurrent</groupId>
+            <artifactId>concurrent</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>regexp</groupId>
+            <artifactId>regexp</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-timer</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.objectweb.howl</groupId>
+            <artifactId>howl</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>geronimo-webservices</artifactId>
+        <version>1.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-interceptor</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>castor</groupId>
+            <artifactId>castor</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xfire</groupId>
+            <artifactId>xfire</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>xfire</groupId>
+            <artifactId>xfire-java</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>scout</groupId>
+            <artifactId>scout</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>1.0.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        <version>1.1-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        <version>1.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.1_spec</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_2.4_spec</artifactId>
+        <version>1.0.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-finder</artifactId>
+        <version>${removePropertyFromCorePomXbeanVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-naming</artifactId>
+        <version>${xbeanVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-reflect</artifactId>
+        <version>${xbeanVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbeanVersion}</version>
+      </dependency>
+      <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql</artifactId>
         <version>1.4-SNAPSHOT</version>
         <exclusions>
           <exclusion>
+            <groupId>axion</groupId>
+            <artifactId>axion</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_2.1_spec</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
           </exclusion>
         </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <version>2.0.8</version>
+      </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xerces</artifactId>
+        <version>2.4.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml?view=diff&rev=481512&r1=481511&r2=481512
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-http/pom.xml Fri Dec  1 22:56:29 2006
@@ -73,7 +73,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>