You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/10 02:11:54 UTC
svn commit: r420377 - in /geronimo/sandbox/svkmerge/m2migration:
modules/jetty/pom.xml pom.xml
Author: jdillon
Date: Sun Jul 9 17:11:53 2006
New Revision: 420377
URL: http://svn.apache.org/viewvc?rev=420377&view=rev
Log:
Need to disable to exclusion of commons-logging 1.3 that gets picked up by commons-el,
for some crazy insane reason, when this exclusion exists, m2 will not allow the
commons-logging dependency to get picked up by modules that depend on commons-el,
even if the dependency is explicitly added.
In fact, you can give a completely bogus version number like <version>NO_SUCH_VERSION</version>
and m2 will just ignore it!
Re-enable the tests in modules/jetty now that commons-logging gets picked up.
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml?rev=420377&r1=420376&r2=420377&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/jetty/pom.xml Sun Jul 9 17:11:53 2006
@@ -31,18 +31,6 @@
<artifactId>geronimo-jetty</artifactId>
<name>Geronimo :: Jetty</name>
- <properties>
- <!--
-
- HACK: Some crazy CL issue getting commons-logging included in the classpath is
- causing some crazy NoClassDefFoundError to get thrown.
- Adding commons-logging dependency does not seem to help!??!
-
- So turn these tests off for now
- -->
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -67,7 +55,7 @@
<artifactId>geronimo-webservices</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>jetty</groupId>
<artifactId>org.mortbay.jetty</artifactId>
@@ -96,7 +84,7 @@
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
</dependency>
-
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=420377&r1=420376&r2=420377&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Sun Jul 9 17:11:53 2006
@@ -549,10 +549,19 @@
<version>${commonsElVersion}</version>
<exclusions>
<!-- Exclude commons-logging (uses 1.3) -->
+ <!--
+
+ HACK: For some crazy reason, if we exclude this here, then
+ modules/jetty will fail to compile and there is no
+ way to convince m2 to put the jar back on the classpath
+ so, until that is resolved we have to disable this
+ exclusion
+
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ -->
</exclusions>
</dependency>