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 2007/05/03 00:30:13 UTC
svn commit: r534638 - in /cocoon/trunk:
blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml pom.xml
Author: jheymans
Date: Wed May 2 15:30:11 2007
New Revision: 534638
URL: http://svn.apache.org/viewvc?view=rev&rev=534638
Log:
upgrading to latest excalibur releases, fixes COCOON-2029. Cleaned up duplicate groupid/artifactid declaration for sourceresolve and datasource
Modified:
cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
cocoon/trunk/pom.xml
Modified: cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml?view=diff&rev=534638&r1=534637&r2=534638
==============================================================================
--- cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/pom.xml Wed May 2 15:30:11 2007
@@ -38,96 +38,31 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
-
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-session-fw-impl</artifactId>
-
<scope>provided</scope>
</dependency>
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
-
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
-
</dependency>
<dependency>
- <groupId>excalibur-datasource</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-datasource</artifactId>
-
- <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>
</dependency>
<dependency>
<groupId>rhino</groupId>
<artifactId>js</artifactId>
-
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
-
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml?view=diff&rev=534638&r1=534637&r2=534638
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml Wed May 2 15:30:11 2007
@@ -39,27 +39,14 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
-
</dependency>
<dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
-
- <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>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
-
<scope>provided</scope>
</dependency>
</dependencies>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=534638&r1=534637&r2=534638
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed May 2 15:30:11 2007
@@ -1515,74 +1515,10 @@
</exclusion>
</exclusions>
</dependency>
- <!-- TODO: Next two have same artifactId but different groupId as well as version ?? -->
- <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>
- </dependency>
<dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-datasource</artifactId>
- <version>2.2.1</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.excalibur.containerkit</groupId>
@@ -1599,48 +1535,10 @@
<artifactId>excalibur-pool-api</artifactId>
<version>2.2.1</version>
</dependency>
- <!-- TODO: Next two have same artifactId but different groupId as well as version ?? -->
- <dependency>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
- <artifactId>excalibur-sourceresolve</artifactId>
- <version>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</groupId>
<artifactId>excalibur-sourceresolve</artifactId>
- <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>
- <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>
- </exclusions>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.excalibur.components</groupId>
@@ -2680,4 +2578,4 @@
</reporting>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>