You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/01/18 08:47:35 UTC

svn commit: r613089 - /cocoon/whiteboard/micro/parent/pom.xml

Author: reinhard
Date: Thu Jan 17 23:47:35 2008
New Revision: 613089

URL: http://svn.apache.org/viewvc?rev=613089&view=rev
Log:
cleaning up dependency management section

Modified:
    cocoon/whiteboard/micro/parent/pom.xml

Modified: cocoon/whiteboard/micro/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/micro/parent/pom.xml?rev=613089&r1=613088&r2=613089&view=diff
==============================================================================
--- cocoon/whiteboard/micro/parent/pom.xml (original)
+++ cocoon/whiteboard/micro/parent/pom.xml Thu Jan 17 23:47:35 2008
@@ -31,7 +31,7 @@
   <groupId>org.apache.cocoon.micro</groupId>
   <artifactId>cocoon-micro</artifactId>
   <version>1-SNAPSHOT</version>
-  <name>Apache Cocoon</name>
+  <name>Apache Cocoon Micro: Parent</name>
   <inceptionYear>2008</inceptionYear>
   <url>http://cocoon.apache.org/micro/</url>
 
@@ -77,841 +77,141 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>org.acegisecurity</groupId>
-        <artifactId>acegi-security</artifactId>
-        <version>1.0.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.avalon.framework</groupId>
-        <artifactId>avalon-framework-api</artifactId>
-        <version>4.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.avalon.framework</groupId>
-        <artifactId>avalon-framework-impl</artifactId>
-        <version>4.3.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>avalon-logkit</groupId>
-            <artifactId>avalon-logkit</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.axis</groupId>
-        <artifactId>axis</artifactId>
-        <version>1.4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.axis</groupId>
-        <artifactId>axis-jaxrpc</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.axis</groupId>
-        <artifactId>axis-saaj</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>axis</groupId>
-        <artifactId>axis-wsdl4j</artifactId>
-        <version>1.5.1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-awt-util</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-bridge</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-css</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-dom</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-ext</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-extension</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-gui-util</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-gvt</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-parser</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-rasterizer</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-rasterizer-ext</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-script</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-slideshow</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-squiggle</artifactId>
-        <version>1.6-1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>batik</groupId>
-            <artifactId>batik-1.5-fop</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-svg-dom</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-svggen</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-svgpp</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-swing</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-transcoder</artifactId>
-        <version>1.6-1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>batik</groupId>
-            <artifactId>batik-1.5-fop</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-ttf2svg</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-util</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>batik</groupId>
-        <artifactId>batik-xml</artifactId>
-        <version>1.6-1</version>
-      </dependency>
-      <dependency>
-        <groupId>bsf</groupId>
-        <artifactId>bsf</artifactId>
-        <version>2.3.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.castor</groupId>
-        <artifactId>castor</artifactId>
-        <version>1.1.2.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xerces</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>chaperon</groupId>
-        <artifactId>chaperon</artifactId>
-        <version>20040205</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-betwixt</groupId>
-        <artifactId>commons-betwixt</artifactId>
-        <version>0.6</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.3</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-configuration</groupId>
-        <artifactId>commons-configuration</artifactId>
-        <version>1.3</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-discovery</groupId>
-        <artifactId>commons-discovery</artifactId>
-        <version>0.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <version>3.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-jci-core</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-jci-fam</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-jelly</groupId>
-        <artifactId>commons-jelly</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-jexl</groupId>
-        <artifactId>commons-jexl</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-jxpath</groupId>
-        <artifactId>commons-jxpath</artifactId>
-        <version>1.2</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>ant-optional</artifactId>
-            <groupId>ant-optional</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-beanutils</artifactId>
-            <groupId>commons-beanutils</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>jdom</artifactId>
-            <groupId>jdom</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>servlet</artifactId>
-            <groupId>javax.servlet</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>servletapi</artifactId>
-            <groupId>servletapi</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>xerces</artifactId>
-            <groupId>xerces</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>ant-optional</artifactId>
-            <groupId>ant</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>2.3</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>logkit</artifactId>
-            <groupId>logkit</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>avalon-framework</artifactId>
-            <groupId>avalon-framework</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-transaction</groupId>
-        <artifactId>commons-transaction</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>1.3.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.outerj.daisy</groupId>
-        <artifactId>daisy-htmlcleaner</artifactId>
-        <version>1.4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-htmlcleaner</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-jmsclient-api</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-repository-api</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-repository-client-impl</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-repository-common-impl</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-repository-spi</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-repository-xmlschema-bindings</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>daisy</groupId>
-        <artifactId>daisy-util</artifactId>
-        <version>1.5-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>org.daisycms</groupId>
-        <artifactId>daisy-maven-plugin</artifactId>
-        <version>1.0.0-alpha-1</version>
-      </dependency>
-      <dependency>
-        <groupId>ojb</groupId>
-        <artifactId>db-ojb</artifactId>
-        <version>1.0.4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>jdo</groupId>
-            <artifactId>jdo</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jdo</groupId>
-            <artifactId>jdori</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>geronimo-spec-j2ee</groupId>
-            <artifactId>geronimo-spec-j2ee</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>jcs</groupId>
-            <artifactId>jcs</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>geronimo-spec-servlet</groupId>
-            <artifactId>geronimo-spec-servlet</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>geronimo-spec-jta</groupId>
-            <artifactId>geronimo-spec-jta</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>p6spy</groupId>
-            <artifactId>p6spy</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>torque</groupId>
-            <artifactId>torque</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xdoclet</groupId>
-            <artifactId>xdoclet</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xjavadoc</groupId>
-            <artifactId>xjavadoc</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xml-apis</groupId>
-            <artifactId>xml-apis</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>regexp</groupId>
-            <artifactId>regexp</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>deli</groupId>
-        <artifactId>deli</artifactId>
-        <version>x050330</version>
-      </dependency>
-      <dependency>
-        <groupId>easymock</groupId>
-        <artifactId>easymock</artifactId>
-        <version>1.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache</artifactId>
-        <version>1.2.4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.components</groupId>
-        <artifactId>excalibur-datasource</artifactId>
-        <version>2.2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.containerkit</groupId>
-        <artifactId>excalibur-instrument-api</artifactId>
-        <version>2.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.containerkit</groupId>
-        <artifactId>excalibur-logger</artifactId>
-        <version>2.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.components</groupId>
-        <artifactId>excalibur-pool-api</artifactId>
-        <version>2.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.components</groupId>
-        <artifactId>excalibur-sourceresolve</artifactId>
-        <version>2.2.3</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.components</groupId>
-        <artifactId>excalibur-store</artifactId>
-        <version>2.2.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.avalon.logkit</groupId>
-            <artifactId>avalon-logkit</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.excalibur.components</groupId>
-        <artifactId>excalibur-xmlutil</artifactId>
-        <version>2.2.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.excalibur.components</groupId>
-            <artifactId>excalibur-pool-api</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.excalibur.components</groupId>
-            <artifactId>excalibur-pool-impl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.excalibur.components</groupId>
-            <artifactId>excalibur-store</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.excalibur.containerkit</groupId>
-            <artifactId>excalibur-instrument-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <!-- FOP 0.20.5 dependency for legacy cocoon-fop-impl block -->
-      <dependency>
-        <groupId>fop</groupId>
-        <artifactId>fop</artifactId>
-        <version>0.20.5</version>
-        <exclusions>
-          <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>batik</groupId>
-            <artifactId>batik-1.5-fop</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <!-- FOP 0.9x dependency for cocoon-fop-ng-impl block -->
-      <dependency>
-        <groupId>org.apache.xmlgraphics</groupId>
-        <artifactId>fop</artifactId>
-        <version>0.93</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.avalon.framework</groupId>
-            <artifactId>avalon-framework-impl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>1.8.0.7</version>
-      </dependency>
-      <dependency>
-        <groupId>com.ibm.icu</groupId>
-        <artifactId>icu4j</artifactId>
-        <version>3.4.4</version>
-      </dependency>
-      <dependency>
-        <groupId>com.lowagie</groupId>
-        <artifactId>itext</artifactId>
-        <version>1.1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-core</artifactId>
-        <version>1.0.1</version>
-        <exclusions>
-          <exclusion>
-            <groupId>jsr170</groupId>
-            <artifactId>jcr</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>jakarta-regexp</groupId>
-        <artifactId>jakarta-regexp</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.jcr</groupId>
-        <artifactId>jcr</artifactId>
-        <version>1.0.1</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>eclipse</groupId>
-        <artifactId>jdtcore</artifactId>
-        <version>3.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>net.sourceforge.jena</groupId>
-        <artifactId>jena</artifactId>
-        <version>2.3</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>xmlbeans-jsr173-api</artifactId>
-            <groupId>xmlbeans</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>jfor</groupId>
-        <artifactId>jfor</artifactId>
-        <version>0.7.1</version>
-      </dependency>
-      <dependency>
-        <groupId>thaiopensource</groupId>
-        <artifactId>jing</artifactId>
-        <version>20030619</version>
-      </dependency>
-      <dependency>
-        <groupId>jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>1.0.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>rhino</groupId>
-        <artifactId>js</artifactId>
-        <version>1.6R7</version>
-      </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Libraries ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>jsp-api</artifactId>
-        <version>2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>jtidy</groupId>
-        <artifactId>jtidy</artifactId>
-        <version>4aug2000r7-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>3.8.2</version>
-        <scope>test</scope>
+        <artifactId>servlet-api</artifactId>
+        <version>2.4</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-core</artifactId>
-        <version>2.2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-model</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-project</artifactId>
-        <version>2.0.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0.2</version>
-      </dependency>
-      <dependency>
-        <groupId>myfaces</groupId>
-        <artifactId>myfaces-api</artifactId>
-        <version>r233484</version>
-      </dependency>
-      <dependency>
-        <groupId>myfaces</groupId>
-        <artifactId>myfaces-impl</artifactId>
-        <version>r233484</version>
-      </dependency>
-      <!-- TODO: Next two have same artifactId but different groupId ?? -->
-      <dependency>
-        <groupId>nekodtd</groupId>
-        <artifactId>nekodtd</artifactId>
-        <version>0.1.11</version>
-      </dependency>
-      <dependency>
-        <groupId>nekohtml</groupId>
-        <artifactId>nekodtd</artifactId>
-        <version>0.1.11</version>
-      </dependency>
-      <dependency>
-        <groupId>nekohtml</groupId>
-        <artifactId>nekohtml</artifactId>
-        <version>0.9.5</version>
+        <version>1.2.14</version>
       </dependency>
       <dependency>
