svn commit: r486979 - /geronimo/server/trunk/modules/geronimo-jetty6/pom.xml

[ho...@apache.org]

Author: hogstrom
Date: Wed Dec 13 21:50:27 2006
New Revision: 486979

URL: http://svn.apache.org/viewvc?view=rev&rev=486979
Log:
Merging change made in branches/2.0-M1 forward to trunk.  See commit 486974 log entry for detailed information.  This fixes a problem when running tests and a method not found error occurring during org.apache.geronimo.jetty6.GBeanInfoTest

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6/pom.xml

Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=486979&r1=486978&r2=486979
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Wed Dec 13 21:50:27 2006
@@ -33,6 +33,24 @@
     <name>Geronimo :: Jetty 6</name>
     
     <dependencies>
+        <!--
+          ** Major hack IMHO...testsupport brings in selenium as a transitive dependency.
+          ** Selenium apparently has Jetty 5 classes buried in its selenium-server jar
+          ** and as such was causing the test org.apache.geronimo.jetty6.GBeanInfoTest to
+          ** fail with a method not found error on org.mortbay.jetty.util.IO which has 
+          ** changed in Jetty 6.  When Selenium fixes this little problem the following 
+          ** dependency, and thus the exclusion, can be removed.
+          -->
+        <dependency>
+            <groupId>org.apache.geronimo.testsupport</groupId>
+            <artifactId>testsupport-common</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openqa.selenium.server</groupId>
+                    <artifactId>selenium-server</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -105,8 +123,10 @@
             <artifactId>commons-primitives</artifactId>
         </dependency>
         
+
     </dependencies>
     
+    
     <build>
         <plugins>
             <plugin>
@@ -118,6 +138,7 @@
                             <value>${basedir}/src/test/resources/data/login.config</value>
                         </property>
                     </systemProperties>
+                    <childDelegation>true</childDelegation>
                 </configuration>
             </plugin>
         </plugins>