diff --git a/src/it/banduplicate-classes-jdk9/verify.groovy b/src/it/banduplicate-classes-jdk9/verify.groovy index 07073bf4..e246234c 100644 --- a/src/it/banduplicate-classes-jdk9/verify.groovy +++ b/src/it/banduplicate-classes-jdk9/verify.groovy @@ -1,13 +1,9 @@ -File file = new File( basedir, "build.log" ); -assert file.exists(); +File file = new File(basedir, "build.log") +assert file.exists() -String text = file.getText("utf-8"); +String text = file.getText("utf-8") -assert text.contains( '[INFO] Adding ignore: module-info' ) -assert text.contains( '[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$' ) -assert text.contains( '[INFO] Adding ignore: META-INF/versions/*/module-info' ) -assert text.contains( '[DEBUG] Ignore: META-INF/versions/*/module-info maps to regex ^META-INF/versions/.*/module-info(\\.class)?$' ) -assert text.contains( '[INFO] BUILD SUCCESS' ) - -return true; +assert text.contains('[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$') +assert text.contains('[DEBUG] Ignore: META-INF/versions/*/module-info maps to regex ^META-INF/versions/.*/module-info(\\.class)?$') +assert text.contains('[INFO] BUILD SUCCESS') diff --git a/src/it/enforce-bytecode-version-module-info-jdk8/verify.groovy b/src/it/enforce-bytecode-version-module-info-jdk8/verify.groovy index 72ed932d..8dbebf77 100644 --- a/src/it/enforce-bytecode-version-module-info-jdk8/verify.groovy +++ b/src/it/enforce-bytecode-version-module-info-jdk8/verify.groovy @@ -1,9 +1,6 @@ -File file = new File( basedir, "build.log" ); -assert file.exists(); +File file = new File(basedir, "build.log") +assert file.exists() -String text = file.getText("utf-8"); +String text = file.getText("utf-8") -assert text.contains( '[INFO] Adding ignore: module-info' ) -assert text.contains( '[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$' ) - -return true; +assert text.contains('[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$') diff --git a/src/it/enforce-bytecode-version-multirelease-2/verify.groovy b/src/it/enforce-bytecode-version-multirelease-2/verify.groovy index 7048eeea..d875ef79 100644 --- a/src/it/enforce-bytecode-version-multirelease-2/verify.groovy +++ b/src/it/enforce-bytecode-version-multirelease-2/verify.groovy @@ -1,9 +1,7 @@ -File file = new File( basedir, "build.log" ); -assert file.exists(); +File file = new File(basedir, "build.log") +assert file.exists() -String text = file.getText("utf-8"); +String text = file.getText("utf-8") -assert text.contains( '[INFO] Adding ignore: module-info' ) -assert !text.contains( '[WARNING] Invalid bytecodeVersion for com.fasterxml.jackson.core:jackson-core:jar:2.13.0:runtime' ) - -return true; +assert text.contains('[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$') +assert !text.contains('[WARNING] Invalid bytecodeVersion for com.fasterxml.jackson.core:jackson-core:jar:2.13.0:runtime') diff --git a/src/it/enforce-bytecode-version-multirelease/verify.groovy b/src/it/enforce-bytecode-version-multirelease/verify.groovy index 822561ac..ba0ff974 100644 --- a/src/it/enforce-bytecode-version-multirelease/verify.groovy +++ b/src/it/enforce-bytecode-version-multirelease/verify.groovy @@ -1,9 +1,7 @@ -File file = new File( basedir, "build.log" ); -assert file.exists(); +File file = new File(basedir, "build.log") +assert file.exists() -String text = file.getText("utf-8"); +String text = file.getText("utf-8") -assert text.contains( '[INFO] Adding ignore: module-info' ) -assert text.contains( '[DEBUG] log4j-api-2.17.2.jar => ' ) - -return true; +assert text.contains('[DEBUG] Ignore: module-info maps to regex ^module-info(\\.class)?$') +assert text.contains('[DEBUG] log4j-api-2.17.2.jar => ') diff --git a/src/main/java/org/codehaus/mojo/extraenforcer/dependencies/AbstractResolveDependencies.java b/src/main/java/org/codehaus/mojo/extraenforcer/dependencies/AbstractResolveDependencies.java index 5cf2bbd6..1bbbfdc1 100644 --- a/src/main/java/org/codehaus/mojo/extraenforcer/dependencies/AbstractResolveDependencies.java +++ b/src/main/java/org/codehaus/mojo/extraenforcer/dependencies/AbstractResolveDependencies.java @@ -253,16 +253,13 @@ protected class IgnorableDependency { public List ignores = new ArrayList<>(); - public IgnorableDependency applyIgnoreClasses(String[] ignores, boolean indent) { + public void applyIgnoreClasses(String[] ignores, boolean indent) { String prefix = indent ? " " : ""; for (String ignore : ignores) { - getLog().info(prefix + "Adding ignore: " + ignore); - ignore = ignore.replace('.', '/'); - String pattern = asRegex(ignore); - getLog().debug(prefix + "Ignore: " + ignore + " maps to regex " + pattern); + String pattern = asRegex(ignore.replace('.', '/')); + getLog().debug(() -> prefix + "Ignore: " + ignore + " maps to regex " + pattern); this.ignores.add(Pattern.compile(pattern)); } - return this; } public boolean matchesArtifact(Artifact dup) {