-        <groupId>oro</groupId>
-        <artifactId>oro</artifactId>
-        <version>2.0.8</version>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.3.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto</artifactId>
-        <version>1.0.1</version>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>logkit</artifactId>
+            <groupId>logkit</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>avalon-framework</artifactId>
+            <groupId>avalon-framework</groupId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.pluto</groupId>
-        <artifactId>pluto-container</artifactId>
-        <version>1.1.0</version>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.3</version>
       </dependency>
       <dependency>
-        <groupId>poi</groupId>
-        <artifactId>poi</artifactId>
-        <version>2.5.1-final-20040804</version>
+        <groupId>commons-jxpath</groupId>
+        <artifactId>commons-jxpath</artifactId>
+        <version>1.2</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>ant-optional</artifactId>
+            <groupId>ant-optional</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-beanutils</artifactId>
+            <groupId>commons-beanutils</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>jdom</artifactId>
+            <groupId>jdom</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>servlet</artifactId>
+            <groupId>javax.servlet</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>servletapi</artifactId>
+            <groupId>servletapi</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>xerces</artifactId>
+            <groupId>xerces</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>ant-optional</artifactId>
+            <groupId>ant</groupId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>portals-bridges-common</artifactId>
+        <groupId>commons-jexl</groupId>
+        <artifactId>commons-jexl</artifactId>
         <version>1.0</version>
       </dependency>
       <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>1.0</version>
