diff --git a/src/it/MPMD-165/invoker.properties b/src/it/MPMD-165/invoker.properties index 47f67ac4..37c0dc1b 100644 --- a/src/it/MPMD-165/invoker.properties +++ b/src/it/MPMD-165/invoker.properties @@ -16,4 +16,3 @@ # under the License. invoker.goals = clean pmd:pmd -invoker.maven.version = 3+ diff --git a/src/it/MPMD-182/invoker.properties b/src/it/MPMD-182/invoker.properties index b3faa03c..268725a8 100644 --- a/src/it/MPMD-182/invoker.properties +++ b/src/it/MPMD-182/invoker.properties @@ -16,4 +16,3 @@ # under the License. invoker.goals = clean verify pmd:pmd -invoker.java.version = 1.8+ diff --git a/src/it/MPMD-206-sourceDirectories-js/invoker.properties b/src/it/MPMD-206-sourceDirectories-js/invoker.properties index cc6f1c0a..a5ed592b 100644 --- a/src/it/MPMD-206-sourceDirectories-js/invoker.properties +++ b/src/it/MPMD-206-sourceDirectories-js/invoker.properties @@ -16,6 +16,3 @@ # under the License. invoker.goals = clean verify - -# This test requires at least maven 3.3.9 or later (https://issues.apache.org/jira/browse/MNG-5440) -invoker.maven.version = 3.3.9+ diff --git a/src/it/MPMD-219-pmd-processing-error/invoker.properties b/src/it/MPMD-219-pmd-processing-error/invoker.properties index 64fa3a0e..fa9bee73 100644 --- a/src/it/MPMD-219-pmd-processing-error/invoker.properties +++ b/src/it/MPMD-219-pmd-processing-error/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = clean pmd:check invoker.buildResult = failure -invoker.maven.version = 3+ diff --git a/src/it/MPMD-244-logging/invoker.properties b/src/it/MPMD-244-logging/invoker.properties index d57dce35..5c64f60e 100644 --- a/src/it/MPMD-244-logging/invoker.properties +++ b/src/it/MPMD-244-logging/invoker.properties @@ -16,5 +16,4 @@ # under the License. invoker.goals = clean pmd:check -invoker.maven.version = 3.1.0+ invoker.debug = true diff --git a/src/it/MPMD-244-logging/verify.groovy b/src/it/MPMD-244-logging/verify.groovy index 1494cd4a..105ed2b7 100644 --- a/src/it/MPMD-244-logging/verify.groovy +++ b/src/it/MPMD-244-logging/verify.groovy @@ -31,4 +31,4 @@ assert 1 == buildLog.text.count( "${enabledPath}: ParseException: Parse exceptio // build.log contains the logging from the two PMD executions // only one execution has logging enabled, so we expect only one log output assert 1 == buildLog.text.count( "[DEBUG] Rules loaded from" ) -// with --debug switch or -X the logging is always enabled and can't be disabled , because PMD 7 switched to slf4j +// with --debug switch or -X the logging is always enabled and can't be disabled because PMD 7 switched to slf4j diff --git a/src/it/MPMD-258-multiple-executions/invoker.properties b/src/it/MPMD-258-multiple-executions/invoker.properties index 72ceb8f0..0032d53b 100644 --- a/src/it/MPMD-258-multiple-executions/invoker.properties +++ b/src/it/MPMD-258-multiple-executions/invoker.properties @@ -15,6 +15,5 @@ # specific language governing permissions and limitations # under the License. -invoker.debug = true invoker.goals = clean compile pmd:pmd -invoker.maven.version = 3.1.0+ +invoker.debug = true diff --git a/src/it/MPMD-258-multiple-executions/verify.groovy b/src/it/MPMD-258-multiple-executions/verify.groovy index 1925c675..d87ef19d 100644 --- a/src/it/MPMD-258-multiple-executions/verify.groovy +++ b/src/it/MPMD-258-multiple-executions/verify.groovy @@ -22,8 +22,8 @@ assert buildLog.exists() // we have 2 modules and for each module this should be output once // note: this is only logged in debug mode by net.sourceforge.pmd.cache.FileAnalysisCache -assert 2 == buildLog.text.count( "Analysis cache created" ) +assert 2 == buildLog.text.count( "[DEBUG] Analysis cache created" ) // since we are running clean pmd:pmd, the cache is always created, never updated // note: this is only logged in debug mode by net.sourceforge.pmd.cache.FileAnalysisCache -assert 0 == buildLog.text.count( "Analysis cache updated" ) +assert 0 == buildLog.text.count( "[DEBUG] Analysis cache updated" ) diff --git a/src/it/MPMD-266-typeresolution-aggregated/invoker.properties b/src/it/MPMD-266-typeresolution-aggregated/invoker.properties index 59e9a7b0..6b5c406c 100644 --- a/src/it/MPMD-266-typeresolution-aggregated/invoker.properties +++ b/src/it/MPMD-266-typeresolution-aggregated/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = clean verify invoker.goals.2 = verify site -DskipTests -invoker.maven.version = 3+ diff --git a/src/it/MPMD-268-deprecated-rules/invoker.properties b/src/it/MPMD-268-deprecated-rules/invoker.properties index 5ad0800d..8e1679b1 100644 --- a/src/it/MPMD-268-deprecated-rules/invoker.properties +++ b/src/it/MPMD-268-deprecated-rules/invoker.properties @@ -16,5 +16,4 @@ # under the License. invoker.goals = clean verify -invoker.maven.version = 3.1.0+ invoker.debug = false diff --git a/src/it/MPMD-277-multi-module-check/invoker.properties b/src/it/MPMD-277-multi-module-check/invoker.properties index abe0f0da..78b8ab5b 100644 --- a/src/it/MPMD-277-multi-module-check/invoker.properties +++ b/src/it/MPMD-277-multi-module-check/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = clean package invoker.goals.2 = verify -invoker.maven.version = 3+ diff --git a/src/it/MPMD-283-aggregated-pmd/invoker.properties b/src/it/MPMD-283-aggregated-pmd/invoker.properties index 8faff531..5b546231 100644 --- a/src/it/MPMD-283-aggregated-pmd/invoker.properties +++ b/src/it/MPMD-283-aggregated-pmd/invoker.properties @@ -16,4 +16,3 @@ # under the License. invoker.goals = clean verify site -invoker.maven.version = 3+ diff --git a/src/it/MPMD-317-auxclasspath-provided/invoker.properties b/src/it/MPMD-317-auxclasspath-provided/invoker.properties index 85a3adaf..40c3f6fe 100644 --- a/src/it/MPMD-317-auxclasspath-provided/invoker.properties +++ b/src/it/MPMD-317-auxclasspath-provided/invoker.properties @@ -17,5 +17,4 @@ invoker.goals = clean verify invoker.goals.2 = clean verify -Daggregate=true -invoker.maven.version = 3+ invoker.debug = true diff --git a/src/it/MPMD-317-auxclasspath-provided/verify.groovy b/src/it/MPMD-317-auxclasspath-provided/verify.groovy index 9096b9ba..bb4affae 100644 --- a/src/it/MPMD-317-auxclasspath-provided/verify.groovy +++ b/src/it/MPMD-317-auxclasspath-provided/verify.groovy @@ -30,8 +30,8 @@ for ( String line : buildLog.readLines() ) { // convert windows path names auxclasspathLog = auxclasspathLog.replaceAll('\\\\', '/') -assert 1 == auxclasspathLog.count( 'Using aux classpath:' ) -assert 1 == auxclasspathLog.count( 'Using aggregated aux classpath:' ) +assert 1 == auxclasspathLog.count( '[DEBUG] Using aux classpath:' ) +assert 1 == auxclasspathLog.count( '[DEBUG] Using aggregated aux classpath:' ) assert 2 == auxclasspathLog.count( 'module-a/target/classes' ) diff --git a/src/it/MPMD-318-auxclasspath-includeTests/invoker.properties b/src/it/MPMD-318-auxclasspath-includeTests/invoker.properties index 85a3adaf..40c3f6fe 100644 --- a/src/it/MPMD-318-auxclasspath-includeTests/invoker.properties +++ b/src/it/MPMD-318-auxclasspath-includeTests/invoker.properties @@ -17,5 +17,4 @@ invoker.goals = clean verify invoker.goals.2 = clean verify -Daggregate=true -invoker.maven.version = 3+ invoker.debug = true diff --git a/src/it/MPMD-318-auxclasspath-includeTests/verify.groovy b/src/it/MPMD-318-auxclasspath-includeTests/verify.groovy index 7df6a7c3..87c91307 100644 --- a/src/it/MPMD-318-auxclasspath-includeTests/verify.groovy +++ b/src/it/MPMD-318-auxclasspath-includeTests/verify.groovy @@ -30,8 +30,8 @@ for ( String line : buildLog.readLines() ) { // convert windows path names auxclasspathLog = auxclasspathLog.replaceAll('\\\\', '/') -assert 1 == auxclasspathLog.count( 'Using aux classpath:' ) -assert 1 == auxclasspathLog.count( 'Using aggregated aux classpath:' ) +assert 1 == auxclasspathLog.count( '[DEBUG] Using aux classpath:' ) +assert 1 == auxclasspathLog.count( '[DEBUG] Using aggregated aux classpath:' ) assert 2 == auxclasspathLog.count( 'module-a/target/test-classes' ) assert 2 == auxclasspathLog.count( 'module-a/target/classes' ) diff --git a/src/it/MPMD-323-multi-module-basedir/invoker.properties b/src/it/MPMD-323-multi-module-basedir/invoker.properties index c630e558..a5ed592b 100644 --- a/src/it/MPMD-323-multi-module-basedir/invoker.properties +++ b/src/it/MPMD-323-multi-module-basedir/invoker.properties @@ -16,4 +16,3 @@ # under the License. invoker.goals = clean verify -invoker.maven.version = 3+ diff --git a/src/it/MPMD-323-ruleset-basedir-jgitver/invoker.properties b/src/it/MPMD-323-ruleset-basedir-jgitver/invoker.properties index 957b6435..7f2402bc 100644 --- a/src/it/MPMD-323-ruleset-basedir-jgitver/invoker.properties +++ b/src/it/MPMD-323-ruleset-basedir-jgitver/invoker.properties @@ -16,5 +16,4 @@ # under the License. invoker.goals = clean verify -invoker.maven.version = 3+ invoker.java.version = 11+ diff --git a/src/it/MPMD-89-232-typeresolution/invoker.properties b/src/it/MPMD-89-232-typeresolution/invoker.properties index a82ae1c1..90326243 100644 --- a/src/it/MPMD-89-232-typeresolution/invoker.properties +++ b/src/it/MPMD-89-232-typeresolution/invoker.properties @@ -17,4 +17,3 @@ invoker.goals = clean test-compile invoker.buildResult = failure -invoker.maven.version = 3+ diff --git a/src/it/empty-rulesets/invoker.properties b/src/it/empty-rulesets/invoker.properties index 3673625c..a5ed592b 100644 --- a/src/it/empty-rulesets/invoker.properties +++ b/src/it/empty-rulesets/invoker.properties @@ -15,7 +15,4 @@ # specific language governing permissions and limitations # under the License. -# with Maven 2.x, configuring rulesets parameter to empty value results to default value -invoker.maven.version = 3.0-alpha+ - -invoker.goals = clean verify \ No newline at end of file +invoker.goals = clean verify