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/11/14 19:00:04 UTC
(maven-dependency-plugin) branch doxia-2.0.0 updated (44e430d2 -> 457266f3)
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 44e430d2 Prepare for Doxia 2.0.0
add fcdaf61c Bump org.jsoup:jsoup from 1.16.1 to 1.16.2 (#339)
add 8a3ff132 Bump jettyVersion from 9.4.51.v20230217 to 9.4.53.v20231009 (#338)
add 7ec0bda3 Bump resolverVersion from 1.0.0.v20140518 to 1.0.2.v20150114 (#329)
add f45b26fb commons-io to 2.14.0 (#340)
add 72488754 Assorted grammar nits on the home page (#345)
add 9e920858 [MDEP-889] declare javax.inject explicitly (#343)
add a56c4df2 [MDEP-888] Update used but undeclared commons-lang3 to 3.13.0 (#341)
add 710a30f3 [MDEP-771] Remove broken 404 link (#344)
add 3576dcb7 [MDEP-869] remove unused collections dependency (#342)
add 69fdf929 remove executable flag
add 416f7325 Bump org.codehaus.mojo:mrm-maven-plugin from 1.5.0 to 1.6.0 (#347)
add f64df8fd [MDEP-893] - Get rid of commons-lang3
add f1b2915a Code Improvements * using Files.newBufferedWriter(), Files.lines() * using reader.lines().forEach() * Removed inverse logic. * Using StandardCharsets.UTF_8 instead of literal texts.
add ad2af959 [MDEP-894] - Use @Component instead of @Parameter for session/project
add 8b150c49 [MDEP-896] - Removing unused code
add da5070ff Removed left over comment.
add 0bb4c591 Fix sources goal for multimodule projects
add 381def88 Fix formatting
add 3ee528d1 [MDEP-897] - Remove old style JavaDoc Plexus docs
add b773e4cf [MDEP-899] - Upgrade maven-plugin parent to 41
new 457266f3 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 (44e430d2)
\
N -- N -- N refs/heads/doxia-2.0.0 (457266f3)
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 | 23 +++++-----
.../{tree-multimodule => sources}/module-a/pom.xml | 0
.../{tree-multimodule => sources}/module-b/pom.xml | 0
src/it/projects/sources/pom.xml | 18 ++++----
.../plugins/dependency/AbstractDependencyMojo.java | 4 +-
.../plugins/dependency/DisplayAncestorsMojo.java | 4 +-
.../apache/maven/plugins/dependency/GetMojo.java | 9 ++--
.../maven/plugins/dependency/ListClassesMojo.java | 2 +-
.../plugins/dependency/ListRepositoriesMojo.java | 2 +-
.../maven/plugins/dependency/PropertiesMojo.java | 3 +-
.../dependency/PurgeLocalRepositoryMojo.java | 4 +-
.../dependency/analyze/AbstractAnalyzeMojo.java | 8 ++--
.../plugins/dependency/analyze/AnalyzeDepMgt.java | 10 +++--
.../dependency/analyze/AnalyzeDuplicateMojo.java | 3 +-
.../AbstractFromConfigurationMojo.java | 17 ++++----
.../dependency/fromConfiguration/ArtifactItem.java | 29 +++++--------
.../dependency/fromConfiguration/UnpackMojo.java | 4 +-
.../fromDependencies/BuildClasspathMojo.java | 29 +++++--------
.../fromDependencies/UnpackDependenciesMojo.java | 2 +-
.../resolvers/ResolveDependencySourcesMojo.java | 2 +-
.../maven/plugins/dependency/tree/TreeMojo.java | 37 +---------------
.../plugins/dependency/utils/DependencyUtil.java | 31 ++++++--------
.../plugins/dependency/utils/StringUtils.java} | 16 ++++---
.../dependency/utils/filters/DestFileFilter.java | 6 ++-
.../utils/markers/UnpackFileMarkerHandler.java | 2 +-
src/site/apt/index.apt.vm | 16 ++++---
.../TestCopyDependenciesMojo2.java | 3 +-
.../stubs/StubUnpackFileMarkerHandler.java | 2 +-
.../tree/TestTreeMojo_ContainsVersion.java | 49 ----------------------
.../dependency/utils/TestDependencyUtil.java | 3 +-
.../unit/properties-test/plugin-config.xml | 0
31 files changed, 119 insertions(+), 219 deletions(-)
copy src/it/projects/{tree-multimodule => sources}/module-a/pom.xml (100%)
copy src/it/projects/{tree-multimodule => sources}/module-b/pom.xml (100%)
copy src/{it/projects/analyze-ignore-all-non-test-scope-dependency/src/test/java/MainTest.java => main/java/org/apache/maven/plugins/dependency/utils/StringUtils.java} (71%)
delete mode 100644 src/test/java/org/apache/maven/plugins/dependency/tree/TestTreeMojo_ContainsVersion.java
mode change 100755 => 100644 src/test/resources/unit/properties-test/plugin-config.xml
(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 457266f3b646bffbfc58d3aa37be21e526d2befe
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 ++--------
.../{AnalyzeReportMojo.java => AnalyzeReport.java} | 4 +---
4 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index dea87485..54fb74ce 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 06efbe74..4a52c015 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 96%
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..856d7fae 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 -----------------------------------------------------------------
/**
@@ -115,13 +115,11 @@ public class AnalyzeReportMojo extends AbstractMavenReport {
@Override
public boolean canGenerateReport() {
if (skip) {
- getLog().info("Skipping plugin execution");
return false;
}
// Step 0: Checking pom availability
if ("pom".equals(project.getPackaging())) {
- getLog().info("Skipping pom project");
return false;
}