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 2022/07/18 16:42:42 UTC

[maven] branch clean-up-dependency-warnings updated (553913d24 -> 4861e1955)

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

michaelo pushed a change to branch clean-up-dependency-warnings
in repository https://gitbox.apache.org/repos/asf/maven.git


    omit 553913d24 Clean up dependency warnings by dependency:analyze
     add 03b1faff7 [MNG-7511] Ensure the degreeOfConcurrency is a positive number in MavenExecutionRequest
     add efa9f0c67 [MNG-7513] Address commons-io_commons-io vulnerability found in maven latest version
     add 8ff8ebcae [MNG-7515] Cannot see a dependency tree for apache-maven module
     new 4861e1955 Clean up dependency warnings by dependency:analyze

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   (553913d24)
            \
             N -- N -- N   refs/heads/clean-up-dependency-warnings (4861e1955)

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:
 apache-maven/pom.xml                               |  8 +--
 maven-core/pom.xml                                 | 10 ++++
 .../maven/lifecycle/internal/LifecycleStarter.java |  2 +-
 .../multithreaded/MultiThreadedBuilder.java        |  2 +-
 .../maven/execution/DefaultMavenExecutionTest.java |  1 +
 .../apache/maven/project/ProjectBuilderTest.java   | 48 +++++++--------
 maven-embedder/pom.xml                             |  5 ++
 .../main/java/org/apache/maven/cli/CLIManager.java |  2 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   | 68 +++++++++++++++++-----
 .../java/org/apache/maven/cli/MavenCliTest.java    | 45 ++++++++++----
 pom.xml                                            | 20 +++++++
 11 files changed, 152 insertions(+), 59 deletions(-)


[maven] 01/01: Clean up dependency warnings by dependency:analyze

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

michaelo pushed a commit to branch clean-up-dependency-warnings
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 4861e1955891fb4ec311c2cd202fc5f275322032
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jul 17 21:03:52 2022 +0200

    Clean up dependency warnings by dependency:analyze
---
 maven-core/pom.xml              |  9 +----
 maven-embedder/pom.xml          | 14 +++++++
 maven-settings-builder/pom.xml  |  4 ++
 maven-toolchain-builder/pom.xml | 84 +++++++++++++++++++++--------------------
 4 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 61461c8ab..62c33d2d8 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -48,14 +48,11 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings-builder</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-builder-support</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-toolchain-model</artifactId>
     </dependency>
+    <!-- Used for Javadoc in a deprecated class only -->
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-toolchain-builder</artifactId>
@@ -138,10 +135,6 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interpolation</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index d49eb8f62..240db27cd 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -42,6 +42,10 @@ under the License.
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings-builder</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-toolchain-builder</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
@@ -130,6 +134,10 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-cipher</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -168,6 +176,12 @@ under the License.
       <artifactId>jansi</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.6</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index be3107e6f..669c3a99c 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -65,6 +65,10 @@ under the License.
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-sec-dispatcher</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-cipher</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/maven-toolchain-builder/pom.xml b/maven-toolchain-builder/pom.xml
index 5dcbea2d3..df19e6d54 100644
--- a/maven-toolchain-builder/pom.xml
+++ b/maven-toolchain-builder/pom.xml
@@ -22,49 +22,53 @@ under the License.
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>maven</artifactId>
-        <groupId>org.apache.maven</groupId>
-        <version>4.0.0-alpha-1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>maven</artifactId>
+    <groupId>org.apache.maven</groupId>
+    <version>4.0.0-alpha-1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>maven-toolchain-builder</artifactId>
+  <artifactId>maven-toolchain-builder</artifactId>
 
-    <name>Maven Toolchain Builder</name>
-    <description>The effective toolchain builder.</description>
+  <name>Maven Toolchain Builder</name>
+  <description>The effective toolchain builder.</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-toolchain-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-builder-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-interpolation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-toolchain-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-builder-support</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.sisu</groupId>
-                <artifactId>sisu-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.sisu</groupId>
+        <artifactId>sisu-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>