You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2006/08/01 17:18:05 UTC
svn commit: r427605 - in /cocoon/trunk:
blocks/cocoon-apples/cocoon-apples-sample/
core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/
core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/
core/cocoon-blocks-fw/cocoon-blocks-fw-tests/ tools/archetypes/coco...
Author: lgawron
Date: Tue Aug 1 08:18:04 2006
New Revision: 427605
URL: http://svn.apache.org/viewvc?rev=427605&view=rev
Log:
pom fixes
Modified:
cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
Modified: cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-apples/cocoon-apples-sample/pom.xml Tue Aug 1 08:18:04 2006
@@ -18,31 +18,31 @@
| @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>
-
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-apples</artifactId>
<version>1-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-apples-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
-
+
<packaging>jar</packaging>
<name>apples Block Samples</name>
<description/>
-
+
<build>
<finalName>cocoon-apples-sample</finalName>
<plugins>
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </plugin>
+ <version>1.0.0-M2-SNAPSHOT</version>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
@@ -57,10 +57,10 @@
<webAppSourceDirectory>target/cocoon-apples-sample</webAppSourceDirectory>
<contextPath>/</contextPath>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -71,12 +71,12 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core-samples-main-sample</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-impl</artifactId>
@@ -86,7 +86,7 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-samples-style-default</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
</dependencies>
</project>
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml Tue Aug 1 08:18:04 2006
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-M2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml Tue Aug 1 08:18:04 2006
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-M2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-tests/pom.xml Tue Aug 1 08:18:04 2006
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.2.0-M2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-block/src/main/resources/archetype-resources/pom.xml Tue Aug 1 08:18:04 2006
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2006 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,23 +15,23 @@
limitations under the License.
-->
<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>
-
+
<name>${artifactId}</name>
-
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>1.0.0-SNAPSHOT</version>
-
+
<build>
- <finalName>${artifactId}</finalName>
+ <finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -47,21 +47,21 @@
<webAppSourceDirectory>target/${artifactId}</webAppSourceDirectory>
<contextPath>/</contextPath>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
-
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </dependency>
+ <version>2.2.0-M2-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-template-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- </dependencies>
-
+ </dependencies>
+
</project>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/pom.xml Tue Aug 1 08:18:04 2006
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2006 The Apache Software Foundation
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,26 +15,26 @@
limitations under the License.
-->
<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>
-
+
<name>${artifactId}</name>
-
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>1.0.0-SNAPSHOT</version>
-
+
<build>
<plugins>
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M2-SNAPSHOT</version>
<configuration>
<serverVersion>2.2</serverVersion>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
@@ -49,22 +49,22 @@
<webAppSourceDirectory>./target/cocoon-webapp</webAppSourceDirectory>
<contextPath>/</contextPath>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- <finalName>cocoon-webapp</finalName>
- </build>
-
+ <finalName>cocoon-webapp</finalName>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-core</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </dependency>
+ <version>2.2.0-M2-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
+ </dependency>
+ </dependencies>
+
</project>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml Tue Aug 1 08:18:04 2006
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M2-SNAPSHOT</version>
</plugin>
<plugin>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-webapp-sample/pom.xml Tue Aug 1 08:18:04 2006
@@ -37,7 +37,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml?rev=427605&r1=427604&r2=427605&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml Tue Aug 1 08:18:04 2006
@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-M2-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>