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/09/12 19:32:08 UTC
svn commit: r280376 - in /cocoon: blocks/apples/trunk/
blocks/asciiart/trunk/ blocks/authentication-fw/trunk/ blocks/axis/trunk/
blocks/batik/trunk/ blocks/bsf/trunk/ blocks/chaperon/trunk/
blocks/cron/trunk/ blocks/deli/trunk/ blocks/fop/trunk/ blocks...
Author: jheymans
Date: Mon Sep 12 10:31:52 2005
New Revision: 280376
URL: http://svn.apache.org/viewcvs?rev=280376&view=rev
Log:
introduce m2 style pom inheritance.
Modified:
cocoon/blocks/apples/trunk/pom.xml
cocoon/blocks/asciiart/trunk/pom.xml
cocoon/blocks/authentication-fw/trunk/pom.xml
cocoon/blocks/axis/trunk/pom.xml
cocoon/blocks/batik/trunk/pom.xml
cocoon/blocks/bsf/trunk/pom.xml
cocoon/blocks/chaperon/trunk/pom.xml
cocoon/blocks/cron/trunk/pom.xml
cocoon/blocks/deli/trunk/pom.xml
cocoon/blocks/fop/trunk/pom.xml
cocoon/blocks/forms/trunk/pom.xml
cocoon/blocks/session-fw/trunk/pom.xml
cocoon/blocks/spring-app/trunk/pom.xml
cocoon/blocks/template/trunk/pom.xml
cocoon/trunk/core/pom.xml
cocoon/trunk/pom.xml
Modified: cocoon/blocks/apples/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/pom.xml (original)
+++ cocoon/blocks/apples/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-apples</artifactId>
@@ -47,20 +52,6 @@
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/asciiart/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/asciiart/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/asciiart/trunk/pom.xml (original)
+++ cocoon/blocks/asciiart/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-asciiart</artifactId>
@@ -42,20 +47,6 @@
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/authentication-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/authentication-fw/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/authentication-fw/trunk/pom.xml (original)
+++ cocoon/blocks/authentication-fw/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-authentication-fw</artifactId>
@@ -47,20 +52,6 @@
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/axis/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/axis/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/axis/trunk/pom.xml (original)
+++ cocoon/blocks/axis/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-axis</artifactId>
@@ -53,20 +58,6 @@
<scope>provided</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/batik/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/batik/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/batik/trunk/pom.xml (original)
+++ cocoon/blocks/batik/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-batik</artifactId>
@@ -47,20 +52,6 @@
<version>1.6</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/bsf/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/bsf/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/bsf/trunk/pom.xml (original)
+++ cocoon/blocks/bsf/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-bsf</artifactId>
@@ -47,20 +52,6 @@
<version>2.3.0</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/chaperon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/chaperon/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/chaperon/trunk/pom.xml (original)
+++ cocoon/blocks/chaperon/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-chaperon</artifactId>
@@ -52,20 +57,6 @@
<version>0.9.6-xml</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/cron/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/cron/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/cron/trunk/pom.xml (original)
+++ cocoon/blocks/cron/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-cron</artifactId>
@@ -52,20 +57,6 @@
<version>2.1</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/deli/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/pom.xml (original)
+++ cocoon/blocks/deli/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-deli</artifactId>
@@ -57,20 +62,6 @@
<version>2.3</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/fop/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/fop/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/fop/trunk/pom.xml (original)
+++ cocoon/blocks/fop/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-fop</artifactId>
@@ -47,20 +52,6 @@
<version>0.20.5</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/forms/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/pom.xml (original)
+++ cocoon/blocks/forms/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-forms</artifactId>
@@ -67,20 +72,6 @@
<version>3.0</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/session-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/session-fw/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/session-fw/trunk/pom.xml (original)
+++ cocoon/blocks/session-fw/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-session-fw</artifactId>
@@ -42,20 +47,6 @@
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/spring-app/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/pom.xml (original)
+++ cocoon/blocks/spring-app/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-spring-app</artifactId>
@@ -53,20 +58,6 @@
<version>1.2.4</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/blocks/template/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/pom.xml (original)
+++ cocoon/blocks/template/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -19,6 +19,11 @@
|
+-->
<project>
+ <parent>
+ <groupId>apache-cocoon</groupId>
+ <artifactId>cocoon</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>apache-cocoon</groupId>
<artifactId>cocoon-template</artifactId>
@@ -42,20 +47,6 @@
<version>2.2-SNAPSHOT</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Mon Sep 12 10:31:52 2005
@@ -323,7 +323,6 @@
<artifactId>xml-apis</artifactId>
<version>[1.3.02]</version>
</dependency>
-
<dependency>
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
@@ -349,20 +348,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>apache</id>
- <name>Apache Java Repository</name>
- <url>http://www.apache.org/dist/java-repository</url>
- <layout>legacy</layout>
- </repository>
- <repository>
- <id>apache-cvs</id>
- <name>Apache CVS Repository</name>
- <url>http://cvs.apache.org/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
<reporting>
<plugins>
<plugin>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=280376&r1=280375&r2=280376&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Sep 12 10:31:52 2005
@@ -44,4 +44,19 @@
<module>src/blocks/spring-app/trunk</module>
<module>src/blocks/template/trunk</module>
</modules>
+ <repositories>
+ <!-- Apache specific maven repositories available to all blocks -->
+ <repository>
+ <id>apache</id>
+ <name>Apache Java Repository</name>
+ <url>http://www.apache.org/dist/java-repository</url>
+ <layout>legacy</layout>
+ </repository>
+ <repository>
+ <id>apache-cvs</id>
+ <name>Apache CVS Repository</name>
+ <url>http://cvs.apache.org/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
</project>