Author: felixk
Date: Wed Oct 19 08:07:27 2011
New Revision: 1186019
URL: http://svn.apache.org/viewvc?rev=1186019&view=rev
Log:
- Use inheritance for distributionManagement.site.url doesn't works, because
the artifactId will be added to the url when inherited (see
http://maven.apache.org/plugins/maven-site-plugin/usage.html). So each module
has to define it itself.
- pmd-plugin doesn't takes configuration from pluginManagement section when
creating reports.
Modified:
james/project/trunk/pom.xml
Modified: james/project/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/pom.xml?rev=1186019&r1=1186018&r2=1186019&view=diff
==============================================================================
--- james/project/trunk/pom.xml (original)
+++ james/project/trunk/pom.xml Wed Oct 19 08:07:27 2011
@@ -305,10 +305,10 @@
<site>
<id>james-website</id>
<!--
- Use properties to build deploy url to avoid accidently
overriding the common module's
+ Add postfix to build deploy url to avoid accidently overriding
the common module's
website when using "-Psite-reports" by chance
-->
-
<url>scpexe://people.apache.org/www/james.apache.org/${deploySiteDirectory}/${deployTechnicalSiteDirectory}</url>
+
<url>scpexe://people.apache.org/www/james.apache.org/${deployTechnicalSiteDirectory}</url>
</site>
</distributionManagement>
@@ -319,12 +319,6 @@
<maven-site-plugin.siteDirectory>${basedir}/src/site</maven-site-plugin.siteDirectory>
<maven-site-plugin.generateReports>false</maven-site-plugin.generateReports>
<!--
- NOTE:
- Each project must override this property with their own value.
- This property contains the directory where to deploy when running
"site" without profile
- -->
- <deploySiteDirectory></deploySiteDirectory>
- <!--
This property contains the directory where to deploy when running
using "-Psite-reports" profile
to avoid accidently overriding the common modules website. Empty
by default.
-->
@@ -587,6 +581,19 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ <targetJdk>${target.jdk}</targetJdk>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+
<ruleset>/rulesets/unusedcode.xml</ruleset>
+
<ruleset>/rulesets/imports.xml</ruleset>
+ </rulesets>
+ <format>xml</format>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -804,7 +811,7 @@
This property contains the directory where to deploy when
running using "-Psite-reports" profile
to avoid accidently overriding the common modules website
-->
-
<deployTechnicalSiteDirectory>technical-reports</deployTechnicalSiteDirectory>
+
<deployTechnicalSiteDirectory>technical-reports/</deployTechnicalSiteDirectory>
</properties>
</profile>
</profiles>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
