You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/04/23 15:03:06 UTC
svn commit: r1329222 - in /cocoon: subprojects/cocoon-maven-plugin/
subprojects/cocoon-maven-plugin/branches/
subprojects/cocoon-maven-plugin/tags/
subprojects/cocoon-maven-plugin/trunk/ trunk/tools/
trunk/tools/cocoon-maven-plugin/
Author: ilgrosso
Date: Mon Apr 23 13:03:05 2012
New Revision: 1329222
URL: http://svn.apache.org/viewvc?rev=1329222&view=rev
Log:
Moving cocoon-maven-plugin to /subprojects
Added:
cocoon/subprojects/cocoon-maven-plugin/
cocoon/subprojects/cocoon-maven-plugin/branches/
cocoon/subprojects/cocoon-maven-plugin/tags/
cocoon/subprojects/cocoon-maven-plugin/trunk/
- copied from r1328013, cocoon/trunk/tools/cocoon-maven-plugin/
Removed:
cocoon/trunk/tools/cocoon-maven-plugin/
Modified:
cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml
cocoon/trunk/tools/pom.xml
Modified: cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml?rev=1329222&r1=1328013&r2=1329222&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-maven-plugin/trunk/pom.xml Mon Apr 23 13:03:05 2012
@@ -24,14 +24,34 @@
<packaging>maven-plugin</packaging>
<parent>
- <artifactId>cocoon-tools-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>5-SNAPSHOT</version>
+ <artifactId>cocoon</artifactId>
+ <version>9-SNAPSHOT</version>
+ <relativePath/>
</parent>
+
<artifactId>cocoon-maven-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<name>Cocoon Maven 2 Plugin</name>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-maven-plugin/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-maven-plugin/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/cocoon/subprojects/cocoon-maven-plugin/trunk</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/${docs.m.maven-plugin.relPath}</url>
+ </site>
+ </distributionManagement>
+
+ <properties>
+ <docs.name>${project.name}</docs.name>
+ <docs.version>${docs.m.maven-plugin.version}</docs.version>
+ </properties>
+
<dependencies>
<!-- utility libs -->
<dependency>
@@ -71,10 +91,6 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
</dependency>
<dependency>
@@ -93,7 +109,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
<scope>compile</scope>
</dependency>
<!-- test libs -->
@@ -108,50 +123,7 @@
<plugins>
<plugin>
<artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>cocoon</goalPrefix>
- </configuration>
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
- <properties>
- <docs.name>${project.name}</docs.name>
- <docs.version>${docs.m.maven-plugin.version}</docs.version>
- </properties>
-
- <distributionManagement>
- <site>
- <id>website</id>
- <url>${docs.deploymentBaseUrl}/${docs.m.maven-plugin.relPath}</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>daisy</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.daisycms</groupId>
- <artifactId>daisy-maven-plugin</artifactId>
- <configuration>
- <navDocId>1296</navDocId>
- <collection>cdocs-maven-plugin</collection>
- <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: cocoon/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/pom.xml?rev=1329222&r1=1329221&r2=1329222&view=diff
==============================================================================
--- cocoon/trunk/tools/pom.xml (original)
+++ cocoon/trunk/tools/pom.xml Mon Apr 23 13:03:05 2012
@@ -38,7 +38,6 @@
<module>archetypes/cocoon-22-archetype-block-plain</module>
<module>archetypes/cocoon-22-archetype-webapp</module>
<module>cocoon-maven-reports</module>
- <module>cocoon-maven-plugin</module>
<module>cocoon-maven-docs-cleaner-plugin</module>
<module>cocoon-maven-javadocs-script-report</module>
<module>cocoon-rcl/cocoon-rcl-webapp-wrapper</module>