You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/09/19 09:46:58 UTC
svn commit: r290081 - in /cocoon: blocks/html/trunk/pom.xml
blocks/jsp/trunk/pom.xml blocks/mail/trunk/pom.xml
blocks/paranoid/trunk/pom.xml blocks/proxy/trunk/pom.xml trunk/pom.xml
trunk/webapp/pom.xml
Author: cziegeler
Date: Mon Sep 19 00:46:49 2005
New Revision: 290081
URL: http://svn.apache.org/viewcvs?rev=290081&view=rev
Log:
Fix dependencies for block and add all blocks as dependencies to webapp to find problems with transitive dependencies
Modified:
cocoon/blocks/html/trunk/pom.xml
cocoon/blocks/jsp/trunk/pom.xml
cocoon/blocks/mail/trunk/pom.xml
cocoon/blocks/paranoid/trunk/pom.xml
cocoon/blocks/proxy/trunk/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/webapp/pom.xml
Modified: cocoon/blocks/html/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/html/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/blocks/html/trunk/pom.xml (original)
+++ cocoon/blocks/html/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -47,9 +47,20 @@
<version>2.2-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<version>0.9.5</version>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<reporting>
Modified: cocoon/blocks/jsp/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jsp/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/blocks/jsp/trunk/pom.xml (original)
+++ cocoon/blocks/jsp/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -51,6 +51,12 @@
<artifactId>cocoon-jsp-mocks</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<reporting>
<plugins>
Modified: cocoon/blocks/mail/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/mail/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/blocks/mail/trunk/pom.xml (original)
+++ cocoon/blocks/mail/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -50,6 +50,19 @@
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-activation</artifactId>
<version>1.0.2-rc4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-javamail</artifactId>
+ <version>1.3.1-rc5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<reporting>
Modified: cocoon/blocks/paranoid/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/paranoid/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/blocks/paranoid/trunk/pom.xml (original)
+++ cocoon/blocks/paranoid/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -46,6 +46,12 @@
<artifactId>cocoon-core</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<reporting>
<plugins>
Modified: cocoon/blocks/proxy/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/proxy/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/blocks/proxy/trunk/pom.xml (original)
+++ cocoon/blocks/proxy/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -46,6 +46,12 @@
<artifactId>cocoon-core</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<reporting>
<plugins>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Sep 19 00:46:49 2005
@@ -86,6 +86,7 @@
<module>src/blocks/tour/trunk</module>
<module>src/blocks/velocity/trunk</module>
<module>src/blocks/web3/trunk</module>
+ <module>src/blocks/web3/trunk/mocks</module>
<module>src/blocks/webdav/trunk</module>
<module>src/blocks/xmldb/trunk</module>
<module>src/blocks/xsp/trunk</module>
Modified: cocoon/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/webapp/pom.xml?rev=290081&r1=290080&r2=290081&view=diff
==============================================================================
--- cocoon/trunk/webapp/pom.xml (original)
+++ cocoon/trunk/webapp/pom.xml Mon Sep 19 00:46:49 2005
@@ -43,5 +43,277 @@
<artifactId>cocoon-core</artifactId>
<version>2.2-SNAPSHOT</version>
</dependency>
+ <!-- We temporary include all blocks here to see if the transitive dependencies
+ cause trouble: -->
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-core</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-apples</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-asciiart</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-authentication-fw</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-axis</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-batik</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-bsf</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-chaperon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-cron</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-databases</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-deli</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-eventcache</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-faces</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-fop</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-forms</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-hsqldb</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-html</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-itext</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-javaflow</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-jfor</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-jms</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-jsp</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-linkrewriter</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-lucene</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-mail</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-midi</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-naming</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-ojb</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-paranoid</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-petstore</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-poi</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-portal</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-portal-sample</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-profiler</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-proxy</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-python</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-qdox</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-querybean</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-repository</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-scratchpad</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-serializers</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-session-fw</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-slide</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-slop</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-spring-app</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-stx</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-taglib</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-template</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-tour</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-velocity</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-web3</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-webdav</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-xmldb</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon-xsp</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>