This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch todo
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 6b3b222c4356c30c5f550bcad8c451e080e27908
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Fri Nov 15 16:46:44 2024 -0500
Cleanup a few obsolete TODOs
---
.../fromDependencies/AbstractDependencyFilterMojo.java | 6 +++---
.../dependency/fromDependencies/BuildClasspathMojo.java | 1 -
.../dependency/analyze/TestAnalyzeDuplicateMojo.java | 17 ++++++++++++++++-
.../dependency/exclusion/AnalyzeExclusionsMojoTest.java | 17 ++++++++++++++++-
.../resolvers/ResolveDependenciesMojoTest.java | 4 ++--
5 files changed, 37 insertions(+), 8 deletions(-)
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
index 655458b5..d8de436c 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/AbstractDependencyFilterMojo.java
@@ -478,7 +478,7 @@ public abstract class AbstractDependencyFilterMojo extends
AbstractDependencyMoj
}
/**
- * @param theMarkersDirectory The markersDirectory to set.
+ * @param theMarkersDirectory the markersDirectory to set
*/
public void setMarkersDirectory(File theMarkersDirectory) {
this.markersDirectory = theMarkersDirectory;
@@ -487,14 +487,14 @@ public abstract class AbstractDependencyFilterMojo
extends AbstractDependencyMoj
// TODO: Set marker files.
/**
- * @return true, if the groupId should be prepended to the filename.
+ * @return true, if the groupId should be prepended to the filename
*/
public boolean isPrependGroupId() {
return prependGroupId;
}
/**
- * @param prependGroupId - true if the groupId must be prepended during
the copy.
+ * @param prependGroupId true if the groupId must be prepended during the
copy
*/
public void setPrependGroupId(boolean prependGroupId) {
this.prependGroupId = prependGroupId;
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
index 698c2739..5604ece9 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
@@ -270,7 +270,6 @@ public class BuildClasspathMojo extends
AbstractDependencyFilterMojo implements
}
sb.append(file);
} else {
- // TODO: add param for prepending groupId and version.
sb.append(prefix);
sb.append(File.separator);
sb.append(DependencyUtil.getFormattedFileName(
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java
b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java
index 339d2b64..b0b75809 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDuplicateMojo.java
@@ -76,56 +76,67 @@ public class TestAnalyzeDuplicateMojo extends
AbstractDependencyMojoTestCase {
StringBuilder sb = new StringBuilder();
/** {@inheritDoc} */
+ @Override
public void debug(CharSequence content) {
print("debug", content);
}
/** {@inheritDoc} */
+ @Override
public void debug(CharSequence content, Throwable error) {
print("debug", content, error);
}
/** {@inheritDoc} */
+ @Override
public void debug(Throwable error) {
print("debug", error);
}
/** {@inheritDoc} */
+ @Override
public void info(CharSequence content) {
print("info", content);
}
/** {@inheritDoc} */
+ @Override
public void info(CharSequence content, Throwable error) {
print("info", content, error);
}
/** {@inheritDoc} */
+ @Override
public void info(Throwable error) {
print("info", error);
}
/** {@inheritDoc} */
+ @Override
public void warn(CharSequence content) {
print("warn", content);
}
/** {@inheritDoc} */
+ @Override
public void warn(CharSequence content, Throwable error) {
print("warn", content, error);
}
/** {@inheritDoc} */
+ @Override
public void warn(Throwable error) {
print("warn", error);
}
/** {@inheritDoc} */
+ @Override
public void error(CharSequence content) {
System.err.println("[error] " + content.toString());
}
/** {@inheritDoc} */
+ @Override
public void error(CharSequence content, Throwable error) {
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);
@@ -139,6 +150,7 @@ public class TestAnalyzeDuplicateMojo extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable)
*/
+ @Override
public void error(Throwable error) {
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);
@@ -151,14 +163,15 @@ public class TestAnalyzeDuplicateMojo extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isDebugEnabled()
*/
+ @Override
public boolean isDebugEnabled() {
- // TODO: Not sure how best to set these for this implementation...
return false;
}
/**
* @see org.apache.maven.plugin.logging.Log#isInfoEnabled()
*/
+ @Override
public boolean isInfoEnabled() {
return true;
}
@@ -166,6 +179,7 @@ public class TestAnalyzeDuplicateMojo extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isWarnEnabled()
*/
+ @Override
public boolean isWarnEnabled() {
return true;
}
@@ -173,6 +187,7 @@ public class TestAnalyzeDuplicateMojo extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isErrorEnabled()
*/
+ @Override
public boolean isErrorEnabled() {
return true;
}
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java
b/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java
index bbcc7485..f4e37d42 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/exclusion/AnalyzeExclusionsMojoTest.java
@@ -230,6 +230,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void debug(CharSequence content) {
print("debug", content);
}
@@ -237,6 +238,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void debug(CharSequence content, Throwable error) {
print("debug", content, error);
}
@@ -244,6 +246,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void debug(Throwable error) {
print("debug", error);
}
@@ -251,6 +254,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void info(CharSequence content) {
print("info", content);
}
@@ -258,6 +262,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void info(CharSequence content, Throwable error) {
print("info", content, error);
}
@@ -265,6 +270,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void info(Throwable error) {
print("info", error);
}
@@ -272,6 +278,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void warn(CharSequence content) {
print("warn", content);
}
@@ -279,6 +286,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void warn(CharSequence content, Throwable error) {
print("warn", content, error);
}
@@ -286,6 +294,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void warn(Throwable error) {
print("warn", error);
}
@@ -293,6 +302,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void error(CharSequence content) {
print("error", content);
}
@@ -300,6 +310,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void error(CharSequence content, Throwable error) {
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);
@@ -313,6 +324,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#error(java.lang.Throwable)
*/
+ @Override
public void error(Throwable error) {
StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter(sWriter);
@@ -325,14 +337,15 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isDebugEnabled()
*/
+ @Override
public boolean isDebugEnabled() {
- // TODO: Not sure how best to set these for this implementation...
return false;
}
/**
* @see org.apache.maven.plugin.logging.Log#isInfoEnabled()
*/
+ @Override
public boolean isInfoEnabled() {
return true;
}
@@ -340,6 +353,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isWarnEnabled()
*/
+ @Override
public boolean isWarnEnabled() {
return true;
}
@@ -347,6 +361,7 @@ public class AnalyzeExclusionsMojoTest extends
AbstractDependencyMojoTestCase {
/**
* @see org.apache.maven.plugin.logging.Log#isErrorEnabled()
*/
+ @Override
public boolean isErrorEnabled() {
return true;
}
diff --git
a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
index a9d3c607..ff919797 100644
---
a/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
+++
b/src/test/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojoTest.java
@@ -28,6 +28,7 @@ import
org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyStatusSets;
public class ResolveDependenciesMojoTest extends
AbstractDependencyMojoTestCase {
+ @Override
protected void setUp() throws Exception {
// required for mojo lookups to work
super.setUp("dss", true);
@@ -60,8 +61,7 @@ public class ResolveDependenciesMojoTest extends
AbstractDependencyMojoTestCase
assertTrue(output.contains("g:a:jar:1.0:test (optional)" +
System.lineSeparator()));
}
- public void doTestDependencyStatusLog(Set<Artifact> artifacts) {
- // TODO: implement logger to check correct output
+ private void doTestDependencyStatusLog(Set<Artifact> artifacts) {
// this test is just looking for unexpected exceptions.
ResolveDependenciesMojo mojo = newMojo(new DependencyStatusSets());
