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 2021/09/16 08:08:31 UTC
[maven] branch MNG-7252 created (now f9fea14)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MNG-7252
in repository https://gitbox.apache.org/repos/asf/maven.git.
at f9fea14 [MNG-7252] Fix warnings issued by dependency:analyze
This branch includes the following new commits:
new f9fea14 [MNG-7252] Fix warnings issued by dependency:analyze
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.
[maven] 01/01: [MNG-7252] Fix warnings issued 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 MNG-7252
in repository https://gitbox.apache.org/repos/asf/maven.git
commit f9fea14c38ad5b00e37d39373291777fcdc29ab7
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Sep 16 10:08:23 2021 +0200
[MNG-7252] Fix warnings issued by dependency:analyze
---
maven-core/pom.xml | 8 ++++++++
maven-embedder/pom.xml | 1 +
.../java/org/apache/maven/model/building/FileModelSourceTest.java | 4 ++--
maven-resolver-provider/pom.xml | 4 ----
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index b3f048b..748ce6c 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -120,6 +120,10 @@ under the License.
</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>
@@ -127,6 +131,10 @@ under the License.
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
<scope>test</scope>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 232bb90..7a3cc7e 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -114,6 +114,7 @@ under the License.
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
+ <!-- This is required for classpath scanning of annotated components -->
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
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 9b0ecd9..6c8ebe0 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 static junit.framework.TestCase.assertFalse;
import static junit.framework.TestCase.assertTrue;
-import org.apache.commons.lang3.SystemUtils;
+import org.codehaus.plexus.util.Os;;
import static org.junit.Assume.assumeTrue;
import org.junit.Test;
@@ -53,7 +53,7 @@ public class FileModelSourceTest
public void testWindowsPaths()
throws Exception
{
- assumeTrue( SystemUtils.IS_OS_WINDOWS );
+ assumeTrue( Os.isFamily( "Windows" ) );
File upperCaseFile = createTempFile( "TESTE" );
String absolutePath = upperCaseFile.getAbsolutePath();
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 70e0f4e..ca317a9 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -110,10 +110,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>