This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-6825
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 806733e6c0e196457c9007a90c7f72ed26b47f87
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sat Dec 21 14:32:13 2019 +0100
WIP - Replaced StringUtils/FileUtils with maven-shared-utils counterpart.
---
.../metadata/DefaultRepositoryMetadataManager.java | 4 +-
.../repository/metadata/MetadataBridge.java | 2 +-
.../maven/execution/DefaultRuntimeInformation.java | 2 +-
.../profiles/DefaultMavenProfilesBuilder.java | 14 +++----
.../DefaultModelInheritanceAssembler.java | 2 +-
.../repository/legacy/DefaultWagonManager.java | 2 +-
.../repository/legacy/LegacyRepositorySystem.java | 10 ++---
.../resolver/transform/SnapshotTransformation.java | 2 +-
.../usability/plugin/ExpressionDocumenter.java | 8 ++--
.../artifact/deployer/ArtifactDeployerTest.java | 2 +-
.../maven/artifact/testutils/TestFileManager.java | 23 +----------
.../repository/legacy/DefaultWagonManagerTest.java | 4 +-
maven-core/pom.xml | 4 ++
.../metadata/io/DefaultMetadataReader.java | 2 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 2 +-
.../maven/classrealm/DefaultClassRealmManager.java | 3 +-
.../maven/exception/DefaultExceptionHandler.java | 3 +-
.../DefaultMavenExecutionRequestPopulator.java | 4 +-
.../apache/maven/graph/DefaultGraphBuilder.java | 1 +
.../apache/maven/lifecycle/DefaultLifecycles.java | 3 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 2 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 10 ++++-
.../DefaultLifecycleTaskSegmentCalculator.java | 3 +-
.../lifecycle/internal/LifecycleDebugLogger.java | 2 +-
.../maven/lifecycle/internal/MojoExecutor.java | 2 +-
.../maven/lifecycle/mapping/LifecyclePhase.java | 3 +-
.../org/apache/maven/plugin/MojoExecution.java | 2 +-
.../maven/plugin/PluginExecutionException.java | 2 +-
.../maven/plugin/PluginParameterException.java | 2 +-
.../plugin/internal/DefaultMavenPluginManager.java | 31 +++++++++++---
.../DefaultPluginDependenciesResolver.java | 2 +-
.../internal/DefaultPluginVersionResolver.java | 2 +-
.../maven/project/DefaultProjectBuilder.java | 4 +-
.../DefaultProjectDependenciesResolver.java | 2 +-
.../org/apache/maven/project/ProjectSorter.java | 2 +-
.../project/artifact/ProjectArtifactMetadata.java | 2 +-
.../properties/internal/EnvironmentUtils.java | 3 +-
.../settings/DefaultMavenSettingsBuilder.java | 2 +-
.../maven/toolchain/java/JavaToolchainFactory.java | 2 +-
.../maven/toolchain/java/JavaToolchainImpl.java | 4 +-
.../artifact/handler/ArtifactHandlerTest.java | 2 +-
.../project/DefaultMavenProjectBuilderTest.java | 7 ++--
.../maven/project/harness/Xpp3DomNodeIterator.java | 2 +-
.../maven/repository/TestRepositoryConnector.java | 2 +-
.../maven/repository/TestRepositorySystem.java | 4 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 48 +++++++++++-----------
.../maven/cli/event/ExecutionEventLogger.java | 11 +++--
.../maven/cli/CLIManagerDocumentationTest.java | 5 +--
.../inheritance/DefaultInheritanceAssembler.java | 3 +-
.../apache/maven/model/io/DefaultModelReader.java | 2 -
.../apache/maven/model/merge/MavenModelMerger.java | 2 +-
.../normalization/DefaultModelNormalizer.java | 3 +-
.../model/plugin/DefaultReportingConverter.java | 7 ++--
.../profile/activation/FileProfileActivator.java | 5 +--
.../OperatingSystemProfileActivator.java | 3 +-
.../activation/PropertyProfileActivator.java | 5 +--
.../model/validation/DefaultModelValidator.java | 27 ++++++------
.../internal/DefaultVersionResolver.java | 31 +++++++-------
.../validation/DefaultSettingsValidator.java | 5 +--
60 files changed, 180 insertions(+), 177 deletions(-)
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
index 28ba94d..364a0b8 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
@@ -28,13 +28,13 @@ import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
import org.apache.maven.repository.legacy.UpdateCheckManager;
import org.apache.maven.repository.legacy.WagonManager;
+import org.apache.maven.shared.utils.ReaderFactory;
+import org.apache.maven.shared.utils.WriterFactory;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
index 0fd49dd..1683855 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.eclipse.aether.RepositoryException;
import org.eclipse.aether.metadata.AbstractMetadata;
import org.eclipse.aether.metadata.MergeableMetadata;
diff --git
a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
index cf93b0d..5e009b9 100644
---
a/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
+++
b/maven-compat/src/main/java/org/apache/maven/execution/DefaultRuntimeInformation.java
@@ -21,11 +21,11 @@ package org.apache.maven.execution;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
-import org.codehaus.plexus.util.StringUtils;
/**
* Describes runtime information about the application.
diff --git
a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
index 8ee9001..4d738b2 100644
---
a/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
+++
b/maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java
@@ -19,21 +19,21 @@ package org.apache.maven.profiles;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+
import org.apache.maven.profiles.io.xpp3.ProfilesXpp3Reader;
+import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.EnvarBasedValueSource;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-
/**
* DefaultMavenProfilesBuilder
*/
diff --git
a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index 0113562..1d4df4b 100644
---
a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++
b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -43,8 +43,8 @@ import org.apache.maven.model.Resource;
import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
import org.apache.maven.project.ModelUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index d8f590b..ea10c0e 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -34,6 +34,7 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.plugin.LegacySupport;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
@@ -52,7 +53,6 @@ import org.codehaus.plexus.component.annotations.Requirement;
import
org.codehaus.plexus.component.repository.exception.ComponentLifecycleException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
import org.eclipse.aether.ConfigurationProperties;
import org.eclipse.aether.util.ConfigUtils;
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index e4fff06..7400f53 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -35,7 +35,6 @@ import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.Authentication;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -50,14 +49,15 @@ import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
+import org.apache.maven.repository.ArtifactDoesNotExistException;
+import org.apache.maven.repository.ArtifactTransferFailedException;
+import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.repository.DelegatingLocalArtifactRepository;
import org.apache.maven.repository.LocalArtifactRepository;
-import org.apache.maven.repository.ArtifactTransferListener;
import org.apache.maven.repository.MirrorSelector;
import org.apache.maven.repository.Proxy;
import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.repository.ArtifactDoesNotExistException;
-import org.apache.maven.repository.ArtifactTransferFailedException;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.SettingsProblem;
@@ -65,6 +65,7 @@ import
org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecrypter;
import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
import org.apache.maven.settings.crypto.SettingsDecryptionResult;
+import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.proxy.ProxyUtils;
import org.codehaus.plexus.PlexusContainer;
@@ -72,7 +73,6 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.AuthenticationContext;
import org.eclipse.aether.repository.AuthenticationSelector;
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
index 895b952..808271c 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/SnapshotTransformation.java
@@ -36,8 +36,8 @@ import org.apache.maven.artifact.repository.metadata.Snapshot;
import
org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
diff --git
a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index f4e7bf9..a5a73c1 100644
---
a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++
b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -19,10 +19,6 @@ package org.apache.maven.usability.plugin;
* under the License.
*/
-import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -35,6 +31,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.maven.shared.utils.ReaderFactory;
+import org.apache.maven.usability.plugin.io.xpp3.ParamdocXpp3Reader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
/**
* ExpressionDocumenter
*/
diff --git
a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
index f929f48..dd6b8f7 100644
---
a/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java
@@ -24,7 +24,7 @@ import java.io.File;
import org.apache.maven.artifact.AbstractArtifactComponentTestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
/**
* @author <a href="mailto:ja...@maven.org";>Jason van Zyl</a>
diff --git
a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
index 9761e75..6c6b60a 100644
---
a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
+++
b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
@@ -19,33 +19,14 @@ package org.apache.maven.artifact.testutils;
* under the License.
*/
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
+import junit.framework.Assert;
+import org.apache.maven.shared.utils.io.FileUtils;
public class TestFileManager
{
diff --git
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
index 1b3cb79..4add3f2 100644
---
a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
+++
b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
@@ -29,11 +29,12 @@ import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.repository.ArtifactRepositoryFactory;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.UnsupportedProtocolException;
@@ -46,7 +47,6 @@ import org.apache.maven.wagon.observers.Debug;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
/**
* @author <a href="michal.mac...@dimatics.com">Michal Maczka</a>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 26ce514..fbc6e62 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-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
<dependency>
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
index 1d7241c..c22be31 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
+++
b/maven-core/src/main/java/org/apache/maven/artifact/repository/metadata/io/DefaultMetadataReader.java
@@ -31,7 +31,7 @@ import javax.inject.Singleton;
import org.apache.maven.artifact.repository.metadata.Metadata;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.apache.maven.shared.utils.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 752e659..b6902d0 100644
---
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
+++
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
@@ -57,7 +57,7 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.repository.Proxy;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Mirror;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.repository.AuthenticationContext;
import org.eclipse.aether.repository.AuthenticationSelector;
diff --git
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index cf3d746..f756ce6 100644
---
a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++
b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -34,19 +34,18 @@ import java.util.TreeMap;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.classrealm.ClassRealmRequest.RealmType;
import org.apache.maven.extension.internal.CoreExportsProvider;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.artifact.Artifact;
/**
diff --git
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
index ef3a452..7a46939 100644
---
a/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
+++
b/maven-core/src/main/java/org/apache/maven/exception/DefaultExceptionHandler.java
@@ -38,7 +38,8 @@ import org.apache.maven.plugin.PluginContainerException;
import org.apache.maven.plugin.PluginExecutionException;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingResult;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
+import org.codehaus.plexus.component.annotations.Component;
/*
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
index 399ee34..2e6b9dc 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequestPopulator.java
@@ -43,9 +43,7 @@ import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsUtils;
-//
-// Settings in core
-//
+import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.util.StringUtils;
diff --git
a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
index 2b9c60e..f5498c4 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/DefaultGraphBuilder.java
@@ -58,6 +58,7 @@ import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.dag.CycleDetectedException;
/**
* Builds the {@link ProjectDependencyGraph inter-dependencies graph} between
projects in the reactor.
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
index 601523f..238d84c 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycles.java
@@ -20,7 +20,6 @@ package org.apache.maven.lifecycle;
*/
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -31,6 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.maven.shared.utils.StringUtils;
+
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
index 279b2af..ed5cb37 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
@@ -57,7 +57,7 @@ import
org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolver;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
index 1201742..c2bc9fb 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
@@ -37,12 +37,20 @@ import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* <strong>NOTE:</strong> This class is not part of any public api and can be
changed or deleted without prior notice.
*
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
index e98e0fb..9f0cc9e 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleTaskSegmentCalculator.java
@@ -39,7 +39,8 @@ import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.prefix.NoPluginFoundForPrefixException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
+
+import org.apache.maven.shared.utils.StringUtils;
/**
* <p>
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
index 9ffb3d4..9b03fbf 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDebugLogger.java
@@ -34,8 +34,8 @@ import
org.apache.maven.lifecycle.internal.builder.BuilderCommon;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
/**
* <p>
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index 89fadfd..cba57a1 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -49,7 +49,7 @@ import org.apache.maven.plugin.PluginIncompatibleException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* <p>
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
index bf052c7..1db9e5b 100644
---
a/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
+++
b/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecyclePhase.java
@@ -25,7 +25,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
+
/**
* LifecyclePhase
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
index da07593..fa72c18 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.shared.utils.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
* MojoExecution
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
index a99fbbc..046cdd4 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/PluginExecutionException.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin;
import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Exception in the plugin manager.
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
index eaf02ec..46b92e3 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterException.java
@@ -27,7 +27,7 @@ import java.util.Properties;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* PluginParameterException
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
index 500ead6..976ca08 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
@@ -19,6 +19,29 @@ package org.apache.maven.plugin.internal;
* under the License.
*/
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.classrealm.ClassRealmManager;
@@ -59,6 +82,8 @@ import org.apache.maven.project.ExtensionDescriptorBuilder;
import org.apache.maven.project.MavenProject;
import org.apache.maven.rtinfo.RuntimeInformation;
import org.apache.maven.session.scope.internal.SessionScopeModule;
+import org.apache.maven.shared.utils.ReaderFactory;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@@ -76,8 +101,6 @@ import
org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.graph.DependencyFilter;
@@ -104,10 +127,6 @@ import java.util.Objects;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
/**
* Provides basic services to manage Maven plugins and their mojos. This
component is kept general in its design such
* that the plugins/mojos can be used in arbitrary contexts. In particular,
the mojos can be used for ordinary build
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
index d1f2834..e7918bf 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultPluginDependenciesResolver.java
@@ -33,8 +33,8 @@ import org.apache.maven.RepositoryUtils;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.PluginResolutionException;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
diff --git
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index 17186dd..606408f 100644
---
a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -43,8 +43,8 @@ import org.apache.maven.plugin.version.PluginVersionRequest;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolver;
import org.apache.maven.plugin.version.PluginVersionResult;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositoryEvent.EventType;
import org.eclipse.aether.RepositoryListener;
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index 1ebc1fc..fc712cc 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -67,8 +67,8 @@ import org.apache.maven.model.building.StringModelSource;
import org.apache.maven.model.resolution.ModelResolver;
import org.apache.maven.repository.internal.ArtifactDescriptorUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.Os;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.RequestTrace;
import org.eclipse.aether.impl.RemoteRepositoryManager;
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
index d6cc080..ec00226 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDependenciesResolver.java
@@ -34,8 +34,8 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.DefaultRepositorySystemSession;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
diff --git
a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
index 40cdf1b..1d04403 100644
--- a/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
+++ b/maven-core/src/main/java/org/apache/maven/project/ProjectSorter.java
@@ -32,7 +32,7 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Extension;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
diff --git
a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
index 7ea99bf..193e20c 100644
---
a/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
+++
b/maven-core/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
@@ -27,7 +27,7 @@ import
org.apache.maven.artifact.metadata.AbstractArtifactMetadata;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import
org.apache.maven.artifact.repository.metadata.RepositoryMetadataStoreException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
/**
* Attach a POM to an artifact.
diff --git
a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
index 2c3196f..6e4e2f6 100644
---
a/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
+++
b/maven-core/src/main/java/org/apache/maven/properties/internal/EnvironmentUtils.java
@@ -23,7 +23,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import org.codehaus.plexus.util.Os;
+import org.apache.maven.shared.utils.Os;
+
/**
* Assists the project builder. <strong>Warning:</strong> This is an internal
utility class that is only public for
diff --git
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
index 8b12796..57ae28c 100644
---
a/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
+++
b/maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
@@ -32,8 +32,8 @@ import
org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuilder;
import org.apache.maven.settings.building.SettingsBuildingException;
import org.apache.maven.settings.building.SettingsBuildingRequest;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
index f2e45a3..62fc34f 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainFactory.java
@@ -27,6 +27,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
import org.apache.maven.toolchain.RequirementMatcher;
import org.apache.maven.toolchain.RequirementMatcherFactory;
@@ -34,7 +35,6 @@ import org.apache.maven.toolchain.ToolchainFactory;
import org.apache.maven.toolchain.ToolchainPrivate;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
diff --git
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
index d047e7e..bb40514 100644
---
a/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
+++
b/maven-core/src/main/java/org/apache/maven/toolchain/java/JavaToolchainImpl.java
@@ -21,11 +21,11 @@ package org.apache.maven.toolchain.java;
import java.io.File;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.apache.maven.toolchain.DefaultToolchain;
import org.apache.maven.toolchain.model.ToolchainModel;
import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.Os;
/**
* JDK toolchain implementation.
diff --git
a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
index 2803d8d..ced4858 100644
---
a/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
+++
b/maven-core/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerTest.java
@@ -22,8 +22,8 @@ package org.apache.maven.artifact.handler;
import java.io.File;
import java.util.List;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.util.FileUtils;
public class ArtifactHandlerTest
extends PlexusTestCase
diff --git
a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index b2e314f..3a7cf81 100644
---
a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++
b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -18,8 +18,6 @@ package org.apache.maven.project;
* specific language governing permissions and limitations
* under the License.
*/
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
import java.io.File;
import java.util.ArrayList;
@@ -28,7 +26,10 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.junit.Assert.assertThat;
public class DefaultMavenProjectBuilderTest
extends AbstractMavenProjectTestCase
diff --git
a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
index d137af5..df00b6e 100644
---
a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
+++
b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java
@@ -28,7 +28,7 @@ import org.apache.commons.jxpath.ri.compiler.NodeTest;
import org.apache.commons.jxpath.ri.compiler.NodeTypeTest;
import org.apache.commons.jxpath.ri.model.NodeIterator;
import org.apache.commons.jxpath.ri.model.NodePointer;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
diff --git
a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
index cb1243c..5422c4d 100644
---
a/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
+++
b/maven-core/src/test/java/org/apache/maven/repository/TestRepositoryConnector.java
@@ -25,7 +25,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.eclipse.aether.artifact.Artifact;
import org.eclipse.aether.metadata.Metadata;
import org.eclipse.aether.repository.RemoteRepository;
diff --git
a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
index a3c1c0d..fface65 100644
---
a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
+++
b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
@@ -52,8 +52,8 @@ import
org.apache.maven.project.artifact.ArtifactWithDependencies;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
import org.eclipse.aether.RepositorySystemSession;
/**
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 44ab9ae..ea616a1 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -26,8 +26,8 @@ import java.util.Date;
import java.util.Locale;
import java.util.Properties;
+import org.apache.maven.shared.utils.Os;
import org.apache.maven.utils.Precondition;
-import org.codehaus.plexus.util.Os;
import org.slf4j.Logger;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index cbdf47f..872c02d 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -19,6 +19,29 @@ package org.apache.maven.cli;
* under the License.
*/
+import java.io.BufferedInputStream;
+import java.io.Console;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import com.google.inject.AbstractModule;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
@@ -65,6 +88,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.properties.internal.SystemProperties;
import org.apache.maven.session.scope.internal.SessionScopeModule;
+import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.logging.MessageBuilder;
import org.apache.maven.shared.utils.logging.MessageUtils;
import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
@@ -80,7 +104,6 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.LoggerManager;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.eclipse.aether.transfer.TransferListener;
import org.slf4j.ILoggerFactory;
@@ -92,29 +115,6 @@ import
org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
-import java.io.BufferedInputStream;
-import java.io.Console;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import static org.apache.maven.cli.ResolveFile.resolveFile;
import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
diff --git
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index f3cd858..57d8827 100644
---
a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++
b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -19,10 +19,6 @@ package org.apache.maven.cli.event;
* under the License.
*/
-import static org.apache.maven.cli.CLIReportingUtils.formatDuration;
-import static org.apache.maven.cli.CLIReportingUtils.formatTimestamp;
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
import java.util.List;
import java.util.Objects;
@@ -38,12 +34,15 @@ import org.apache.maven.logwrapper.MavenSlf4jWrapperFactory;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.logging.MessageBuilder;
-import org.codehaus.plexus.util.StringUtils;
-import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.maven.cli.CLIReportingUtils.formatDuration;
+import static org.apache.maven.cli.CLIReportingUtils.formatTimestamp;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
/**
* Logs execution events to logger, eventually user-supplied.
*
diff --git
a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
index 2c82a72..8a50f98 100644
---
a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
+++
b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerDocumentationTest.java
@@ -27,10 +27,9 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.commons.cli.Option;
-import org.codehaus.plexus.util.FileUtils;
-
import junit.framework.TestCase;
+import org.apache.commons.cli.Option;
+import org.apache.maven.shared.utils.io.FileUtils;
/**
* Pseudo test to generate documentation fragment about supported CLI options.
TODO such documentation generation code
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
index ae5ac0b..49585c2 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
@@ -28,7 +28,6 @@ import java.util.Properties;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBase;
@@ -39,7 +38,7 @@ import org.apache.maven.model.Reporting;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.merge.MavenModelMerger;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Handles inheritance of model values.
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index b0778d8..d17285a 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -29,12 +29,10 @@ import java.util.Objects;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.InputSource;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3ReaderEx;
-import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
index 049ce1f..7ba90dd 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
@@ -46,7 +46,7 @@ import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryBase;
import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* The domain-specific model merger for the Maven POM, overriding generic code
from parent class when necessary with
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
index 9f86c09..43f15fc 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
@@ -27,7 +27,6 @@ import java.util.Map;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.Build;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
@@ -35,7 +34,7 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.merge.MavenModelMerger;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Handles normalization of a model.
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
index 04b414b..9b9b593 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
@@ -21,7 +21,6 @@ package org.apache.maven.model.plugin;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.Build;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.InputSource;
@@ -32,11 +31,11 @@ import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.ReportSet;
import org.apache.maven.model.Reporting;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.model.building.ModelProblemCollector;
-import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.model.building.ModelProblemCollector;
+import org.apache.maven.model.building.ModelProblemCollectorRequest;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
index abfa57e..15dbbc4 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
@@ -24,20 +24,19 @@ import java.io.File;
import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
+import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.apache.maven.model.path.PathTranslator;
import org.apache.maven.model.profile.ProfileActivationContext;
+import org.apache.maven.shared.utils.StringUtils;
import org.codehaus.plexus.interpolation.AbstractValueSource;
import org.codehaus.plexus.interpolation.MapBasedValueSource;
import org.codehaus.plexus.interpolation.RegexBasedInterpolator;
-import org.codehaus.plexus.util.StringUtils;
/**
* Determines profile activation based on the existence/absence of some file.
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
index e53141e..8ccc0e6 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/OperatingSystemProfileActivator.java
@@ -21,13 +21,12 @@ package org.apache.maven.model.profile.activation;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationOS;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.profile.ProfileActivationContext;
-import org.codehaus.plexus.util.Os;
+import org.apache.maven.shared.utils.Os;
/**
* Determines profile activation based on the operating system of the current
runtime platform.
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
index 671a096..e329823 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/PropertyProfileActivator.java
@@ -21,16 +21,15 @@ package org.apache.maven.model.profile.activation;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationProperty;
import org.apache.maven.model.Profile;
-import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
+import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.apache.maven.model.profile.ProfileActivationContext;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* Determines profile activation based on the existence or value of some
execution property.
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
index ad7e3c7..599f7a6 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
@@ -19,6 +19,18 @@ package org.apache.maven.model.validation;
* under the License.
*/
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
import org.apache.maven.model.Activation;
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Build;
@@ -45,21 +57,8 @@ import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import
org.apache.maven.model.interpolation.AbstractStringBasedModelInterpolator;
-import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author <a href="mailto:tryg...@inamo.no";>Trygve Laugstøl</a>
diff --git
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
index d307c55..f04717d 100644
---
a/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
+++
b/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
@@ -19,11 +19,25 @@ package org.apache.maven.repository.internal;
* under the License.
*/
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotVersion;
import org.apache.maven.artifact.repository.metadata.Versioning;
import
org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
import org.eclipse.aether.RepositoryCache;
import org.eclipse.aether.RepositoryEvent;
import org.eclipse.aether.RepositoryEvent.EventType;
@@ -51,21 +65,6 @@ import org.eclipse.aether.spi.locator.Service;
import org.eclipse.aether.spi.locator.ServiceLocator;
import org.eclipse.aether.util.ConfigUtils;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
/**
* @author Benjamin Bentmann
*/
diff --git
a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
index 2aec1e1..a1240cd 100644
---
a/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
+++
b/maven-settings-builder/src/main/java/org/apache/maven/settings/validation/DefaultSettingsValidator.java
@@ -25,16 +25,15 @@ import java.util.Set;
import javax.inject.Named;
import javax.inject.Singleton;
-
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Profile;
-import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.building.SettingsProblem.Severity;
import org.apache.maven.settings.building.SettingsProblemCollector;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author Milos Kleint
