This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 33b659463ee1408c258fefef4d52a33fbb708ceb
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Dec 3 02:13:19 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 24 +++++++---------------
.../verify.bsh | 4 ++--
.../plugins/dependency/DisplayAncestorsMojo.java | 11 ++--------
.../{AnalyzeReportMojo.java => AnalyzeReport.java} | 2 +-
4 files changed, 12 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index cdd07a76..d65ab5cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
</parent>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.6.2-SNAPSHOT</version>
+ <version>3.7.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Dependency Plugin</name>
@@ -165,33 +165,23 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- reporting -->
+ <!-- doxia -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
- <version>1.11.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
+ <version>2.0.0-M8</version>
</dependency>
+
+ <!-- reporting -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.1.1</version>
+ <version>4.0.0-M8</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
+ <version>4.0.0-M11</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/src/it/projects/analyze-testDependencyWithNonTestScope/verify.bsh
b/src/it/projects/analyze-testDependencyWithNonTestScope/verify.bsh
index ba623ba7..c5c7993f 100644
--- a/src/it/projects/analyze-testDependencyWithNonTestScope/verify.bsh
+++ b/src/it/projects/analyze-testDependencyWithNonTestScope/verify.bsh
@@ -37,7 +37,7 @@ if ( htmlFile.length() == 0 )
Document doc = Jsoup.parse( htmlFile, "UTF-8");
-Elements entry = doc.select( "#contentBox > section > section:nth-child(5) >
table > tbody > tr.b" );
+Elements entry = doc.select( "#bodyColumn > section > section:nth-child(5) >
table > tbody > tr.b" );
if( entry.isEmpty() )
{
@@ -50,7 +50,7 @@ else if ( entry.size() != 1 )
}
Element groupIdElement = doc.select(
-"#contentBox > section > section:nth-child(5) > table > tbody > tr.b >
td:nth-child(1)" ).first();
+"#bodyColumn > section > section:nth-child(5) > table > tbody > tr.b >
td:nth-child(1)" ).first();
String groupId = groupIdElement.text();
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
index 4e1be1b3..686d3bb8 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugins.dependency;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
@@ -62,14 +61,8 @@ public class DisplayAncestorsMojo extends AbstractMojo {
MavenProject currentAncestor = project.getParent();
while (currentAncestor != null) {
- final String gav = String.format(
- Locale.US,
- "%s:%s:%s",
- currentAncestor.getGroupId(),
- currentAncestor.getArtifactId(),
- currentAncestor.getVersion());
-
- ancestors.add(gav);
+ ancestors.add(currentAncestor.getGroupId() + ":" +
currentAncestor.getArtifactId() + ":"
+ + currentAncestor.getVersion());
currentAncestor = currentAncestor.getParent();
}
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport.java
similarity index 98%
rename from
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
rename to
src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport.java
index 5ef0ea7c..b240f57f 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReport.java
@@ -41,7 +41,7 @@ import org.codehaus.plexus.i18n.I18N;
*/
@Mojo(name = "analyze-report", requiresDependencyResolution =
ResolutionScope.TEST, threadSafe = true)
@Execute(phase = LifecyclePhase.TEST_COMPILE)
-public class AnalyzeReportMojo extends AbstractMavenReport {
+public class AnalyzeReport extends AbstractMavenReport {
// fields -----------------------------------------------------------------
/**
