Author: vmassol
Date: 2008-01-11 23:14:51 +0100 (Fri, 11 Jan 2008)
New Revision: 6787
Modified:
xwiki-platform/core/trunk/xwiki-core/pom.xml
xwiki-platform/core/trunk/xwiki-plexus/pom.xml
Log:
XWIKI-1645: build time/test jars should not be packaged with xwiki + possible
bloat
XWIKI-2005: Upgrade Commons HttpClient to 3.1, ical4j to 0.9.20 and
Picocontainer to 1.2
Removed junit + mockobjects jars in the the generated WAR.
Modified: xwiki-platform/core/trunk/xwiki-core/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-core/pom.xml 2008-01-11 21:57:02 UTC
(rev 6786)
+++ xwiki-platform/core/trunk/xwiki-core/pom.xml 2008-01-11 22:14:51 UTC
(rev 6787)
@@ -385,7 +385,7 @@
<dependency>
<groupId>picocontainer</groupId>
<artifactId>picocontainer</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
</dependency>
<!-- This Axis dependency is not used directly and shouldn't be declared.
However it's used
by the Google API used in the Google Plugin API. It should be
declared in that project's
@@ -454,6 +454,15 @@
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
<version>3.0</version>
+ <exclusions>
+ <!-- We need to explicitely exclude JUnit since WS Common 1.0.1 used
by XMLRPC Commons is
+ having an invalid compile time dependency on it.
+ See JIRA issue: http://jira.codehaus.org/browse/MEV-567 -->
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Modified: xwiki-platform/core/trunk/xwiki-plexus/pom.xml
===================================================================
--- xwiki-platform/core/trunk/xwiki-plexus/pom.xml 2008-01-11 21:57:02 UTC
(rev 6786)
+++ xwiki-platform/core/trunk/xwiki-plexus/pom.xml 2008-01-11 22:14:51 UTC
(rev 6787)
@@ -59,6 +59,14 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-servlet</artifactId>
<version>1.0-beta-9</version>
+ <exclusions>
+ <!-- We need to explicitely exclude JUnit since Plexus Servlet has an
invalid transitive
+ dependency on JUnit with a compile scope dependency -->
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
