r1402 - xwiki/trunk/core

[Vincent Massol]

Author: vmassol
Date: 2006-10-17 11:24:37 +0200 (Tue, 17 Oct 2006)
New Revision: 1402

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

* Added jackrabbit-core 1.1 to our custom m2 repo

Modified: xwiki/trunk/core/pom.xml
===================================================================
--- xwiki/trunk/core/pom.xml	2006-10-17 09:15:10 UTC (rev 1401)
+++ xwiki/trunk/core/pom.xml	2006-10-17 09:24:37 UTC (rev 1402)
@@ -25,10 +25,6 @@
 
 jfreechart: I've used v 1.0.0 instead of 1.0.0-rc1 as in lib/. Is that ok? Note that ther's also a 1.0.2. Should we
             upgrade to that?
-jackrabbit: problem with the jackrabbit POM including lots of dependencies which should probabyl be optional and
-            in addition there's a failed dep: jsr170:jcr:jar:1.0 (should be javax.jcr). Reported in
-            http://jira.codehaus.org/browse/MEV-453
-alexa.jar: what version are we using? Is the license compatible?
 googleaddwords.jar: what version and license?
               
 -->
@@ -92,6 +88,14 @@
       <classifier>xwiki</classifier>
     </dependency>
 
+    <!-- Version 1.1 of jackrabbit core needs to be uploaded to Maven2 central repo. In addition there was a  POM
+         issue in version 1.0.1, see http://jira.codehaus.org/browse/MEV-453 -->
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>jackrabbit-core</artifactId>
+      <version>1.1</version>
+    </dependency>
+
     <!-- Standard dependencies found in the main Maven remote repository -->
 
     <dependency>
@@ -176,11 +180,6 @@
       <artifactId>jcr</artifactId>
       <version>1.0</version>
     </dependency>
-    <!--dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>1.0.1</version>
-    </dependency-->
     <dependency>
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>