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/01/06 22:42:05 UTC
[maven-dependency-plugin] branch doxia-2.0.0 updated (3bd238ab -> 4ce6c201)
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 3bd238ab Prepare for Doxia 2.0.0
add ea2a668d remove unused beanutils dependency (#268)
add a05a2a4f Bump junit from 4.13 to 4.13.2 in /src/it/projects/tree-verbose-small
add 803433bc [MDEP-837] Upgrade Parent to 38
add cc082ea7 [MDEP-837] Reformat code after parent 38
add 68b72723 [MDEP-837] Ignore reformat commit from git blame
add 799ff97d [MDEP-831] Remove dependency on commons-lang3 (#270)
new 4ce6c201 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 (3bd238ab)
\
N -- N -- N refs/heads/doxia-2.0.0 (4ce6c201)
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:
.../realm.properties => .git-blame-ignore-revs | 6 +-
pom.xml | 100 ++-
src/it/projects/tree-verbose-small/expected.txt | 2 +-
src/it/projects/tree-verbose-small/pom.xml | 2 +-
.../plugins/dependency/AbstractDependencyMojo.java | 321 ++++----
.../plugins/dependency/DisplayAncestorsMojo.java | 48 +-
.../apache/maven/plugins/dependency/GetMojo.java | 226 +++---
.../maven/plugins/dependency/ListClassesMojo.java | 217 +++---
.../maven/plugins/dependency/PropertiesMojo.java | 45 +-
.../dependency/PurgeLocalRepositoryMojo.java | 527 ++++++-------
.../dependency/analyze/AbstractAnalyzeMojo.java | 401 ++++------
.../plugins/dependency/analyze/AnalyzeDepMgt.java | 183 ++---
.../dependency/analyze/AnalyzeDuplicateMojo.java | 102 +--
.../plugins/dependency/analyze/AnalyzeMojo.java | 13 +-
.../dependency/analyze/AnalyzeOnlyMojo.java | 24 +-
.../dependency/analyze/AnalyzeReportMojo.java | 82 +-
.../dependency/analyze/AnalyzeReportView.java | 114 ++-
.../AbstractFromConfigurationMojo.java | 242 +++---
.../dependency/fromConfiguration/ArtifactItem.java | 154 ++--
.../dependency/fromConfiguration/CopyMojo.java | 100 ++-
.../ProcessArtifactItemsRequest.java | 49 +-
.../dependency/fromConfiguration/UnpackMojo.java | 128 ++-
.../AbstractDependencyFilterMojo.java | 279 +++----
.../AbstractFromDependenciesMojo.java | 82 +-
.../fromDependencies/BuildClasspathMojo.java | 279 +++----
.../fromDependencies/CopyDependenciesMojo.java | 266 +++----
.../fromDependencies/UnpackDependenciesMojo.java | 110 ++-
.../dependency/resolvers/AbstractResolveMojo.java | 63 +-
.../resolvers/CollectDependenciesMojo.java | 20 +-
.../ExcludeReactorProjectsArtifactFilter.java | 64 +-
.../ExcludeReactorProjectsDependencyFilter.java | 50 +-
.../dependency/resolvers/GoOfflineMojo.java | 152 ++--
.../plugins/dependency/resolvers/ListMojo.java | 13 +-
.../dependency/resolvers/ListRepositoriesMojo.java | 142 ++--
.../resolvers/ResolveDependenciesMojo.java | 312 ++++----
.../resolvers/ResolveDependencySourcesMojo.java | 25 +-
.../dependency/resolvers/ResolvePluginsMojo.java | 138 ++--
.../tree/AbstractSerializingVisitor.java | 20 +-
.../tree/BuildingDependencyNodeVisitor.java | 116 +--
.../dependency/tree/DOTDependencyNodeVisitor.java | 42 +-
.../tree/GraphmlDependencyNodeVisitor.java | 77 +-
.../dependency/tree/TGFDependencyNodeVisitor.java | 68 +-
.../maven/plugins/dependency/tree/TreeMojo.java | 269 +++----
.../dependency/utils/DependencySilentLog.java | 106 +--
.../dependency/utils/DependencyStatusSets.java | 77 +-
.../plugins/dependency/utils/DependencyUtil.java | 205 +++--
.../utils/filters/ArtifactItemFilter.java | 13 +-
.../dependency/utils/filters/DestFileFilter.java | 173 ++--
.../dependency/utils/filters/MarkerFileFilter.java | 67 +-
.../utils/filters/ResolveFileFilter.java | 33 +-
.../utils/markers/DefaultFileMarkerHandler.java | 104 +--
.../dependency/utils/markers/MarkerHandler.java | 25 +-
.../utils/markers/SourcesFileMarkerHandler.java | 115 +--
.../utils/markers/UnpackFileMarkerHandler.java | 56 +-
.../utils/translators/ArtifactTranslator.java | 15 +-
.../translators/ClassifierTypeTranslator.java | 71 +-
.../dependency/AbstractDependencyMojoTest.java | 116 ++-
.../dependency/AbstractDependencyMojoTestCase.java | 73 +-
.../maven/plugins/dependency/TestCollectMojo.java | 90 +--
.../maven/plugins/dependency/TestGetMojo.java | 224 +++---
.../plugins/dependency/TestListClassesMojo.java | 111 ++-
.../plugins/dependency/TestPropertiesMojo.java | 50 +-
.../apache/maven/plugins/dependency/TestSkip.java | 175 ++---
.../dependency/analyze/TestAnalyzeDepMgt.java | 171 ++--
.../analyze/TestAnalyzeDuplicateMojo.java | 178 ++---
.../fromConfiguration/TestArtifactItem.java | 46 +-
.../dependency/fromConfiguration/TestCopyMojo.java | 866 +++++++++------------
.../TestIncludeExcludeUnpackMojo.java | 326 ++++----
.../fromConfiguration/TestUnpackMojo.java | 666 +++++++---------
.../fromDependencies/TestBuildClasspathMojo.java | 171 ++--
.../fromDependencies/TestCopyDependenciesMojo.java | 652 +++++++---------
.../TestCopyDependenciesMojo2.java | 387 ++++-----
.../TestIncludeExcludeUnpackDependenciesMojo.java | 159 ++--
.../TestUnpackDependenciesMojo.java | 565 ++++++--------
.../TestUnpackDependenciesMojo2.java | 188 ++---
.../ExcludeReactorProjectsArtifactFilterTest.java | 72 +-
...ExcludeReactorProjectsDependencyFilterTest.java | 103 ++-
.../resolvers/ResolveDependenciesMojoTest.java | 226 +++---
.../dependency/resolvers/TestResolveMojo.java | 64 +-
.../testUtils/DependencyArtifactStubFactory.java | 89 +--
.../testUtils/stubs/DependencyProjectStub.java | 638 +++++----------
.../stubs/DuplicateDependencies2ProjectStub.java | 50 +-
.../stubs/DuplicateDependenciesProjectStub.java | 50 +-
.../stubs/StubDefaultFileMarkerHandler.java | 25 +-
.../dependency/testUtils/stubs/StubMarkerFile.java | 39 +-
.../stubs/StubSourcesFileMarkerHandler.java | 33 +-
.../stubs/StubUnpackFileMarkerHandler.java | 46 +-
.../plugins/dependency/tree/TestTreeMojo.java | 181 ++---
.../tree/TestTreeMojo_ContainsVersion.java | 36 +-
.../dependency/utils/TestDependencyStatusSets.java | 21 +-
.../dependency/utils/TestDependencyUtil.java | 358 ++++-----
.../plugins/dependency/utils/TestSilentLog.java | 63 +-
.../utils/filters/TestDestFileFilter.java | 278 +++----
.../utils/filters/TestMarkerFileFilter.java | 173 ++--
.../utils/filters/TestResolveMarkerFileFilter.java | 56 +-
.../markers/TestDefaultMarkerFileHandler.java | 161 ++--
.../markers/TestSourcesMarkerFileHandler.java | 249 +++---
.../utils/markers/TestUnpackMarkerFileHandler.java | 270 +++----
.../translators/TestClassifierTypeTranslator.java | 151 ++--
.../unit/build-classpath-test/plugin-config.xml | 2 +-
.../resources/unit/collect-test/plugin-config.xml | 2 +-
.../unit/copy-dependencies-test/plugin-config.xml | 2 +-
.../resources/unit/copy-test/plugin-config.xml | 2 +-
src/test/resources/unit/get-test/plugin-config.xml | 2 +-
.../unit/properties-test/plugin-config.xml | 2 +-
.../resources/unit/resolve-test/plugin-config.xml | 2 +-
.../resources/unit/tree-test/plugin-config.xml | 2 +-
.../unpack-dependencies-test/plugin-config.xml | 2 +-
.../unit/unpack-dependencies-test/test.txt | 2 +-
.../resources/unit/unpack-test/plugin-config.xml | 2 +-
110 files changed, 6458 insertions(+), 8943 deletions(-)
copy src/test/resources/unit/get-test/realm.properties => .git-blame-ignore-revs (91%)
[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 4ce6c2019f27085968863e2a81822a80d5201c7a
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 | 9 +--------
.../plugins/dependency/analyze/AnalyzeReportView.java | 2 ++
4 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 941dfc24..26c1679a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,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>
@@ -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-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>
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..e88c521c 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/DisplayAncestorsMojo.java
@@ -61,14 +61,7 @@ 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 4bcc3d47..9e26e651 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,6 +129,7 @@ public class AnalyzeReportView {
*/
public void generateDependenciesTable(Sink sink, Iterator<Artifact> iter) {
sink.table();
+ sink.tableRows( null, false );
sink.tableRow();
sink.tableCell();
@@ -207,6 +208,7 @@ public class AnalyzeReportView {
sink.tableRow_();
}
+ sink.tableRows_();
sink.table_();
sink.horizontalRule();
}