You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/02/01 18:13:04 UTC
svn commit: r1563445 - in /maven/plugins/trunk/maven-pmd-plugin: ./
src/main/java/org/apache/maven/plugin/pmd/
src/test/java/org/apache/maven/plugin/pmd/
src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/
Author: michaelo
Date: Sat Feb 1 17:13:04 2014
New Revision: 1563445
URL: http://svn.apache.org/r1563445
Log:
[MPMD-179] Plugin generates reports incompatible with the 'maven-jxr-plugin' version 2.4
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/App.html
maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/AppSample.html
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sat Feb 1 17:13:04 2014
@@ -329,6 +329,11 @@ under the License.
<version>${project.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>l10n-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReportGenerator.java Sat Feb 1 17:13:04 2014
@@ -132,7 +132,7 @@ public class CpdReportGenerator
if ( xrefLocation != null )
{
sink.link(
- xrefLocation + "/" + filename.replaceAll( "\\.java$", ".html" ).replace( '\\', '/' ) + "#" + line );
+ xrefLocation + "/" + filename.replaceAll( "\\.java$", ".html" ).replace( '\\', '/' ) + "#L" + line );
}
sink.text( String.valueOf( line ) );
if ( xrefLocation != null )
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportGenerator.java Sat Feb 1 17:13:04 2014
@@ -147,7 +147,7 @@ public class PmdReportGenerator {
int endLine = ruleViolation.getEndLine();
if ( endLine != beginLine )
{
- sink.text( " - " );
+ sink.text( "–" );
outputLineLink( endLine, fileInfo );
}
@@ -225,7 +225,7 @@ public class PmdReportGenerator {
if ( xrefLocation != null )
{
- sink.link( xrefLocation + "/" + currentFilename.replaceAll( "\\.java$", ".html" ) + "#" + line );
+ sink.link( xrefLocation + "/" + currentFilename.replaceAll( "\\.java$", ".html" ) + "#L" + line );
}
sink.text( String.valueOf( line ) );
if ( xrefLocation != null )
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java Sat Feb 1 17:13:04 2014
@@ -80,9 +80,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue(str.contains("/xref/def/configuration/App.html#31"));
+ assertTrue(str.contains("/xref/def/configuration/App.html#L31"));
- assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#L45"));
}
@@ -156,9 +156,9 @@ public class PmdReportTest
String str =
readFile( new File( getBasedir(), "target/test/unit/default-configuration/target/site/pmd.html" ) );
- assertTrue(str.contains("/xref/def/configuration/App.html#31"));
+ assertTrue(str.contains("/xref/def/configuration/App.html#L31"));
- assertTrue(str.contains("/xref/def/configuration/AppSample.html#45"));
+ assertTrue(str.contains("/xref/def/configuration/AppSample.html#L45"));
}
/**
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/App.html
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/App.html?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/App.html (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/App.html Sat Feb 1 17:13:04 2014
@@ -26,60 +26,60 @@ under the License.
<body>
<div id="overview"><a href="../../../apidocs/def/configuration/App.html">View Javadoc</a></div><pre>
-<a name="1" href="#1">1</a> <strong>package</strong> def.configuration;
-<a name="2" href="#2">2</a>
-<a name="3" href="#3">3</a> <em>/**</em>
-<a name="4" href="#4">4</a> <em> * This is a sample class used for testing</em>
-<a name="5" href="#5">5</a> <em> *</em>
-<a name="6" href="#6">6</a> <em> * @author Maria Odea Ching</em>
-<a name="7" href="#7">7</a> <em> */</em>
-<a name="8" href="#8">8</a> <strong>public</strong> <strong>class</strong> <a href="../../def/configuration/App.html">App</a>
-<a name="9" href="#9">9</a> {
-<a name="10" href="#10">10</a> <strong>protected</strong> String unusedVar1;
-<a name="11" href="#11">11</a>
-<a name="12" href="#12">12</a> <strong>private</strong> <strong>int</strong> unusedVar2;
-<a name="13" href="#13">13</a>
-<a name="14" href="#14">14</a> String unusedvar3;
-<a name="15" href="#15">15</a>
-<a name="16" href="#16">16</a> <em>/**</em>
-<a name="17" href="#17">17</a> <em> * The main method</em>
-<a name="18" href="#18">18</a> <em> *</em>
-<a name="19" href="#19">19</a> <em> * @param args an array of strings that contains the arguments</em>
-<a name="20" href="#20">20</a> <em> */</em>
-<a name="21" href="#21">21</a> <strong>public</strong> <strong>static</strong> <strong>void</strong> main( String[] args )
-<a name="22" href="#22">22</a> {
-<a name="23" href="#23">23</a> System.out.println( <span class="string">"Sample Application."</span> );
-<a name="24" href="#24">24</a> }
-<a name="25" href="#25">25</a>
-<a name="26" href="#26">26</a> <em>/**</em>
-<a name="27" href="#27">27</a> <em> * Sample method</em>
-<a name="28" href="#28">28</a> <em> *</em>
-<a name="29" href="#29">29</a> <em> * @param str the value to be displayed</em>
-<a name="30" href="#30">30</a> <em> */</em>
-<a name="31" href="#31">31</a> <strong>protected</strong> <strong>void</strong> sampleMethod( String str )
-<a name="32" href="#32">32</a> {
-<a name="33" href="#33">33</a> <strong>try</strong>
-<a name="34" href="#34">34</a> {
-<a name="35" href="#35">35</a> System.out.println( str );
-<a name="36" href="#36">36</a> }
-<a name="37" href="#37">37</a> <strong>catch</strong> ( Exception e )
-<a name="38" href="#38">38</a> {
-<a name="39" href="#39">39</a>
-<a name="40" href="#40">40</a> }
-<a name="41" href="#41">41</a> }
-<a name="42" href="#42">42</a>
-<a name="43" href="#43">43</a> <em>/**</em>
-<a name="44" href="#44">44</a> <em> * Test method</em>
-<a name="45" href="#45">45</a> <em> *</em>
-<a name="46" href="#46">46</a> <em> * @param unusedParam1</em>
-<a name="47" href="#47">47</a> <em> * @param unusedParam2</em>
-<a name="48" href="#48">48</a> <em> */</em>
-<a name="49" href="#49">49</a> <strong>public</strong> <strong>void</strong> testMethod( String unusedParam1, String unusedParam2)
-<a name="50" href="#50">50</a> {
-<a name="51" href="#51">51</a> System.out.println( <span class="string">"Test method"</span> );
-<a name="52" href="#52">52</a> }
-<a name="53" href="#53">53</a>
-<a name="54" href="#54">54</a> }
+<a name="L1" href="#L1">1</a> <strong>package</strong> def.configuration;
+<a name="L2" href="#L2">2</a>
+<a name="L3" href="#L3">3</a> <em>/**</em>
+<a name="L4" href="#L4">4</a> <em> * This is a sample class used for testing</em>
+<a name="L5" href="#L5">5</a> <em> *</em>
+<a name="L6" href="#L6">6</a> <em> * @author Maria Odea Ching</em>
+<a name="L7" href="#L7">7</a> <em> */</em>
+<a name="L8" href="#L8">8</a> <strong>public</strong> <strong>class</strong> <a href="../../def/configuration/App.html">App</a>
+<a name="L9" href="#L9">9</a> {
+<a name="L10" href="#L10">10</a> <strong>protected</strong> String unusedVar1;
+<a name="L11" href="#L11">11</a>
+<a name="L12" href="#L12">12</a> <strong>private</strong> <strong>int</strong> unusedVar2;
+<a name="L13" href="#L13">13</a>
+<a name="L14" href="#L14">14</a> String unusedvar3;
+<a name="L15" href="#L15">15</a>
+<a name="L16" href="#L16">16</a> <em>/**</em>
+<a name="L17" href="#L17">17</a> <em> * The main method</em>
+<a name="L18" href="#L18">18</a> <em> *</em>
+<a name="L19" href="#L19">19</a> <em> * @param args an array of strings that contains the arguments</em>
+<a name="L20" href="#L20">20</a> <em> */</em>
+<a name="L21" href="#L21">21</a> <strong>public</strong> <strong>static</strong> <strong>void</strong> main( String[] args )
+<a name="L22" href="#L22">22</a> {
+<a name="L23" href="#L23">23</a> System.out.println( <span class="string">"Sample Application."</span> );
+<a name="L24" href="#L24">24</a> }
+<a name="L25" href="#L25">25</a>
+<a name="L26" href="#L26">26</a> <em>/**</em>
+<a name="L27" href="#L27">27</a> <em> * Sample method</em>
+<a name="L28" href="#L28">28</a> <em> *</em>
+<a name="L29" href="#L29">29</a> <em> * @param str the value to be displayed</em>
+<a name="L30" href="#L30">30</a> <em> */</em>
+<a name="L31" href="#L31">31</a> <strong>protected</strong> <strong>void</strong> sampleMethod( String str )
+<a name="L32" href="#L32">32</a> {
+<a name="L33" href="#L33">33</a> <strong>try</strong>
+<a name="L34" href="#L34">34</a> {
+<a name="L35" href="#L35">35</a> System.out.println( str );
+<a name="L36" href="#L36">36</a> }
+<a name="L37" href="#L37">37</a> <strong>catch</strong> ( Exception e )
+<a name="L38" href="#L38">38</a> {
+<a name="L39" href="#L39">39</a>
+<a name="L40" href="#L40">40</a> }
+<a name="L41" href="#L41">41</a> }
+<a name="L42" href="#L42">42</a>
+<a name="L43" href="#L43">43</a> <em>/**</em>
+<a name="L44" href="#L44">44</a> <em> * Test method</em>
+<a name="L45" href="#L45">45</a> <em> *</em>
+<a name="L46" href="#L46">46</a> <em> * @param unusedParam1</em>
+<a name="L47" href="#L47">47</a> <em> * @param unusedParam2</em>
+<a name="L48" href="#L48">48</a> <em> */</em>
+<a name="L49" href="#L49">49</a> <strong>public</strong> <strong>void</strong> testMethod( String unusedParam1, String unusedParam2)
+<a name="L50" href="#L50">50</a> {
+<a name="L51" href="#L51">51</a> System.out.println( <span class="string">"Test method"</span> );
+<a name="L52" href="#L52">52</a> }
+<a name="L53" href="#L53">53</a>
+<a name="L54" href="#L54">54</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>
Modified: maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/AppSample.html
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/AppSample.html?rev=1563445&r1=1563444&r2=1563445&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/AppSample.html (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/test/resources/unit/default-configuration/jxr-files/xref/def/configuration/AppSample.html Sat Feb 1 17:13:04 2014
@@ -26,38 +26,38 @@ under the License.
<body>
<div id="overview"><a href="../../../apidocs/def/configuration/AppSample.html">View Javadoc</a></div><pre>
-<a name="1" href="#1">1</a> <strong>package</strong> def.configuration;
-<a name="2" href="#2">2</a>
-<a name="3" href="#3">3</a> <em>/**</em>
-<a name="4" href="#4">4</a> <em> * @author Maria Odea Ching</em>
-<a name="5" href="#5">5</a> <em> */</em>
-<a name="6" href="#6">6</a> <strong>public</strong> <strong>class</strong> <a href="../../def/configuration/AppSample.html">AppSample</a>
-<a name="7" href="#7">7</a> {
-<a name="8" href="#8">8</a> <strong>private</strong> String unusedVar = <span class="string">"UNUSED"</span>;
-<a name="9" href="#9">9</a>
-<a name="10" href="#10">10</a> <em>/**</em>
-<a name="11" href="#11">11</a> <em> * The main method</em>
-<a name="12" href="#12">12</a> <em> *</em>
-<a name="13" href="#13">13</a> <em> * @param args an array of strings that contains the arguments</em>
-<a name="14" href="#14">14</a> <em> */</em>
-<a name="15" href="#15">15</a> <strong>public</strong> <strong>static</strong> <strong>void</strong> main( String[] args )
-<a name="16" href="#16">16</a> {
-<a name="17" href="#17">17</a> System.out.println( <span class="string">"Another Sample Application"</span> );
-<a name="18" href="#18">18</a> }
-<a name="19" href="#19">19</a>
-<a name="20" href="#20">20</a> <em>/**</em>
-<a name="21" href="#21">21</a> <em> * Unused method</em>
-<a name="22" href="#22">22</a> <em> *</em>
-<a name="23" href="#23">23</a> <em> * @param unusedParam</em>
-<a name="24" href="#24">24</a> <em> * @return a blank String</em>
-<a name="25" href="#25">25</a> <em> */</em>
-<a name="26" href="#26">26</a> <strong>private</strong> String unusedMethod( String unusedParam )
-<a name="27" href="#27">27</a> {
-<a name="28" href="#28">28</a> System.out.println( <span class="string">"This is just a test."</span> );
-<a name="29" href="#29">29</a>
-<a name="30" href="#30">30</a> <strong>return</strong> <span class="string">""</span>;
-<a name="31" href="#31">31</a> }
-<a name="32" href="#32">32</a> }
+<a name="L1" href="#L1">1</a> <strong>package</strong> def.configuration;
+<a name="L2" href="#L2">2</a>
+<a name="L3" href="#L3">3</a> <em>/**</em>
+<a name="L4" href="#L4">4</a> <em> * @author Maria Odea Ching</em>
+<a name="L5" href="#L5">5</a> <em> */</em>
+<a name="L6" href="#L6">6</a> <strong>public</strong> <strong>class</strong> <a href="../../def/configuration/AppSample.html">AppSample</a>
+<a name="L7" href="#L7">7</a> {
+<a name="L8" href="#L8">8</a> <strong>private</strong> String unusedVar = <span class="string">"UNUSED"</span>;
+<a name="L9" href="#L9">9</a>
+<a name="L10" href="#L10">10</a> <em>/**</em>
+<a name="L11" href="#L11">11</a> <em> * The main method</em>
+<a name="L12" href="#L12">12</a> <em> *</em>
+<a name="L13" href="#L13">13</a> <em> * @param args an array of strings that contains the arguments</em>
+<a name="L14" href="#L14">14</a> <em> */</em>
+<a name="L15" href="#L15">15</a> <strong>public</strong> <strong>static</strong> <strong>void</strong> main( String[] args )
+<a name="L16" href="#L16">16</a> {
+<a name="L17" href="#L17">17</a> System.out.println( <span class="string">"Another Sample Application"</span> );
+<a name="L18" href="#L18">18</a> }
+<a name="L19" href="#L19">19</a>
+<a name="L20" href="#L20">20</a> <em>/**</em>
+<a name="L21" href="#L21">21</a> <em> * Unused method</em>
+<a name="L22" href="#L22">22</a> <em> *</em>
+<a name="L23" href="#L23">23</a> <em> * @param unusedParam</em>
+<a name="L24" href="#L24">24</a> <em> * @return a blank String</em>
+<a name="L25" href="#L25">25</a> <em> */</em>
+<a name="L26" href="#L26">26</a> <strong>private</strong> String unusedMethod( String unusedParam )
+<a name="L27" href="#L27">27</a> {
+<a name="L28" href="#L28">28</a> System.out.println( <span class="string">"This is just a test."</span> );
+<a name="L29" href="#L29">29</a>
+<a name="L30" href="#L30">30</a> <strong>return</strong> <span class="string">""</span>;
+<a name="L31" href="#L31">31</a> }
+<a name="L32" href="#L32">32</a> }
</pre>
<hr/><div id="footer">This page was automatically generated by <a href="http://maven.apache.org/">Maven</a></div></body>
</html>