-        <scope>provided</scope>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>3.2</version>
       </dependency>
       <dependency>
-        <groupId>qdox</groupId>
-        <artifactId>qdox</artifactId>
-        <version>1.5</version>
+        <groupId>jakarta-regexp</groupId>
+        <artifactId>jakarta-regexp</artifactId>
+        <version>1.4</version>
       </dependency>
       <dependency>
-        <groupId>quartz</groupId>
-        <artifactId>quartz</artifactId>
-        <version>1.5.1</version>
+        <groupId>net.sf.ehcache</groupId>
+        <artifactId>ehcache</artifactId>
+        <version>1.2.4</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.4</version>
-        <scope>provided</scope>
+        <groupId>rhino</groupId>
+        <artifactId>js</artifactId>
+        <version>1.6R7</version>
       </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ XML ~~~~~~~~~~~~~~~ -->
       <dependency>
-        <groupId>slide</groupId>
-        <artifactId>slide-kernel</artifactId>
-        <version>2.1</version>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.0</version>
       </dependency>
       <dependency>
-        <groupId>slide</groupId>
-        <artifactId>slide-stores</artifactId>
-        <version>2.1</version>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.8.1</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>xml-apis</artifactId>
+            <groupId>xml-apis</groupId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>slide</groupId>
-        <artifactId>slide-webdavlib</artifactId>
-        <version>2.1</version>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.02</version>
       </dependency>
       <dependency>
