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/05 19:34:03 UTC
svn commit: r503801 - in /cocoon/trunk/blocks:
cocoon-batik/cocoon-batik-impl/pom.xml
cocoon-batik/cocoon-batik-sample/pom.xml cocoon-batik/pom.xml pom.xml
Author: reinhard
Date: Mon Feb 5 10:34:02 2007
New Revision: 503801
URL: http://svn.apache.org/viewvc?view=rev&rev=503801
Log:
apply COCOON-2003; flatten pom hierarchy
Removed:
cocoon/trunk/blocks/cocoon-batik/pom.xml
Modified:
cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
cocoon/trunk/blocks/pom.xml
Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?view=diff&rev=503801&r1=503800&r2=503801
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Mon Feb 5 10:34:02 2007
@@ -22,25 +22,27 @@
|
+-->
<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">
+
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-batik</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-batik-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Batik Block Implementation</name>
- <description/>
+ <name>Cocoon Batik Block Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
<version>2.2.0-M3-SNAPSHOT</version>
</dependency>
-<!--
+ <!--
TODO : add exclusions for xerces and rhino.
-->
<dependency>
@@ -151,6 +153,10 @@
<exclusion>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>batik</groupId>
+ <artifactId>batik-1.5-fop</artifactId>
</exclusion>
</exclusions>
</dependency>
Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml?view=diff&rev=503801&r1=503800&r2=503801
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml Mon Feb 5 10:34:02 2007
@@ -19,21 +19,21 @@
-->
<!--+
| @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">
+
<modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
<parent>
+ <artifactId>cocoon-blocks-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-batik</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>3-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-batik-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Batik Block Samples</name>
- <description/>
+ <name>Cocoon Batik Block Samples</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -41,4 +41,5 @@
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+
</project>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=503801&r1=503800&r2=503801
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Mon Feb 5 10:34:02 2007
@@ -74,7 +74,8 @@
<module>cocoon-auth</module>
<module>cocoon-authentication-fw</module>
<module>cocoon-axis</module>
- <module>cocoon-batik</module>
+ <module>cocoon-batik/cocoon-batik-impl</module>
+ <module>cocoon-batik/cocoon-batik-sample</module>
<module>cocoon-bsf</module>
<module>cocoon-captcha</module>
<module>cocoon-chaperon</module>