Remove outdated invoker conditions

src/it/MPMD-165/invoker.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 invoker.goals = clean pmd:pmd
-invoker.maven.version = 3+

src/it/MPMD-182/invoker.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 invoker.goals = clean verify pmd:pmd
-invoker.java.version = 1.8+

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+

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+

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

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

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

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" )

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+

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

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+

src/it/MPMD-283-aggregated-pmd/invoker.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 invoker.goals = clean verify site
-invoker.maven.version = 3+

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

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' )
 

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

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' )

src/it/MPMD-323-multi-module-basedir/invoker.properties

@@ -16,4 +16,3 @@
 # under the License.
 
 invoker.goals = clean verify
-invoker.maven.version = 3+

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+

src/it/MPMD-89-232-typeresolution/invoker.properties

@@ -17,4 +17,3 @@
 
 invoker.goals = clean test-compile
 invoker.buildResult = failure
-invoker.maven.version = 3+

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
+invoker.goals = clean verify