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/07/13 13:44:55 UTC

[maven-dependency-plugin] branch doxia-2.0.0 updated (e664972a -> c38b6622)

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


    omit e664972a Prepare for Doxia 2.0.0
     add 03bc34e8 Tighten language (#327)
     add 9e479d4b [MDEP-872] update commons-io to 2.13.0 (#326)
     add 3c877fb8 MDEP-875 prevent possible NPE
     add 4ed696e0 Add Javadoc 'author' tag to prevent dangling contributor name
     new c38b6622 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   (e664972a)
            \
             N -- N -- N   refs/heads/doxia-2.0.0 (c38b6622)

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                                            | 24 ++++------------------
 .../plugins/dependency/ListRepositoriesMojo.java   | 11 ++++++++--
 .../dependency/resolvers/GoOfflineMojo.java        |  2 +-
 src/site/apt/usage.apt.vm                          | 10 ++++-----
 4 files changed, 19 insertions(+), 28 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 c38b66227f6d5d7df37d65e5825c4d25f399160c
Author: Michael Osipov <mi...@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 ++--------
 3 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c4d65e9..0ddc8189 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ under the License.
   </parent>
 
   <artifactId>maven-dependency-plugin</artifactId>
-  <version>3.6.1-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-M7</version>
     </dependency>
+
+    <!-- reporting -->
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>3.1.1</version>
+      <version>4.0.0-M7</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-M9</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();
         }