-        <groupId>slide</groupId>
-        <artifactId>slide-webdavservlet</artifactId>
-        <version>2.1</version>
+        <groupId>xml-resolver</groupId>
+        <artifactId>xml-resolver</artifactId>
+        <version>1.2</version>
       </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Spring Framework ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
@@ -973,162 +273,142 @@
         <artifactId>spring-web</artifactId>
         <version>2.5.1</version>
       </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Tests ~~~~~~~~~~~~~~~ -->
       <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax-api</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>antlr</groupId>
-        <artifactId>stringtemplate</artifactId>
-        <version>2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>tg</groupId>
-        <artifactId>ta</artifactId>
-        <version>1</version>
-      </dependency>
-      <dependency>
-        <groupId>velocity</groupId>
-        <artifactId>velocity</artifactId>
-        <version>1.4</version>
-      </dependency>
-      <dependency>
-        <groupId>wsrp4j</groupId>
-        <artifactId>wsrp4j-consumer</artifactId>
-        <version>0.3-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>wsrp4j</groupId>
-        <artifactId>wsrp4j-shared</artifactId>
-        <version>0.3-dev</version>
-      </dependency>
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.7.0</version>
-      </dependency>
-      <dependency>
-        <groupId>xmlbeans</groupId>
-        <artifactId>xbean</artifactId>
-        <version>2.1.0</version>
+        <groupId>xmlunit</groupId>
+        <artifactId>xmlunit</artifactId>
+        <version>1.1</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.8.1</version>
+        <groupId>htmlunit</groupId>
+        <artifactId>htmlunit</artifactId>
+        <version>1.13</version>
+        <scope>test</scope>
         <exclusions>
           <exclusion>
-            <artifactId>xml-apis</artifactId>
-            <groupId>xml-apis</groupId>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>xindice</groupId>
-        <artifactId>xindice</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>xindice</groupId>
-        <artifactId>xindice-dom</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.3.02</version>
-      </dependency>
-      <dependency>
-        <groupId>xmldb</groupId>
-        <artifactId>xmldb-api</artifactId>
-        <version>20030701</version>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.2</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>xmldb</groupId>
-        <artifactId>xmldb-common</artifactId>
-        <version>20030701</version>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>6.1.6</version>
       </dependency>
       <dependency>
-        <groupId>xmldb</groupId>
-        <artifactId>xmldb-xupdate</artifactId>
-        <version>20040205</version>
+        <groupId>easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>1.1</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xmlParserAPIs</artifactId>
-        <version>2.6.2</version>
+        <groupId>jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>1.0.1</version>
+        <scope>test</scope>
       </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Dependencies to be removed ~~~~~~~~~~~~~~~ -->
       <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <version>1.2</version>
+        <groupId>concurrent</groupId>
+        <artifactId>concurrent</artifactId>
+        <version>1.3.4</version>
       </dependency>
+      <!-- Avalon/Excalibur -->
       <dependency>
-        <groupId>xmlrpc</groupId>
-        <artifactId>xmlrpc</artifactId>
-        <version>1.1</version>
+        <groupId>org.apache.avalon.framework</groupId>
+        <artifactId>avalon-framework-api</artifactId>
+        <version>4.3.1</version>
       </dependency>
       <dependency>
