[MPMD-321] Display PMD version that is being used also for pmd:pmd and

pmd:cpd

src/main/java/org/apache/maven/plugins/pmd/AbstractPmdViolationCheckMojo.java

@@ -124,8 +124,6 @@ protected void executeCheck( final String filename, final String tagName, final
                                  final int failurePriority )
         throws MojoFailureException, MojoExecutionException
     {
-        getLog().info( "PMD version: " + AbstractPmdReport.getPmdVersion() );
-
         if ( aggregate && !project.isExecutionRoot() )
         {
             return;
@@ -141,6 +139,8 @@ protected void executeCheck( final String filename, final String tagName, final
 
         if ( outputFile.exists() )
         {
+            getLog().info( "PMD version: " + AbstractPmdReport.getPmdVersion() );
+
             try
             {
                 final ViolationDetails<D> violations = getViolations( outputFile, failurePriority );

src/main/java/org/apache/maven/plugins/pmd/CpdReport.java

@@ -249,6 +249,7 @@ private void executeCpd()
                 request.setJavaExecutable( javaExecutable );
             }
 
+            getLog().info( "PMD version: " + AbstractPmdReport.getPmdVersion() );
             cpdResult = CpdExecutor.execute( request );
         }
         catch ( UnsupportedEncodingException e )

src/main/java/org/apache/maven/plugins/pmd/PmdReport.java

@@ -398,6 +398,7 @@ private void executePmd()
             request.setJavaExecutable( javaExecutable );
         }
 
+        getLog().info( "PMD version: " + AbstractPmdReport.getPmdVersion() );
         pmdResult = PmdExecutor.execute( request );
     }
 

src/main/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojo.java

@@ -70,7 +70,7 @@ public PmdViolationCheckMojo()
      * Only values from 1 to 5 are valid.
      */
     @Parameter( property = "pmd.failurePriority", defaultValue = "5", required = true )
-    private int failurePriority;
+    private int failurePriority = 5;
 
     /**
      * Skip the PMD checks. Most useful on the command line via "-Dpmd.skip=true".

src/test/java/org/apache/maven/plugins/pmd/CapturingPrintStream.java

@@ -27,7 +27,7 @@
  * Captures log output from simple slf4j for asserting in unit tests.
  */
 class CapturingPrintStream extends PrintStream {
-    private final boolean quiet;
+    private boolean quiet;
     private StringBuilder buffer = new StringBuilder();
 
     private CapturingPrintStream( boolean quiet ) {
@@ -51,6 +51,7 @@ public static void init( boolean quiet )
         if ( capture != null )
         {
             capture.buffer.setLength( 0 );
+            capture.quiet = quiet;
         }
         else
         {

src/test/java/org/apache/maven/plugins/pmd/CpdReportTest.java

@@ -79,6 +79,10 @@ public void testDefaultConfiguration()
         assertTrue( lowerCaseContains( str, "App.java" ) );
         assertTrue( lowerCaseContains( str, "public String dup( String str )" ) );
         assertTrue( lowerCaseContains( str, "tmp = tmp + str.substring( i, i + 1);" ) );
+
+        // the version should be logged
+        String output = CapturingPrintStream.getOutput();
+        assertTrue ( output.contains( "PMD version: " + AbstractPmdReport.getPmdVersion() ) );
     }
 
     /**

src/test/java/org/apache/maven/plugins/pmd/CpdViolationCheckMojoTest.java

@@ -36,6 +36,7 @@ protected void setUp()
         throws Exception
     {
         super.setUp();
+        CapturingPrintStream.init( true );
     }
 
     public void testDefaultConfiguration()
@@ -53,7 +54,11 @@ public void testDefaultConfiguration()
         }
         catch ( final Exception e )
         {
-            assertTrue( true );
+            // the version should be logged
+            String output = CapturingPrintStream.getOutput();
+            assertTrue ( output.contains( "PMD version: " + AbstractPmdReport.getPmdVersion() ) );
+
+            assertTrue( e.getMessage().startsWith( "You have 1 CPD duplication." ) );
         }
     }
 

src/test/java/org/apache/maven/plugins/pmd/PmdReportTest.java

@@ -111,6 +111,9 @@ public void testDefaultConfiguration()
         assertFalse( output.contains( "deprecated Rule name" ) );
         assertFalse( output.contains( "Discontinue using Rule name" ) );
         assertFalse( output.contains( "is referenced multiple times" ) );
+
+        // the version should be logged
+        assertTrue ( output.contains( "PMD version: " + AbstractPmdReport.getPmdVersion() ) );
     }
 
     public void testDefaultConfigurationNotRenderRuleViolationPriority()

src/test/java/org/apache/maven/plugins/pmd/PmdViolationCheckMojoTest.java

@@ -39,11 +39,21 @@ protected void setUp()
         throws Exception
     {
         super.setUp();
+        CapturingPrintStream.init( true );
     }
 
     public void testDefaultConfiguration()
         throws Exception
     {
+        File testPomPmd =
+            new File( getBasedir(),
+                      "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" );
+        final PmdReport pmdMojo = (PmdReport) lookupMojo( "pmd", testPomPmd );
+        pmdMojo.execute();
+
+        // clear the output from previous pmd:pmd execution
+        CapturingPrintStream.init( true );
+
         try
         {
             final File testPom =
@@ -56,7 +66,11 @@ public void testDefaultConfiguration()
         }
         catch ( final Exception e )
         {
-            assertTrue( true );
+            // the version should be logged
+            String output = CapturingPrintStream.getOutput();
+            assertTrue ( output.contains( "PMD version: " + AbstractPmdReport.getPmdVersion() ) );
+
+            assertTrue( e.getMessage().startsWith( "You have 8 PMD violations." ) );
         }
     }
 

src/test/resources/unit/default-configuration/pmd-check-default-configuration-plugin-config.xml

@@ -32,12 +32,12 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>          
-          <sourceDirectory>${basedir}/src/test/resources/unit/default-configuration</sourceDirectory>
+        <configuration>
+          <project implementation="org.apache.maven.plugins.pmd.stubs.DefaultConfigurationMavenProjectStub"/>
           <targetDirectory>${basedir}/target/test/unit/default-configuration/target</targetDirectory>
           <failOnViolation>true</failOnViolation>
-          <language>java</language>
-          <sourceEncoding>UTF-8</sourceEncoding>
+          <printFailingErrors>true</printFailingErrors>
+<!--           <failurePriority>5</failurePriority> -->
         </configuration>
       </plugin>
     </plugins>