You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jh...@apache.org on 2005/12/14 22:00:29 UTC
svn commit: r356868 - in /cocoon/trunk: core/pom.xml pom.xml
Author: jheymans
Date: Wed Dec 14 13:00:24 2005
New Revision: 356868
URL: http://svn.apache.org/viewcvs?rev=356868&view=rev
Log:
switchting to excalibur libs, make root pom versioned
Modified:
cocoon/trunk/core/pom.xml
cocoon/trunk/pom.xml
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=356868&r1=356867&r2=356868&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Wed Dec 14 13:00:24 2005
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
- <version>2.2</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>cocoon-core</artifactId>
<version>2.2.0-SNAPSHOT</version>
@@ -79,122 +79,111 @@
</plugins>
</build>
<dependencies>
+
+ <!-- excalibur -->
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- <scope>compile</scope>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-impl</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>1.6.5</version>
+ <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <artifactId>excalibur-sourceresolve</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
+ <groupId>org.apache.excalibur.containerkit.logger</groupId>
+ <artifactId>excalibur-logger</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-instrumented</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.excalibur.components.store</groupId>
+ <artifactId>excalibur-store</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <artifactId>excalibur-instrument-api</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
+ <groupId>org.apache.excalibur.components.xmlutil</groupId>
+ <artifactId>excalibur-xmlutil</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
<version>4.3</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>
- <artifactId>commons-cli</artifactId>
+ <groupId>excalibur-naming</groupId>
+ <artifactId>excalibur-naming</artifactId>
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>excalibur-i18n</groupId>
+ <artifactId>excalibur-i18n</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <!-- commons -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.1</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
- </dependency>
- <dependency>
<groupId>commons-javaflow</groupId>
<artifactId>commons-javaflow</artifactId>
<version>r306555</version>
</dependency>
<dependency>
- <groupId>commons-jci</groupId>
- <artifactId>commons-jci</artifactId>
- <version>r306555</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>
- <groupId>ant</groupId>
<artifactId>ant-optional</artifactId>
+ <groupId>ant-optional</groupId>
</exclusion>
<exclusion>
- <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
</exclusion>
<exclusion>
- <groupId>jdom</groupId>
<artifactId>jdom</artifactId>
+ <groupId>jdom</groupId>
</exclusion>
<exclusion>
- <groupId>servletapi</groupId>
<artifactId>servletapi</artifactId>
+ <groupId>servletapi</groupId>
</exclusion>
<exclusion>
- <groupId>xerces</groupId>
<artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-jci</groupId>
+ <artifactId>commons-jci</artifactId>
+ <version>r306555</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -202,163 +191,36 @@
<version>1.0.4</version>
<exclusions>
<exclusion>
- <groupId>logkit</groupId>
<artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
</exclusion>
<exclusion>
- <groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>1.3.4</version>
- </dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-i18n</groupId>
- <artifactId>excalibur-i18n</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-instrument</groupId>
- <artifactId>excalibur-instrument-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-io</groupId>
- <artifactId>excalibur-io</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-logger</groupId>
- <artifactId>excalibur-logger</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
<dependency>
- <groupId>excalibur-naming</groupId>
- <artifactId>excalibur-naming</artifactId>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-instrumented</artifactId>
- <version>2.1</version>
- </dependency>
- <dependency>
- <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>
- <artifactId>jakarta-bcel</artifactId>
- <version>20040329</version>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>2.0.2</version>
</dependency>
+
+ <!-- osgi -->
<dependency>
- <groupId>jcs</groupId>
- <artifactId>jcs</artifactId>
- <version>1.2.5-dev-20050313</version>
+ <groupId>knopflerfish</groupId>
+ <artifactId>knopflerfish-console_all</artifactId>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
@@ -367,18 +229,18 @@
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
- <artifactId>knopflerfish-console_all</artifactId>
+ <artifactId>knopflerfish-consoletty</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
- <artifactId>knopflerfish-consoletty</artifactId>
+ <artifactId>knopflerfish-logcommands</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
- <artifactId>knopflerfish-framework</artifactId>
- <version>1.3.3</version>
+ <artifactId>knopflerfish-log_all</artifactId>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
@@ -392,33 +254,40 @@
</dependency>
<dependency>
<groupId>knopflerfish</groupId>
- <artifactId>knopflerfish-log_all</artifactId>
- <version>1.0.0</version>
+ <artifactId>knopflerfish-framework</artifactId>
+ <version>1.3.3</version>
</dependency>
+
+ <!-- test dependencies -->
<dependency>
- <groupId>knopflerfish</groupId>
- <artifactId>knopflerfish-logcommands</artifactId>
- <version>1.0.0</version>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>0.8</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <version>1.4</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>1.6R1</version>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <groupId>jcs</groupId>
+ <artifactId>jcs</artifactId>
+ <version>1.2.5-dev-20050313</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
@@ -431,9 +300,9 @@
<version>2.7.1</version>
</dependency>
<dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <version>1.0.3</version>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4</version>
</dependency>
<dependency>
<groupId>xml-resolver</groupId>
@@ -441,44 +310,65 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>1.6R1</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-regexp</groupId>
+ <artifactId>jakarta-regexp</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.02</version>
</dependency>
<dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.1</version>
- <scope>test</scope>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
</dependency>
<dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xmlbeans</artifactId>
+ <version>1.0.3</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>1.6.5</version>
</dependency>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>0.8</version>
- <scope>test</scope>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta-bcel</groupId>
+ <artifactId>jakarta-bcel</artifactId>
+ <version>20040329</version>
</dependency>
</dependencies>
-<!--
- <distributionManagement>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache</id>
- <name>repository</name>
- <url>scpexe://cvs.apache.org/x1/www/cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </snapshotRepository>
- </distributionManagement>
--->
</project>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=356868&r1=356867&r2=356868&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed Dec 14 13:00:24 2005
@@ -23,7 +23,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon</artifactId>
<packaging>pom</packaging>
- <version>2.2</version>
+ <version>2.2.0-SNAPSHOT</version>
<name>Apache Cocoon</name>
<url>http://cocoon.apache.org</url>
<modules>
@@ -41,7 +41,6 @@
<name>Apache Maven2 Repository</name>
<url>http://cvs.apache.org/maven-snapshot-repository</url>
</repository>
- <!-- Apache specific maven repositories available to all blocks -->
<repository>
<id>apache-cvs</id>
<name>Apache CVS Repository</name>