-        <groupId>org.outerj.xreporter</groupId>
-        <artifactId>xreporter-expression</artifactId>
-        <version>1.2.1.1</version>
+        <groupId>org.apache.avalon.framework</groupId>
+        <artifactId>avalon-framework-impl</artifactId>
+        <version>4.3.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>avalon-logkit</groupId>
+            <artifactId>avalon-logkit</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>org.outerj.xreporter</groupId>
-        <artifactId>xreporter-grouping</artifactId>
-        <version>1.2.1.1</version>
+        <groupId>org.apache.excalibur.components</groupId>
+        <artifactId>excalibur-datasource</artifactId>
+        <version>2.2.2</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>2.0</version>
+        <groupId>org.apache.excalibur.containerkit</groupId>
+        <artifactId>excalibur-instrument-api</artifactId>
+        <version>2.2.1</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>6.1.6</version>
+        <groupId>org.apache.excalibur.containerkit</groupId>
+        <artifactId>excalibur-logger</artifactId>
+        <version>2.2.1</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>6.1.6</version>
+        <groupId>org.apache.excalibur.components</groupId>
+        <artifactId>excalibur-pool-api</artifactId>
+        <version>2.2.1</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>servlet-api-2.5</artifactId>
-        <version>6.1.6</version>
+        <groupId>org.apache.excalibur.components</groupId>
+        <artifactId>excalibur-sourceresolve</artifactId>
+        <version>2.2.3</version>
       </dependency>
       <dependency>
-        <groupId>htmlunit</groupId>
-        <artifactId>htmlunit</artifactId>
-        <version>1.13</version>
-        <scope>test</scope>
+        <groupId>org.apache.excalibur.components</groupId>
+        <artifactId>excalibur-store</artifactId>
+        <version>2.2.1</version>
         <exclusions>
           <exclusion>
-            <groupId>avalon-framework</groupId>
-            <artifactId>avalon-framework</artifactId>
+            <groupId>org.apache.avalon.logkit</groupId>
+            <artifactId>avalon-logkit</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-        <version>1.1</version>
-        <scope>test</scope>
+        <groupId>org.apache.excalibur.components</groupId>
+        <artifactId>excalibur-xmlutil</artifactId>
+        <version>2.2.1</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.excalibur.components</groupId>
+            <artifactId>excalibur-pool-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.excalibur.components</groupId>
+            <artifactId>excalibur-pool-impl</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.excalibur.components</groupId>
+            <artifactId>excalibur-store</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.excalibur.containerkit</groupId>
+            <artifactId>excalibur-instrument-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
-      
-      <!-- Cocoon Configurator and Servlet-Service-Framework -->
+      <!-- ~~~~~~~~~~~~~~~~~~ Cocoon Configurator ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-configuration-api</artifactId>
         <version>1.0.1</version>
-      </dependency>   
+      </dependency>
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-spring-configurator</artifactId>
         <version>1.0.1</version>
-      </dependency>         
+      </dependency>
+      <!-- ~~~~~~~~~~~~~~~~~~ Cocoon Servlet-Service-Framework ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-servlet-service-components</artifactId>
@@ -1139,16 +419,7 @@
         <artifactId>cocoon-servlet-service-impl</artifactId>
         <version>1.0.0-RC1</version>
       </dependency>
-      
-      <!-- Cocoon Integration Test Framework -->
-      <dependency>
-        <groupId>org.apache.cocoon.micro</groupId>
-        <artifactId>cocoon-micro-it-fw</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <scope>test</scope>
-      </dependency>        
-
-      <!-- Cocoon SNAPSHOT dependencies -->
+      <!-- ~~~~~~~~~~~~~~~~~~ Cocoon SNAPSHOT dependencies ~~~~~~~~~~~~~~~ -->
       <dependency>
         <groupId>org.apache.cocoon.micro</groupId>
         <artifactId>cocoon-micro-core</artifactId>
@@ -1216,9 +487,9 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.apache.cocoon.micro</groupId>      
+        <groupId>org.apache.cocoon.micro</groupId>
 			  <artifactId>cocoon-micro-store-impl</artifactId>
-			  <version>1.0.0-M1-SNAPSHOT</version>      
+			  <version>1.0.0-M1-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cocoon.micro</groupId>
@@ -1261,6 +532,12 @@
         <artifactId>cocoon-micro-xml-resolver</artifactId>
         <version>1.0.0-M1-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.cocoon.micro</groupId>
+        <artifactId>cocoon-micro-it-fw</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1298,9 +575,8 @@
         <artifactId>maven-idea-plugin</artifactId>
         <version>2.0</version>
         <configuration>
-          <!-- Cocoon 2.2 requires JDK 1.4 -->
-          <jdkName>1.4</jdkName>
-          <jdkLevel>1.4</jdkLevel>
+          <jdkName>1.5</jdkName>
+          <jdkLevel>1.5</jdkLevel>
         </configuration>
       </plugin>
       <plugin>