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 2007/02/27 09:56:22 UTC
svn commit: r512182 - in /cocoon/trunk: ./
blocks/cocoon-chaperon/cocoon-chaperon-impl/
blocks/cocoon-cron/cocoon-cron-impl/
blocks/cocoon-databases/cocoon-databases-hsqldb-client/
blocks/cocoon-databases/cocoon-databases-impl/ blocks/cocoon-deli/cocoo...
Author: reinhard
Date: Tue Feb 27 00:56:20 2007
New Revision: 512182
URL: http://svn.apache.org/viewvc?view=rev&rev=512182
Log:
upgrade to latest Avalon/Excalibur releases; root pom only depends on the Maven central repository - if some module has a dependency to a different repository, it is declared explicitly there; minor cleanups
Modified:
cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml
cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
cocoon/trunk/core/cocoon-util/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/site/pom.xml
Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -22,6 +22,7 @@
|
+-->
<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">
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-chaperon</artifactId>
@@ -33,7 +34,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Chaperon Block Implementation</name>
- <description/>
+
+ <repositories>
+ <!-- Repository for chaperon -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -56,7 +67,7 @@
<version>2.4</version>
<scope>provided</scope>
</dependency>
-<!-- test dependencies -->
+ <!-- test dependencies -->
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
@@ -96,4 +107,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -19,9 +19,9 @@
-->
<!--+
| @version $Id$
- |
+-->
<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">
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-cron</artifactId>
@@ -33,6 +33,7 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cron block implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -45,67 +46,10 @@
<version>1.5.1</version>
</dependency>
<dependency>
- <groupId>excalibur-datasource</groupId>
- <artifactId>excalibur-datasource</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>d-haven-managed-pool</groupId>
- <artifactId>d-haven-managed-pool</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>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-fortress</groupId>
- <artifactId>excalibur-fortress-meta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-fortress</groupId>
- <artifactId>excalibur-fortress-container-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-component</groupId>
- <artifactId>excalibur-component</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-component</groupId>
- <artifactId>excalibur-testcase</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-logger</groupId>
- <artifactId>excalibur-logger</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-instrument</groupId>
- <artifactId>excalibur-instrument-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.excalibur.components</groupId>
+ <artifactId>excalibur-datasource</artifactId>
+ <version>2.2.1</version>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-hsqldb-client/pom.xml Tue Feb 27 00:56:20 2007
@@ -34,7 +34,7 @@
<artifactId>cocoon-databases-hsqldb-client</artifactId>
<version>1.0.0-RC1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Cocoon Hsqldb client Implementation</name>
+ <name>Cocoon Hsqldb Client Implementation</name>
<dependencies>
<dependency>
Modified: cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-databases/cocoon-databases-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -49,67 +49,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>excalibur-datasource</groupId>
- <artifactId>excalibur-datasource</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <artifactId>d-haven-managed-pool</artifactId>
- <groupId>d-haven-managed-pool</groupId>
- </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>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-pool</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-fortress</groupId>
- <artifactId>excalibur-fortress-meta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-fortress</groupId>
- <artifactId>excalibur-fortress-container-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-component</groupId>
- <artifactId>excalibur-component</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-component</groupId>
- <artifactId>excalibur-testcase</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-logger</groupId>
- <artifactId>excalibur-logger</artifactId>
- </exclusion>
- <exclusion>
- <groupId>excalibur-instrument</groupId>
- <artifactId>excalibur-instrument-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.excalibur.components</groupId>
+ <artifactId>excalibur-datasource</artifactId>
+ <version>2.2.1</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -19,9 +19,9 @@
-->
<!--+
| @version $Id$
- |
+-->
<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">
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deli</artifactId>
@@ -33,7 +33,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Deli Block Implementation</name>
- <description/>
+
+ <repositories>
+ <!-- Repository for the deli -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -63,4 +73,5 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -33,7 +33,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Faces Block Implementation</name>
- <description/>
+
+ <repositories>
+ <!-- Repository for the myfaces -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -68,6 +68,16 @@
</plugins>
</build>
+ <repositories>
+ <!-- Repository for the xreporter -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>commons-collections</groupId>
@@ -134,9 +144,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jfor/cocoon-jfor-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -33,7 +33,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Jfor Block Implementation</name>
- <description/>
+
+ <repositories>
+ <!-- Repository for the jfor -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -19,7 +19,6 @@
-->
<!--+
| @version $Id$
- |
+-->
<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">
<parent>
@@ -32,6 +31,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Portal Block WSRP Implementation</name>
+
+ <repositories>
+ <!-- Repository for the wsrp4j -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xmldb/cocoon-xmldb-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -32,6 +32,17 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>XMLDB Block's Implementation</name>
+
+ <repositories>
+ <!-- Repository for the xmldb -->
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache Maven 1 Repository</name>
+ <url>http://people.apache.org/repo/m1-snapshot-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Tue Feb 27 00:56:20 2007
@@ -87,7 +87,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
- <!--plugin>
+ <plugin>
<groupId>org.daisycms</groupId>
<artifactId>daisy-maven-plugin</artifactId>
<configuration>
@@ -95,7 +95,7 @@
<collection>cdocs-core</collection>
<skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
</configuration>
- </plugin-->
+ </plugin>
</plugins>
<resources>
<resource>
@@ -164,46 +164,24 @@
</dependency>
<!-- excalibur -->
<dependency>
- <groupId>org.apache.excalibur.components.pool</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.containerkit.logger</groupId>
+ <groupId>org.apache.excalibur.containerkit</groupId>
<artifactId>excalibur-logger</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.store</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-store</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<!-- commons -->
<dependency>
@@ -215,11 +193,16 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-core</artifactId>
<version>1.0-SNAPSHOT</version>
- </dependency-->
+ </dependency>
+ <dependency>
+ <groupId>jakarta-bcel</groupId>
+ <artifactId>jakarta-bcel</artifactId>
+ <version>20040329</version>
+ </dependency-->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
<exclusions>
<exclusion>
<artifactId>logkit</artifactId>
@@ -229,6 +212,10 @@
<artifactId>avalon-framework</artifactId>
<groupId>avalon-framework</groupId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -244,7 +231,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
<exclusions>
<exclusion>
<artifactId>xml-apis</artifactId>
@@ -271,12 +258,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>jakarta-bcel</groupId>
- <artifactId>jakarta-bcel</artifactId>
- <version>20040329</version>
+ <version>1.2.14</version>
</dependency>
<!-- test dependencies -->
<dependency>
@@ -325,4 +307,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Tue Feb 27 00:56:20 2007
@@ -23,14 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- </plugin>
- <!--plugin>
- <groupId>org.daisycms</groupId>
- <artifactId>daisy-maven-plugin</artifactId>
- <configuration>
- <createSiteXmlOnly>true</createSiteXmlOnly>
- </configuration>
- </plugin-->
+ </plugin>
</plugins>
</build>
@@ -51,70 +44,40 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.xmlutil</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-xmlutil</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
- <groupId>org.apache.excalibur.testcase</groupId>
- <artifactId>excalibur-testcase</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
- <artifactId>excalibur-pool-instrumented</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-impl</artifactId>
</exclusion>
<exclusion>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.store</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-store</artifactId>
</exclusion>
- <!-- exclusion>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
- <artifactId>excalibur-sourceresolve</artifactId>
- </exclusion -->
<exclusion>
- <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <groupId>org.apache.excalibur.containerkit</groupId>
<artifactId>excalibur-instrument-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- Commons -->
@@ -140,4 +103,4 @@
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -78,40 +78,30 @@
</dependency>
<!-- Excalibur -->
<dependency>
- <groupId>org.apache.excalibur.components.pool</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.store</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-store</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <groupId>org.apache.excalibur.containerkit</groupId>
<artifactId>excalibur-instrument-api</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
</dependency>
<!-- Commons -->
<dependency>
Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -42,9 +42,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.avalon.framework</groupId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-api/pom.xml Tue Feb 27 00:56:20 2007
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
+ <version>4.3.1</version>
<exclusions>
<exclusion>
<groupId>avalon-logkit</groupId>
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -69,24 +69,12 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.containerkit.logger</groupId>
+ <groupId>org.apache.excalibur.containerkit</groupId>
<artifactId>excalibur-logger</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>avalon-logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.2.1</version>
</dependency>
<!-- Commons -->
<dependency>
Modified: cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-store/cocoon-store-impl/pom.xml Tue Feb 27 00:56:20 2007
@@ -39,9 +39,9 @@
</dependency>
<!-- Excalibur -->
<dependency>
- <groupId>org.apache.excalibur.components.store</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-store</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.avalon.logkit</groupId>
@@ -50,9 +50,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <groupId>org.apache.excalibur.containerkit</groupId>
<artifactId>excalibur-instrument-api</artifactId>
- <version>2.1</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
Modified: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (original)
+++ cocoon/trunk/core/cocoon-util/pom.xml Tue Feb 27 00:56:20 2007
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.3</version>
+ <version>4.3.1</version>
</dependency>
<!-- Commons -->
<dependency>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Tue Feb 27 00:56:20 2007
@@ -65,24 +65,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <repository>
- <id>apache.snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <!-- excalibur poms are located here -->
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache Maven 1 Repository</name>
- <url>http://people.apache.org/repo/m1-snapshot-repository</url>
- <layout>legacy</layout>
- </repository>
</repositories>
<pluginRepositories>
@@ -658,6 +640,10 @@
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.3</version>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
<plugin>
<artifactId>maven-idea-plugin</artifactId>
<version>2.0</version>
Modified: cocoon/trunk/site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/pom.xml?view=diff&rev=512182&r1=512181&r2=512182
==============================================================================
--- cocoon/trunk/site/pom.xml (original)
+++ cocoon/trunk/site/pom.xml Tue Feb 27 00:56:20 2007
@@ -59,16 +59,22 @@
<module>../blocks/cocoon-profiler/cocoon-profiler-impl</module>
<module>../blocks/cocoon-serializers/cocoon-serializers-impl</module>
<module>../blocks/cocoon-template/cocoon-template-impl</module>
+ <!--module>../blocks/cocoon-batik/cocoon-batik-impl</module>
+ <module>../blocks/cocoon-html/cocoon-html-impl</module>
+ <module>../blocks/cocoon-link-rewriter/cocoon-link-rewriter-impl</module>
+ <module>../blocks/cocoon-database/cocoon-database-impl</module>
+ <module>../blocks/cocoon-database/cocoon-hsqldb-server-impl/cocoon-hsqldb-server-impl</module>
+ <module>../blocks/cocoon-database/cocoon-hsqldb-client-impl/cocoon-hsqldb-client-impl</module-->
<!-- Subprojects -->
<module>../core/cocoon-configuration/cocoon-configuration-api</module>
<module>../core/cocoon-configuration/cocoon-spring-configurator</module>
+ <module>../core/cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
<!-- Maven plugins -->
<module>../tools/cocoon-rcl/cocoon-rcl-plugin</module>
<!-- Core modules -->
- <module>../core/cocoon-blocks-fw/cocoon-blocks-fw-impl</module>
<module>../core/cocoon-core</module>
<module>../core/cocoon-pipeline/cocoon-pipeline-api</module>
<module>../core/cocoon-pipeline/cocoon-pipeline-impl</module>