commit 5fd536853fc945c63b267e2a92703d9b7bc8888b
author Guoxiong Li <lgxbslgx@gmail.com> Mon Sep 20 11:52:32 2021 +0800
committer Michael Osipov <michaelo@apache.org> Fri Sep 24 20:55:03 2021 +0200
tree ba27a258ca8962a6a3d6e14653f7111f906e5a9b
parent f50de4ce9edf333e844ddd3af92e34f3eac90606

[MNG-7248] Fix warnings issued by dependency:analyze

This changeset does intentionally not touch Guice and its dependencies
as well as test-scoped dependencies.

This closes #546

maven-compat/pom.xml

diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index d27b689..ed90947 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -79,6 +79,10 @@
       <artifactId>maven-resolver-impl</artifactId>
     </dependency>
     <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>

maven-core/pom.xml

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 77c5140..1ff00fa 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -131,11 +131,23 @@
       <artifactId>plexus-classworlds</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-interpolation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>

maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java

diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
index d4a489c..1f61441 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/building/FileModelSourceTest.java
@@ -22,7 +22,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.codehaus.plexus.util.Os;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -57,7 +57,7 @@
     public void testWindowsPaths()
             throws Exception
     {
-        assumeTrue( SystemUtils.IS_OS_WINDOWS );
+        assumeTrue( Os.isFamily( "Windows" ) );
 
         File upperCaseFile = createTempFile( "TESTE" );
         String absolutePath = upperCaseFile.getAbsolutePath();

maven-resolver-provider/pom.xml

diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index ad66af3..0027e34 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -36,10 +36,18 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
+      <artifactId>maven-builder-support</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
       <artifactId>maven-model-builder</artifactId>
     </dependency>
     <dependency>