cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject svn commit: r331683 - /cocoon/trunk/core/pom.xml
Date Tue, 08 Nov 2005 05:18:14 GMT
Author: antonio
Date: Mon Nov  7 21:18:10 2005
New Revision: 331683

URL: http://svn.apache.org/viewcvs?rev=331683&view=rev
Log:
Fix "dependency hell". ;-)

Modified:
    cocoon/trunk/core/pom.xml

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=331683&r1=331682&r2=331683&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Mon Nov  7 21:18:10 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2005 The Apache Software Foundation
-  
+
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +18,8 @@
   | @version $Id$
   |
   +-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>apache-cocoon</groupId>
@@ -81,6 +82,7 @@
       <groupId>ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.6.5</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>ant</groupId>
@@ -94,18 +96,42 @@
     </dependency>
     <dependency>
       <groupId>avalon-framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-      <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-framework</groupId>
       <artifactId>avalon-framework-impl</artifactId>
       <version>4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-logkit</groupId>
-      <artifactId>avalon-logkit</artifactId>
-      <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-javamail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>servletapi</groupId>
+          <artifactId>servletapi</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jmock</groupId>
+          <artifactId>jmock</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -143,10 +169,22 @@
       <version>1.2</version>
       <exclusions>
         <exclusion>
-          <groupId>ant-optional</groupId>
+          <groupId>ant</groupId>
           <artifactId>ant-optional</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jdom</groupId>
+          <artifactId>jdom</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>servletapi</groupId>
+          <artifactId>servletapi</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>xerces</groupId>
           <artifactId>xerces</artifactId>
         </exclusion>
@@ -163,6 +201,10 @@
       <version>1.0.4</version>
       <exclusions>
         <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>avalon-framework</groupId>
           <artifactId>avalon-framework</artifactId>
         </exclusion>
@@ -222,16 +264,90 @@
       <groupId>excalibur-sourceresolve</groupId>
       <artifactId>excalibur-sourceresolve</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-vfs</groupId>
+          <artifactId>commons-vfs</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-fortress</groupId>
+          <artifactId>excalibur-fortress-container-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>excalibur-fortress</groupId>
+          <artifactId>excalibur-fortress-meta</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>qdox</groupId>
+          <artifactId>qdox</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>excalibur-store</groupId>
       <artifactId>excalibur-store</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-javamail</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>geronimo-spec</groupId>
+          <artifactId>geronimo-spec-jms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jisp</groupId>
+          <artifactId>jisp</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>logkit</groupId>
+          <artifactId>logkit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>excalibur-xmlutil</groupId>
       <artifactId>excalibur-xmlutil</artifactId>
       <version>2.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>excalibur-component</groupId>
+          <artifactId>excalibur-testcase</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jtidy</groupId>
+          <artifactId>jtidy</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>saxon</groupId>
+          <artifactId>saxon</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>saxon7</groupId>
+          <artifactId>saxon7</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>saxon7</groupId>
+          <artifactId>saxon7-jdom</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>saxon7</groupId>
+          <artifactId>saxon7-sql</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>saxpath</groupId>
+          <artifactId>saxpath</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>jakarta-bcel</groupId>
@@ -286,7 +402,7 @@
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
-      <version>1.2.11</version>
+      <version>1.2.12</version>
     </dependency>
     <dependency>
       <groupId>jakarta-regexp</groupId>
@@ -295,14 +411,13 @@
     </dependency>
     <dependency>
       <groupId>rhino</groupId>
-      <artifactId>rhino</artifactId>
+      <artifactId>js</artifactId>
       <version>1.6R1</version>
     </dependency>
     <dependency>
-      <groupId>servletapi</groupId>
-      <artifactId>servletapi</artifactId>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
       <version>2.3</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>xalan</groupId>



Mime
View raw message