Author: apetrelli
Date: Mon Nov 29 13:34:02 2010
New Revision: 1040108
URL: http://svn.apache.org/viewvc?rev=1040108&view=rev
Log:
Some Maven fixes, to enable Maven 3, a better site and fix for
velocity-engine-servlet module.
Modified:
velocity/engine/branches/2.0_Exp/pom.xml
velocity/engine/branches/2.0_Exp/src/site/site.xml
velocity/engine/branches/2.0_Exp/velocity-engine-assembly/src/site/site.xml
velocity/engine/branches/2.0_Exp/velocity-engine-core/src/site/site.xml
velocity/engine/branches/2.0_Exp/velocity-engine-examples/src/site/site.xml
velocity/engine/branches/2.0_Exp/velocity-engine-servlet/pom.xml
Modified: velocity/engine/branches/2.0_Exp/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/pom.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/pom.xml (original)
+++ velocity/engine/branches/2.0_Exp/pom.xml Mon Nov 29 13:34:02 2010
@@ -81,6 +81,100 @@
</site>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>maven3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only
+ recognized by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-3</version>
+ <configuration>
+ <inputEncoding>UTF-8</inputEncoding>
+ <outputEncoding>UTF-8</outputEncoding>
+ <reportPlugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin
+ </artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-changes-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+
<issueLinkTemplate>${jira.browse.url}/%ISSUE%</issueLinkTemplate>
+ <component>12311337</component>
+
<filter>fixfor=12310290&sorter/field=issuekey&sorter/order=ASC</filter>
+ <maxEntries>100</maxEntries>
+
<teamlist>http://velocity.apache.org/who-we-are.html</teamlist>
+ </configuration>
+ <reports>
+ <report>changes-report</report>
+ <!-- <report>jira-report</report> -->
+ </reports>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <tag>TODO</tag>
+ <tag>FIXME</tag>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+
<excludePackageNames>org.apache.velocity.example</excludePackageNames>
+ <links>
+
<link>http://java.sun.com/j2se/1.5.0/docs/api/
+ </link>
+
<link>http://jakarta.apache.org/oro/api</link>
+
<link>http://commons.apache.org/lang/api-release/
+ </link>
+
<link>http://commons.apache.org/collections/api-release/
+ </link>
+
<link>http://logging.apache.org/log4j/1.2/apidocs/
+ </link>
+
<link>http://excalibur.apache.org/apidocs</link>
+
<link>http://tomcat.apache.org/tomcat-4.1-doc/servletapi/
+ </link>
+ </links>
+ </configuration>
+ <reports>
+ <report>javadoc</report>
+ <report>aggregate</report>
+ </reports>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<reporting>
<plugins>
<plugin>
Modified: velocity/engine/branches/2.0_Exp/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/src/site/site.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/src/site/site.xml (original)
+++ velocity/engine/branches/2.0_Exp/src/site/site.xml Mon Nov 29 13:34:02 2010
@@ -80,7 +80,7 @@
<menu name="Developers">
<item name="License" href="license.html"/>
- <item name="Javadoc"
href="velocity-engine/apidocs/index.html"/>
+ <item name="Javadoc" href="apidocs/index.html"/>
<item name="Changes" href="changes-report.html"/>
<item name="Resolved Issues" href="jira-report.html"/>
<item name="Upgrading" href="upgrading.html"/>
Modified:
velocity/engine/branches/2.0_Exp/velocity-engine-assembly/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/velocity-engine-assembly/src/site/site.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/velocity-engine-assembly/src/site/site.xml
(original)
+++ velocity/engine/branches/2.0_Exp/velocity-engine-assembly/src/site/site.xml
Mon Nov 29 13:34:02 2010
@@ -80,7 +80,7 @@
<menu name="Developers">
<item name="License" href="../license.html"/>
- <item name="Javadoc"
href="../velocity-engine/apidocs/index.html"/>
+ <item name="Javadoc" href="../apidocs/index.html"/>
<item name="Changes" href="../changes-report.html"/>
<item name="Resolved Issues" href="../jira-report.html"/>
<item name="Upgrading" href="../upgrading.html"/>
Modified:
velocity/engine/branches/2.0_Exp/velocity-engine-core/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/velocity-engine-core/src/site/site.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/velocity-engine-core/src/site/site.xml
(original)
+++ velocity/engine/branches/2.0_Exp/velocity-engine-core/src/site/site.xml Mon
Nov 29 13:34:02 2010
@@ -80,7 +80,7 @@
<menu name="Developers">
<item name="License" href="../license.html"/>
- <item name="Javadoc"
href="../velocity-engine/apidocs/index.html"/>
+ <item name="Javadoc" href="../apidocs/index.html"/>
<item name="Changes" href="../changes-report.html"/>
<item name="Resolved Issues" href="../jira-report.html"/>
<item name="Upgrading" href="../upgrading.html"/>
Modified:
velocity/engine/branches/2.0_Exp/velocity-engine-examples/src/site/site.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/velocity-engine-examples/src/site/site.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/velocity-engine-examples/src/site/site.xml
(original)
+++ velocity/engine/branches/2.0_Exp/velocity-engine-examples/src/site/site.xml
Mon Nov 29 13:34:02 2010
@@ -80,7 +80,7 @@
<menu name="Developers">
<item name="License" href="../license.html"/>
- <item name="Javadoc"
href="../velocity-engine/apidocs/index.html"/>
+ <item name="Javadoc" href="../apidocs/index.html"/>
<item name="Changes" href="../changes-report.html"/>
<item name="Resolved Issues" href="../jira-report.html"/>
<item name="Upgrading" href="../upgrading.html"/>
Modified: velocity/engine/branches/2.0_Exp/velocity-engine-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/velocity/engine/branches/2.0_Exp/velocity-engine-servlet/pom.xml?rev=1040108&r1=1040107&r2=1040108&view=diff
==============================================================================
--- velocity/engine/branches/2.0_Exp/velocity-engine-servlet/pom.xml (original)
+++ velocity/engine/branches/2.0_Exp/velocity-engine-servlet/pom.xml Mon Nov 29
13:34:02 2010
@@ -6,7 +6,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-servlet-logger</artifactId>
+ <artifactId>velocity-engine-servlet</artifactId>
<version>2.0.0-SNAPSHOT</version>
<name>Apache Velocity Engine - Servlet support</name>
<description>Support for servlets in Velocity</description>
