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/06/06 20:47:36 UTC
[maven-dependency-plugin] branch doxia-2.0.0 updated (8b30ee85 -> e664972a)
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 8b30ee85 Prepare for Doxia 2.0.0
add abc76b54 [MDEP-860] Bump maven-dependency-analyzer from 1.13.1 to 1.13.2 (#312)
add 4c3568ee [MNG-6829] Replace any StringUtils#isEmpty(String) and #isNotEmpty(String) (#318)
add 9655a1e9 [MDEP-854] Bump jsoup from 1.15.4 to 1.16.1 (#310)
add ea1a9fd9 [MDEP-864] Replace AnalyzeReportView with a new AnalyzeReportRenderer
add b4474bb9 [MDEP-851] Bump plexus-archiver from 4.6.3 to 4.7.1 (#315)
add 2992497b [MDEP-862] Get rid of plexus-container-default from dependencies
add 159090be [MDEP-866] Refresh download page
add 6ccca01b [MDEP-867] Upgrade plugins in ITs
add 8e257106 [maven-release-plugin] prepare release maven-dependency-plugin-3.6.0
add 0b57492a [maven-release-plugin] prepare for next development iteration
add 73d22201 move commons-io to test scope (#323)
add f1863631 [MDEP-869] update commons-collections to 4.4 (#324)
add 694655dd MDEP-868 update maven-shared-utils to 3.4.2 (#322)
new e664972a 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 (8b30ee85)
\
N -- N -- N refs/heads/doxia-2.0.0 (e664972a)
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 | 43 +++-
src/it/projects/analyze-report/invoker.properties | 6 +-
src/it/projects/analyze-report/pom.xml | 42 ----
.../invoker.properties | 7 +-
.../pom.xml | 4 +-
src/it/projects/mdep-439-analyze-java8/pom.xml | 4 +-
src/it/projects/mdep-599-analyze-java9/pom.xml | 2 +-
.../mdep-663_analyze_unsupported_version/pom.xml | 1 -
.../pom.xml | 1 +
src/it/projects/setup-custom-ear-lifecycle/pom.xml | 4 +-
.../dependency/PurgeLocalRepositoryMojo.java | 13 +-
.../dependency/analyze/AbstractAnalyzeMojo.java | 23 +--
.../dependency/analyze/AnalyzeReportMojo.java | 45 ++---
.../dependency/analyze/AnalyzeReportRenderer.java | 125 ++++++++++++
.../dependency/analyze/AnalyzeReportView.java | 216 ---------------------
.../AbstractDependencyFilterMojo.java | 5 +-
.../fromDependencies/BuildClasspathMojo.java | 8 +-
.../plugins/dependency/utils/DependencyUtil.java | 2 +-
.../maven/plugins/dependency/utils/UnpackUtil.java | 7 +-
.../translators/ClassifierTypeTranslator.java | 5 +-
src/main/resources/analyze-report.properties | 16 +-
src/main/resources/analyze-report_de.properties | 15 +-
src/main/resources/analyze-report_pt_BR.properties | 14 +-
src/main/resources/analyze-report_sv.properties | 14 +-
src/site/site.xml | 6 +-
src/site/xdoc/download.xml.vm | 117 ++++-------
.../fromDependencies/TestCopyDependenciesMojo.java | 5 +-
.../TestUnpackDependenciesMojo.java | 5 +-
28 files changed, 288 insertions(+), 467 deletions(-)
create mode 100644 src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportRenderer.java
delete mode 100644 src/main/java/org/apache/maven/plugins/dependency/analyze/AnalyzeReportView.java
[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 e664972a45c919137946affdb6c7c928dd2a164b
Author: Michael Osipov <mi...@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 | 11 ++---------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4cfad0d7..36a4cba6 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,6 +165,13 @@ 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.doxia</groupId>
@@ -182,16 +189,15 @@ under the License.
<artifactId>maven-reporting-api</artifactId>
<version>3.1.1</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>4.0.0-M6</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-M8</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();
}