From 68068bf8264f6e51220c202585644197a42faa3a Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 17 Oct 2024 07:53:34 -0400 Subject: [PATCH 1/5] Fix assertion --- .../maven/plugins/dependency/resolvers/TestResolveMojo.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java index 9c1d6a56f..47fbbe167 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java @@ -23,14 +23,15 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; -import org.apache.maven.plugin.testing.SilentLog; import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase; import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub; +import org.apache.maven.plugins.dependency.utils.DependencySilentLog; import org.apache.maven.plugins.dependency.utils.DependencyStatusSets; import org.apache.maven.project.MavenProject; public class TestResolveMojo extends AbstractDependencyMojoTestCase { + @Override protected void setUp() throws Exception { // required for mojo lookups to work super.setUp("markers", false); @@ -81,6 +82,6 @@ public void testSilent() throws Exception { ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo("resolve", testPom); mojo.setSilent(false); - assertFalse(mojo.getLog() instanceof SilentLog); + assertFalse(mojo.getLog() instanceof DependencySilentLog); } // TODO: Test skipping artifacts. } From d01dcf86f11657ace6d6c5db5da53b9343be5081 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 17 Oct 2024 08:14:40 -0400 Subject: [PATCH 2/5] Repair silnt logging --- .../dependency/AbstractDependencyMojo.java | 3 +++ .../plugins/dependency/TestCollectMojo.java | 17 ++++++++++++----- .../dependency/resolvers/TestResolveMojo.java | 9 +++++++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java index 114824996..2981f717c 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java @@ -25,6 +25,7 @@ import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; +import org.apache.maven.plugin.logging.SystemStreamLog; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.dependency.utils.DependencySilentLog; @@ -182,6 +183,8 @@ public void setSilent(boolean silent) { this.silent = silent; if (silent) { setLog(new DependencySilentLog()); + } else if (getLog() instanceof DependencySilentLog) { + setLog(new SystemStreamLog()); } } } diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java b/src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java index 070cbb69c..265bb17a2 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/TestCollectMojo.java @@ -23,14 +23,16 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.execution.MavenSession; -import org.apache.maven.plugin.testing.SilentLog; import org.apache.maven.plugins.dependency.resolvers.CollectDependenciesMojo; +import org.apache.maven.plugins.dependency.resolvers.ResolveDependenciesMojo; import org.apache.maven.plugins.dependency.testUtils.stubs.DependencyProjectStub; +import org.apache.maven.plugins.dependency.utils.DependencySilentLog; import org.apache.maven.plugins.dependency.utils.DependencyStatusSets; import org.apache.maven.project.MavenProject; public class TestCollectMojo extends AbstractDependencyMojoTestCase { + @Override protected void setUp() throws Exception { // required for mojo lookups to work super.setUp("markers", false); @@ -98,10 +100,15 @@ public void testCollectTestEnvironment_excludeTransitive() throws Exception { } public void testSilent() throws Exception { - File testPom = new File(getBasedir(), "target/test-classes/unit/collect-test/plugin-config.xml"); - CollectDependenciesMojo mojo = (CollectDependenciesMojo) lookupMojo("collect", testPom); - mojo.setSilent(false); + File testPom = new File(getBasedir(), "target/test-classes/unit/resolve-test/plugin-config.xml"); + ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo("resolve", testPom); + + assertFalse(mojo.getLog() instanceof DependencySilentLog); - assertFalse(mojo.getLog() instanceof SilentLog); + mojo.setSilent(true); + assertTrue(mojo.getLog() instanceof DependencySilentLog); + + mojo.setSilent(false); + assertFalse(mojo.getLog() instanceof DependencySilentLog); } // TODO: Test skipping artifacts. } diff --git a/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java b/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java index 47fbbe167..720d13f7b 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java +++ b/src/test/java/org/apache/maven/plugins/dependency/resolvers/TestResolveMojo.java @@ -48,7 +48,7 @@ protected void setUp() throws Exception { * * @throws Exception in case of errors. */ - public void testresolveTestEnvironment() throws Exception { + public void testResolveTestEnvironment() throws Exception { File testPom = new File(getBasedir(), "target/test-classes/unit/resolve-test/plugin-config.xml"); ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo("resolve", testPom); @@ -80,8 +80,13 @@ public void testresolveTestEnvironment() throws Exception { public void testSilent() throws Exception { File testPom = new File(getBasedir(), "target/test-classes/unit/resolve-test/plugin-config.xml"); ResolveDependenciesMojo mojo = (ResolveDependenciesMojo) lookupMojo("resolve", testPom); - mojo.setSilent(false); assertFalse(mojo.getLog() instanceof DependencySilentLog); + + mojo.setSilent(true); + assertTrue(mojo.getLog() instanceof DependencySilentLog); + + mojo.setSilent(false); + assertFalse(mojo.getLog() instanceof DependencySilentLog); } // TODO: Test skipping artifacts. } From 8cf68a3159fb1a4b1ac6262ec6914759df5affc6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 17 Oct 2024 15:59:42 -0400 Subject: [PATCH 3/5] More asserts --- .../maven/plugins/dependency/utils/TestSilentLog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/TestSilentLog.java b/src/test/java/org/apache/maven/plugins/dependency/utils/TestSilentLog.java index b6cd7e435..025e42338 100644 --- a/src/test/java/org/apache/maven/plugins/dependency/utils/TestSilentLog.java +++ b/src/test/java/org/apache/maven/plugins/dependency/utils/TestSilentLog.java @@ -19,6 +19,7 @@ package org.apache.maven.plugins.dependency.utils; import org.apache.maven.plugin.logging.Log; +import org.junit.Assert; import org.junit.Test; public class TestSilentLog { @@ -40,9 +41,9 @@ public void testLog() { log.error(text); log.error(text, e); log.error(e); - log.isDebugEnabled(); - log.isErrorEnabled(); - log.isWarnEnabled(); - log.isInfoEnabled(); + Assert.assertFalse(log.isDebugEnabled()); + Assert.assertFalse(log.isErrorEnabled()); + Assert.assertFalse(log.isWarnEnabled()); + Assert.assertFalse(log.isInfoEnabled()); } } From ec0eefab00c950dabbe8a3c0ab3cd63494e26af6 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 22 Oct 2024 15:47:47 -0400 Subject: [PATCH 4/5] deprecate --- .../maven/plugins/dependency/AbstractDependencyMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java index 2981f717c..edc789117 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java @@ -87,8 +87,10 @@ public abstract class AbstractDependencyMojo extends AbstractMojo { /** * If the plugin should be silent. * + * @deprecated to be removed in 4.0; use -Q command line option instead * @since 2.0 */ + @Deprecated @Parameter(property = "silent", defaultValue = "false") private boolean silent; @@ -171,14 +173,18 @@ public void setSkip(boolean skip) { /** * @return {@link #silent} + * @deprecated to be removed in 4.0 */ + @Deprecated protected final boolean isSilent() { return silent; } /** * @param silent {@link #silent} + * @deprecated to be removed in 4.0; no API replacement, use -Q command line option instead */ + @Deprecated public void setSilent(boolean silent) { this.silent = silent; if (silent) { From b5bed09f8daaa2b58b0036c8580fec7582b59447 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Sat, 9 Nov 2024 08:32:02 -0500 Subject: [PATCH 5/5] -q --- .../maven/plugins/dependency/AbstractDependencyMojo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java index edc789117..45e43be16 100644 --- a/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java +++ b/src/main/java/org/apache/maven/plugins/dependency/AbstractDependencyMojo.java @@ -87,7 +87,7 @@ public abstract class AbstractDependencyMojo extends AbstractMojo { /** * If the plugin should be silent. * - * @deprecated to be removed in 4.0; use -Q command line option instead + * @deprecated to be removed in 4.0; use -q command line option instead * @since 2.0 */ @Deprecated @@ -182,7 +182,7 @@ protected final boolean isSilent() { /** * @param silent {@link #silent} - * @deprecated to be removed in 4.0; no API replacement, use -Q command line option instead + * @deprecated to be removed in 4.0; no API replacement, use -q command line option instead */ @Deprecated public void setSilent(boolean silent) {