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/09/21 17:17:13 UTC
svn commit: r578169 - /cocoon/trunk/pom.xml
Author: reinhard
Date: Fri Sep 21 08:17:13 2007
New Revision: 578169
URL: http://svn.apache.org/viewvc?rev=578169&view=rev
Log:
prepare for a release (third time lucky):
- use the new javadocs script report
- move configuration of the javadocs plugin into the release section and don
Modified:
cocoon/trunk/pom.xml
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?rev=578169&r1=578168&r2=578169&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Fri Sep 21 08:17:13 2007
@@ -2128,7 +2128,7 @@
<artifactId>xreporter-grouping</artifactId>
<version>1.2.1.1</version>
</dependency>
- <!-- Cocoon SNAPSHOT dependencies -->
+ <!-- Cocoon SNAPSHOT dependencies
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-ajax-impl</artifactId>
@@ -2951,7 +2951,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>javaflow</artifactId>
<version>1.0-SNAPSHOT</version>
- </dependency>
+ </dependency-->
</dependencies>
</dependencyManagement>
@@ -3042,28 +3042,9 @@
</execution>
</executions>
</plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>dependencies</report>
- <report>license</report>
- <report>summary</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<configuration>
<maxmemory>512m</maxmemory>
<links>
@@ -3077,13 +3058,31 @@
<link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
<link>http://jakarta.apache.org/commons/logging/apidocs/</link>
<link>http://jakarta.apache.org/commons/pool/apidocs/</link>
- <link>http://www.junit.org/junit/javadoc/</link>
<link>http://logging.apache.org/log4j/docs/api/</link>
<link>http://jakarta.apache.org/regexp/apidocs/</link>
<link>http://jakarta.apache.org/velocity/api/</link>
</links>
</configuration>
</plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>project-team</report>
+ <report>dependencies</report>
+ <report>license</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
<artifactId>maven-changes-plugin</artifactId>
<version>2.0-beta-2</version>
@@ -3095,16 +3094,6 @@
</reportSet>
</reportSets>
</plugin>
- <!-- Doesn't work because the maven-report extension needs to be released before. -->
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <configLocation>org/apache/cocoon/maven/reports/checkstyle.xml</configLocation>
- <headerLocation>org/apache/cocoon/maven/reports/checkstyle-header.txt</headerLocation>
- </configuration>
- </plugin-->
</plugins>
</reporting>
@@ -3237,6 +3226,15 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-maven-javadocs-script-report</artifactId>
+ <version>1.0.0-M1</version>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
<profile>
<id>daisy</id>
@@ -3420,11 +3418,6 @@
<artifactId>cocoon-daisy-export-strategy</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <!--dependency>
- <groupId>org.daisycms</groupId>
- <artifactId>daisy-java-adapter</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency-->
</dependencies>
<executions>
<execution>
@@ -3501,6 +3494,16 @@
<omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
</configuration>
</plugin>
+ <!-- Doesn't work because the maven-report extension needs to be released before. -->
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <configLocation>org/apache/cocoon/maven/reports/checkstyle.xml</configLocation>
+ <headerLocation>org/apache/cocoon/maven/reports/checkstyle-header.txt</headerLocation>
+ </configuration>
+ </plugin-->
</plugins>
</reporting>
</profile>