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 2008/11/27 21:55:10 UTC
svn commit: r721276 - in /cocoon/cocoon3/trunk: parent/pom.xml pom.xml
release.pom.xml
Author: reinhard
Date: Thu Nov 27 12:55:10 2008
New Revision: 721276
URL: http://svn.apache.org/viewvc?rev=721276&view=rev
Log:
reintroduce a root pom
Added:
cocoon/cocoon3/trunk/pom.xml
- copied, changed from r701954, cocoon/cocoon3/trunk/release.pom.xml
Removed:
cocoon/cocoon3/trunk/release.pom.xml
Modified:
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=721276&r1=721275&r2=721276&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Thu Nov 27 12:55:10 2008
@@ -35,18 +35,6 @@
<description>Cocoon 3 Parent POM module contains all basic configurations for the Maven 2 based build system.</description>
<inceptionYear>2008</inceptionYear>
- <modules>
- <module>../cocoon-all</module>
- <module>../cocoon-controller</module>
- <module>../cocoon-optional</module>
- <module>../cocoon-pipeline</module>
- <module>../cocoon-rest</module>
- <module>../cocoon-sample</module>
- <module>../cocoon-servlet</module>
- <module>../cocoon-sitemap</module>
- <module>../cocoon-stringtemplate</module>
- </modules>
-
<developers>
<developer>
<id>steven.dolg</id>
@@ -340,12 +328,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
@@ -577,15 +559,6 @@
</build>
</profile>
<profile>
- <id>archetypes</id>
- <modules>
- <module>../cocoon-archetype-block</module>
- <module>../cocoon-archetype-parent</module>
- <module>../cocoon-archetype-sample</module>
- <module>../cocoon-archetype-webapp</module>
- </modules>
- </profile>
- <profile>
<id>release</id>
<build>
<resources>
Copied: cocoon/cocoon3/trunk/pom.xml (from r701954, cocoon/cocoon3/trunk/release.pom.xml)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/pom.xml?p2=cocoon/cocoon3/trunk/pom.xml&p1=cocoon/cocoon3/trunk/release.pom.xml&r1=701954&r2=721276&rev=721276&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/release.pom.xml (original)
+++ cocoon/cocoon3/trunk/pom.xml Thu Nov 27 12:55:10 2008
@@ -27,14 +27,10 @@
<artifactId>cocoon-root</artifactId>
<version>3.0.0-alpha-2-SNAPSHOT</version>
<name>Cocoon 3: Root [pom]</name>
- <description>Cocoon 3 Root. Required because of http://maven.markmail.org/message/5m5uhkdczmghqxsk</description>
+ <!-- Cocoon 3 Root. Required because of http://maven.markmail.org/message/5m5uhkdczmghqxsk -->
<modules>
<module>cocoon-all</module>
- <module>cocoon-archetype-block</module>
- <module>cocoon-archetype-parent</module>
- <module>cocoon-archetype-sample</module>
- <module>cocoon-archetype-webapp</module>
<module>cocoon-controller</module>
<module>cocoon-optional</module>
<module>cocoon-pipeline</module>
@@ -50,6 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase>
</configuration>
@@ -71,4 +68,16 @@
<url>scpexe://people.apache.org/www/people.apache.org/builds/cocoon</url>
</repository>
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>archetypes</id>
+ <modules>
+ <module>cocoon-archetype-block</module>
+ <module>cocoon-archetype-parent</module>
+ <module>cocoon-archetype-sample</module>
+ <module>cocoon-archetype-webapp</module>
+ </modules>
+ </profile>
+ </profiles>
</project>