You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/04/17 21:34:40 UTC

[maven-dependency-plugin] branch dom4j updated (550b8838 -> 6694acf9)

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

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


 discard 550b8838 Replace vulnerable dependency in integration test
     add 17a9af30 [MDEP-850] Upgrade Parent to 39
     add 2f8a2c92 [MDEP-851] Bump plexus-archiver from 4.6.2 to 4.6.3 (#298)
     add 344e5082 [MDEP-854] Bump jsoup from 1.15.3 to 1.15.4 (#288)
     add d2c2f545 [MDEP-853] list-repositories - improvements
     add 9c0f9387 [MDEP-853] list-repositories - fix code format
     add 6c3e3296 Remove outdated changes list
     add 59c88682 [MDEP-855] Remove unused and ignored parameter - useJvmChmod
     new 6694acf9 Replace vulnerable dependency in integration test

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   (550b8838)
            \
             N -- N -- N   refs/heads/dom4j (6694acf9)

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                                            |  10 +-
 src/changes/changes.xml                            |  36 -----
 src/it/projects/copy-dependencies/pom.xml          |   1 -
 src/it/projects/list-repositories/pom.xml          | 101 +++++++-------
 .../verify.groovy                                  |  55 ++++----
 .../plugins/dependency/AbstractDependencyMojo.java |  26 +---
 .../plugins/dependency/DisplayAncestorsMojo.java   |   1 +
 .../apache/maven/plugins/dependency/GetMojo.java   |   1 +
 .../maven/plugins/dependency/ListClassesMojo.java  |   1 +
 .../plugins/dependency/ListRepositoriesMojo.java   | 150 +++++++++++++++++++++
 .../maven/plugins/dependency/PropertiesMojo.java   |   1 +
 .../dependency/PurgeLocalRepositoryMojo.java       |   1 +
 .../dependency/analyze/AbstractAnalyzeMojo.java    |   1 +
 .../plugins/dependency/analyze/AnalyzeDepMgt.java  |   1 +
 .../dependency/analyze/AnalyzeDuplicateMojo.java   |   1 +
 .../dependency/analyze/AnalyzeReportMojo.java      |   1 +
 .../dependency/analyze/AnalyzeReportView.java      |   1 +
 .../AbstractFromConfigurationMojo.java             |   1 +
 .../dependency/fromConfiguration/ArtifactItem.java |   1 +
 .../dependency/fromConfiguration/CopyMojo.java     |   7 +-
 .../dependency/fromConfiguration/UnpackMojo.java   |   1 +
 .../AbstractDependencyFilterMojo.java              |   1 +
 .../AbstractFromDependenciesMojo.java              |   1 +
 .../fromDependencies/BuildClasspathMojo.java       |   1 +
 .../fromDependencies/CopyDependenciesMojo.java     |   7 +-
 .../fromDependencies/UnpackDependenciesMojo.java   |   1 +
 .../dependency/resolvers/AbstractResolveMojo.java  |   7 +-
 .../ExcludeReactorProjectsArtifactFilter.java      |   1 +
 .../ExcludeReactorProjectsDependencyFilter.java    |   1 +
 .../dependency/resolvers/GoOfflineMojo.java        |   1 +
 .../dependency/resolvers/ListRepositoriesMojo.java |  66 ---------
 .../resolvers/ResolveDependenciesMojo.java         |   1 +
 .../dependency/resolvers/ResolvePluginsMojo.java   |   1 +
 .../tree/BuildingDependencyNodeVisitor.java        |   1 +
 .../dependency/tree/DOTDependencyNodeVisitor.java  |   1 +
 .../tree/GraphmlDependencyNodeVisitor.java         |   1 +
 .../dependency/tree/TGFDependencyNodeVisitor.java  |   1 +
 .../maven/plugins/dependency/tree/TreeMojo.java    |   1 +
 .../dependency/utils/DependencyStatusSets.java     |   1 +
 .../plugins/dependency/utils/DependencyUtil.java   |   1 +
 .../dependency/utils/filters/DestFileFilter.java   |   1 +
 .../dependency/utils/filters/MarkerFileFilter.java |   1 +
 .../utils/markers/DefaultFileMarkerHandler.java    |   1 +
 .../utils/markers/SourcesFileMarkerHandler.java    |   1 +
 .../utils/markers/UnpackFileMarkerHandler.java     |   1 +
 .../utils/translators/ArtifactTranslator.java      |   1 +
 .../translators/ClassifierTypeTranslator.java      |   1 +
 src/site/apt/index.apt.vm                          |   3 +-
 .../dependency/AbstractDependencyMojoTest.java     |  11 +-
 .../dependency/AbstractDependencyMojoTestCase.java |   1 +
 .../maven/plugins/dependency/TestCollectMojo.java  |   1 +
 .../maven/plugins/dependency/TestGetMojo.java      |   1 +
 .../plugins/dependency/TestListClassesMojo.java    |   1 +
 .../plugins/dependency/TestPropertiesMojo.java     |   1 +
 .../apache/maven/plugins/dependency/TestSkip.java  |   9 +-
 .../dependency/analyze/TestAnalyzeDepMgt.java      |   5 +-
 .../analyze/TestAnalyzeDuplicateMojo.java          |   1 +
 .../fromConfiguration/TestArtifactItem.java        |   1 +
 .../dependency/fromConfiguration/TestCopyMojo.java |   1 +
 .../TestIncludeExcludeUnpackMojo.java              |   1 +
 .../fromConfiguration/TestUnpackMojo.java          |   3 +-
 .../fromDependencies/TestBuildClasspathMojo.java   |   1 +
 .../fromDependencies/TestCopyDependenciesMojo.java |   1 +
 .../TestCopyDependenciesMojo2.java                 |   1 +
 .../TestIncludeExcludeUnpackDependenciesMojo.java  |   1 +
 .../TestUnpackDependenciesMojo.java                |   2 +-
 .../TestUnpackDependenciesMojo2.java               |   2 +-
 .../ExcludeReactorProjectsArtifactFilterTest.java  |  17 +--
 ...ExcludeReactorProjectsDependencyFilterTest.java |  11 +-
 .../resolvers/ResolveDependenciesMojoTest.java     |   1 +
 .../dependency/resolvers/TestResolveMojo.java      |   1 +
 .../testUtils/DependencyArtifactStubFactory.java   |   1 +
 .../testUtils/stubs/DependencyProjectStub.java     |   1 +
 .../stubs/DuplicateDependencies2ProjectStub.java   |   1 +
 .../stubs/DuplicateDependenciesProjectStub.java    |   1 +
 .../stubs/StubDefaultFileMarkerHandler.java        |   1 +
 .../stubs/StubSourcesFileMarkerHandler.java        |   1 +
 .../stubs/StubUnpackFileMarkerHandler.java         |   1 +
 .../plugins/dependency/tree/TestTreeMojo.java      |   1 +
 .../tree/TestTreeMojo_ContainsVersion.java         |   9 +-
 .../dependency/utils/TestDependencyUtil.java       |   1 +
 .../utils/filters/TestDestFileFilter.java          |   1 +
 .../utils/filters/TestMarkerFileFilter.java        |   1 +
 .../utils/filters/TestResolveMarkerFileFilter.java |   1 +
 .../markers/TestDefaultMarkerFileHandler.java      |   1 +
 .../markers/TestSourcesMarkerFileHandler.java      |   1 +
 .../utils/markers/TestUnpackMarkerFileHandler.java |   1 +
 .../translators/TestClassifierTypeTranslator.java  |   1 +
 .../unpack-dependencies-test/plugin-config.xml     |   1 -
 89 files changed, 347 insertions(+), 259 deletions(-)
 delete mode 100644 src/changes/changes.xml
 copy src/it/projects/{mdep-580_display-manifest-automodules => list-repositories}/verify.groovy (65%)
 create mode 100644 src/main/java/org/apache/maven/plugins/dependency/ListRepositoriesMojo.java
 delete mode 100644 src/main/java/org/apache/maven/plugins/dependency/resolvers/ListRepositoriesMojo.java


[maven-dependency-plugin] 01/01: Replace vulnerable dependency in integration test

Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch dom4j
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git

commit 6694acf9a5ce4b137d14270999c46a9435fea06b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sat Apr 1 12:34:35 2023 +0200

    Replace vulnerable dependency in integration test
    
    Co-authored-by: dependabot[bot] <su...@github.com>
---
 .../pom.xml                                             | 17 ++++++++++++++---
 .../verify.bsh                                          |  8 +++++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/pom.xml b/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/pom.xml
index 2a8e6520..749dd706 100644
--- a/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/pom.xml
+++ b/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/pom.xml
@@ -33,9 +33,20 @@
 
   <dependencies>
     <dependency>
-      <groupId>dom4j</groupId>
-      <artifactId>dom4j</artifactId>
-      <version>1.6.1</version>
+      <groupId>net.java.dev.msv</groupId>
+      <artifactId>xsdlib</artifactId>
+      <version>2022.7</version>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/verify.bsh b/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/verify.bsh
index 35957daa..0d4b88a2 100644
--- a/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/verify.bsh
+++ b/src/it/projects/mdep-779-analyze-only-verbose-shows-class-names/verify.bsh
@@ -23,9 +23,11 @@ String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
 
 log = StringUtils.unifyLineSeparators(log, "\n");
 
-String expected = "[WARNING] Used undeclared dependencies found:\n"
-                + "[WARNING]    xml-apis:xml-apis:jar:1.0.b2:compile\n"
-                + "[WARNING]       class org.apache.xmlcommons.Version\n";
+String expected = "Warning:  Used undeclared dependencies found:\n" +
+                  "Warning:     xml-apis:xml-apis:jar:1.4.01:compile\n" +
+                  "Warning:        class org.apache.xmlcommons.Version\n" +
+                  "Warning:  Unused declared dependencies found:\n" +
+                  "Warning:     net.java.dev.msv:xsdlib:jar:2022.7:compile";
 
 if ( !log.contains(expected) )
 {