You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/03/20 23:06:09 UTC

[maven-dependency-plugin] branch doxia-2.0.0 updated (80841bae -> 4d8956f8)

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch doxia-2.0.0
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git


 discard 80841bae Prepare for Doxia 2.0.0
     add da83f2ad remove release property
     add b5b6f9e0 Bump jettyVersion from 9.4.49.v20220914 to 9.4.51.v20230217 (#295)
     add a2dc6150 Bump plexus-io from 3.4.0 to 3.4.1 (#292)
     add 43c0ab2c Bump plexus-utils from 3.5.0 to 3.5.1 (#297)
     add 333bfa47 Bump plexus-archiver from 4.6.0 to 4.6.2 (#289)
     new 4d8956f8 Prepare for Doxia 2.0.0

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (80841bae)
            \
             N -- N -- N   refs/heads/doxia-2.0.0 (4d8956f8)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                  | 16 ++++++++--------
 .../analyze-testDependencyWithNonTestScope/pom.xml       |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)


[maven-dependency-plugin] 01/01: Prepare for Doxia 2.0.0

Posted by mi...@apache.org.
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 4d8956f8f88cf9517c8c6a24b913c06404aedc99
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Dec 3 02:13:19 2022 +0100

    Prepare for Doxia 2.0.0
---
 pom.xml                                                  | 16 ++++++++++++++--
 .../analyze-testDependencyWithNonTestScope/verify.bsh    |  4 ++--
 .../maven/plugins/dependency/DisplayAncestorsMojo.java   | 11 ++---------
 .../plugins/dependency/analyze/AnalyzeReportView.java    |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2171748f..5d4f13aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
 
   <artifactId>maven-dependency-plugin</artifactId>
-  <version>3.5.1-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
 
   <name>Apache Maven Dependency Plugin</name>
@@ -159,11 +159,23 @@ under the License.
       <scope>provided</scope>
     </dependency>
 
+    <!-- doxia -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>2.0.0-M6</version>
+    </dependency>
+
     <!-- reporting -->
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>4.0.0-M5</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-impl</artifactId>
-      <version>3.2.0</version>
+      <version>4.0.0-M5</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 248bef79..81e94c73 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;
 import org.apache.maven.plugin.MojoFailureException;
@@ -61,14 +60,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/AnalyzeReportView.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
index c36cb4e3..d83793c7 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
@@ -129,7 +129,7 @@ public class AnalyzeReportView {
      */
     public void generateDependenciesTable(Sink sink, Iterator<Artifact> iter) {
         sink.table();
-        sink.tableRows(null, false);
+        sink.tableRows();
 
         sink.tableRow();
         sink.tableCell();