Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MENFORCER-454] Log warning only if the '-Drules' is actually used #212

Merged
merged 1 commit into from
Dec 29, 2022
Merged

[MENFORCER-454] Log warning only if the '-Drules' is actually used #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion maven-enforcer-plugin/src/main/java/org/apache/maven/plugins/enforcer/EnforceMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ public void setRulesToExecute(List<String> rulesToExecute) throws MojoExecutionE
@Parameter(required = false, property = "rules")
@Deprecated
public void setCommandLineRules(List<String> rulesToExecute) throws MojoExecutionException {
getLog().warn("Detected the usage of property '-Drules' which is deprecated. Use '-Denforcer.rules' instead.");
if (rulesToExecute != null && !rulesToExecute.isEmpty()) {
getLog().warn(
"Detected the usage of property '-Drules' which is deprecated. Use '-Denforcer.rules' instead.");
}
setRulesToExecute(rulesToExecute);
}

Expand Down
11 changes: 11 additions & 0 deletions maven-enforcer-plugin/src/test/java/org/apache/maven/plugins/enforcer/TestEnforceMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,17 @@ void testShouldPrintWarnWhenUsingDeprecatedRulesProperty() throws MojoExecutionE
.warn("Detected the usage of property '-Drules' which is deprecated. Use '-Denforcer.rules' instead.");
}

@Test
void testShouldNotPrintWarnWhenDeprecatedRulesPropertyIsEmpty() throws MojoExecutionException {
setupBasics(false);

Log logSpy = setupLogSpy();

mojo.setCommandLineRules(Collections.emptyList());

Mockito.verifyNoInteractions(logSpy);
}

private void setupBasics(boolean fail) {
mojo.setFail(fail);
mojo.setSession(EnforcerTestUtils.getMavenSession());
Expand Down