diff --git a/maven-core/pom.xml b/maven-core/pom.xml index b3f048b3c0..748ce6cd39 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -118,6 +118,10 @@ under the License. org.codehaus.plexus plexus-classworlds + + org.codehaus.plexus + plexus-interpolation + org.codehaus.plexus plexus-component-annotations @@ -126,6 +130,10 @@ under the License. org.apache.commons commons-lang3 + + org.slf4j + slf4j-api + commons-jxpath commons-jxpath diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml index 232bb90310..7a3cc7e0d1 100644 --- a/maven-embedder/pom.xml +++ b/maven-embedder/pom.xml @@ -114,6 +114,7 @@ under the License. javax.inject javax.inject + javax.annotation javax.annotation-api 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 9b0ecd9ddf..6c8ebe0e42 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 70e0f4e5bc..ca317a9ede 100644 --- a/maven-resolver-provider/pom.xml +++ b/maven-resolver-provider/pom.xml @@ -108,10 +108,6 @@ under the License. mockito-core test - - org.slf4j - slf4j-api - org.slf4j slf4j-simple