r1531 - xwiki/trunk/core

[Vincent Massol]

Author: vmassol
Date: 2006-11-11 12:05:30 +0100 (Sat, 11 Nov 2006)
New Revision: 1531

Modified:
   xwiki/trunk/core/pom.xml
Log:
XWIKI-12: Reorganize directory structure to match Maven2 best practices and cleanup build

* Exclude velocity-dep transitive dependency as it clashes with ORO 2.0.8
* Started adding test deps in core in preparation for moving unit tests

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-11-10 17:23:31 UTC (rev 1530)
+++ xwiki/trunk/core/pom.xml	2006-11-11 11:05:30 UTC (rev 1531)
@@ -204,6 +204,16 @@
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
       <version>1.4</version>
+      <exclusions>
+        <!-- We're excluding velocity-dep as it includes a version of ORO that is masking our
+             dependency of ORO that we're using transitively through another dependency. This
+             leads to compilation problems with some code we have. An issues has been raised
+             on http://issues.apache.org/jira/browse/VELOCITY-491 -->
+        <exclusion>
+          <groupId>velocity</groupId>
+          <artifactId>velocity-dep</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -353,6 +363,18 @@
            API should be a runtime dependency -->
       <!--scope>runtime</scope-->
     </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock-cglib</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>