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 3bd238ab3b9a01361e413f92dab29af461f32982
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat Dec 3 02:13:19 2022 +0100
Prepare for Doxia 2.0.0
---
pom.xml | 22 +++++++++++++++++-----
.../verify.bsh | 4 ++--
.../plugins/dependency/DisplayAncestorsMojo.java | 5 ++---
.../dependency/analyze/AnalyzeReportView.java | 6 ++++--
4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index dc320c1a..0f8a73cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.4.1-SNAPSHOT</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Dependency Plugin</name>
@@ -160,12 +160,24 @@ under the License.
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
-
+
+ <!-- doxia -->
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>2.0.0-M4</version>
+ </dependency>
+
<!-- reporting -->
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>4.0.0-M3</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.2.0</version>
+ <version>4.0.0-M3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -235,7 +247,7 @@ under the License.
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
@@ -255,7 +267,7 @@ under the License.
<version>0.0.7</version><!-- stick with old GAV until
https://github.com/eclipse-m2e/m2e-core/issues/944 is fixed -->
<scope>compile</scope>
</dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.eclipse.aether</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 4c2ea9ea..fb420dcd 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -30,7 +30,6 @@ import org.apache.maven.project.MavenProject;
import java.util.ArrayList;
import java.util.List;
-import java.util.Locale;
/**
* Displays all ancestor POMs of the project. This may be useful in a
continuous integration system where you want to
@@ -62,7 +61,7 @@ public class DisplayAncestorsMojo
}
else
{
- getLog().info( String.format( Locale.US, "Ancestor POMs: %s",
StringUtils.join( ancestors, " <- " ) ) );
+ getLog().info( "Ancestor POMs: " + StringUtils.join( ancestors, "
<- " ) );
}
}
@@ -74,7 +73,7 @@ public class DisplayAncestorsMojo
MavenProject currentAncestor = project.getParent();
while ( currentAncestor != null )
{
- final String gav = String.format( Locale.US, "%s:%s:%s",
currentAncestor.getGroupId(),
+ final String gav = String.format( "%s:%s:%s",
currentAncestor.getGroupId(),
currentAncestor.getArtifactId(),
currentAncestor.getVersion() );
ancestors.add( gav );
diff --git
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
index 571be741..17afef12 100644
---
a/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
+++
b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
@@ -34,7 +34,7 @@ public class AnalyzeReportView
{
/**
* Generates the HTML report.
- *
+ *
* @param analysis {@link ProjectDependencyAnalysis}
* @param sink {@link Sink}
* @param bundle {@link ResourceBundle}
@@ -136,13 +136,14 @@ public class AnalyzeReportView
/**
* Generate a table for the given dependencies iterator.
- *
+ *
* @param sink {@link Sink}
* @param iter {@link Artifact}
*/
public void generateDependenciesTable( Sink sink, Iterator<Artifact> iter )
{
sink.table();
+ sink.tableRows( null, false );
sink.tableRow();
sink.tableCell();
@@ -225,6 +226,7 @@ public class AnalyzeReportView
sink.tableRow_();
}
+ sink.tableRows_();
sink.table_();
sink.horizontalRule();
}
