[maven] branch MNG-6825 updated: Fixed issues.

[khmarbaise]

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


The following commit(s) were added to refs/heads/MNG-6825 by this push:
     new 581c3e9  Fixed issues.
581c3e9 is described below

commit 581c3e9aa71fd1ea360d0f7ca4c03dd49ee4d022
Author: Karl Heinz Marbaise <khmarba...@apache.org>
AuthorDate: Sun Apr 5 00:42:30 2020 +0200

    Fixed issues.
---
 .../execution/DefaultMavenExecutionRequestPopulator.java | 16 ++++++++--------
 .../maven/rtinfo/internal/DefaultRuntimeInformation.java |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

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 2e6b9dc..2adb061 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
@@ -26,17 +26,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import org.apache.maven.artifact.InvalidRepositoryException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.bridge.MavenRepositorySystem;
 import org.apache.maven.repository.RepositorySystem;
-//
-// All of this needs to go away and be couched in terms of the execution 
request
-//
 import org.apache.maven.settings.Mirror;
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Repository;
@@ -46,7 +39,14 @@ import org.apache.maven.settings.SettingsUtils;
 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;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+//
+// All of this needs to go away and be couched in terms of the execution 
request
+//
 
 /**
  * Assists in populating an execution request for invocation of Maven.
diff --git 
a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
 
b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
index 348bc68..9747035 100644
--- 
a/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
+++ 
b/maven-core/src/main/java/org/apache/maven/rtinfo/internal/DefaultRuntimeInformation.java
@@ -25,8 +25,6 @@ import java.util.Properties;
 
 import org.apache.maven.rtinfo.RuntimeInformation;
 import org.apache.maven.utils.Precondition;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
@@ -38,6 +36,8 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
 
+import static org.apache.maven.utils.Precondition.isNotEmpty;
+
 /**
  * Provides information about the current Maven runtime.
  */