[MNG-7650] Reformat

apache-maven/src/test/java/org/apache/maven/settings/GlobalSettingsTest.java

@@ -18,16 +18,17 @@
  */
 package org.apache.maven.settings;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+
 import org.apache.maven.settings.v4.SettingsXpp3Reader;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Tests that the global settings.xml shipped with the distribution is in good state.
  *

api/maven-api-core/src/main/java/org/apache/maven/api/DependencyCoordinate.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Collection;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/Event.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 

api/maven-api-core/src/main/java/org/apache/maven/api/LocalRepository.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/MojoExecution.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.model.Plugin;

api/maven-api-core/src/main/java/org/apache/maven/api/Node.java

@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/Project.java

@@ -21,6 +21,7 @@ package org.apache.maven.api;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.model.Build;

api/maven-api-core/src/main/java/org/apache/maven/api/ResolutionScope.java

@@ -26,6 +26,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/Scope.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Locale;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/Session.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.ThreadSafe;

api/maven-api-core/src/main/java/org/apache/maven/api/SessionData.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.function.Supplier;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.Nullable;

api/maven-api-core/src/main/java/org/apache/maven/api/Toolchain.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api;
 
 import java.util.Map;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Component.java

@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Execute.java

@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Mojo.java

@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.ResolutionScope;
 import org.apache.maven.api.annotations.Experimental;
 

api/maven-api-core/src/main/java/org/apache/maven/api/plugin/annotations/Parameter.java

@@ -24,6 +24,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactCoordinateFactoryRequest.java

@@ -18,8 +18,6 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
@@ -27,6 +25,8 @@ import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for creating a {@link ArtifactCoordinate} object.
  *

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployer.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.Collection;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Service;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactDeployerRequest.java

@@ -18,9 +18,8 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Session;
@@ -28,6 +27,8 @@ import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for deploying one or more artifacts to a remote repository.
  *

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactFactoryRequest.java

@@ -18,14 +18,14 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  *
  *

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstaller.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
 
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactInstallerRequest.java

@@ -18,10 +18,9 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
@@ -30,6 +29,8 @@ import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for installing one or more artifacts in the local repository.
  *

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactManager.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
 
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolver.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.Collection;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverRequest.java

@@ -18,9 +18,8 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.Collection;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
@@ -28,6 +27,8 @@ import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request for resolving an artifact.
  *

api/maven-api-core/src/main/java/org/apache/maven/api/services/ArtifactResolverResult.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
 
 import java.nio.file.Path;
 import java.util.Map;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/BaseRequest.java

@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorRequest.java

@@ -18,13 +18,12 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.DependencyCoordinate;
 import org.apache.maven.api.Project;
@@ -35,6 +34,8 @@ import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * A request to collect the transitive dependencies and to build a dependency graph from them. There are three ways to
  * create a dependency graph. First, only the root dependency can be given. Second, a root dependency and direct

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCollectorResult.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.List;
+
 import org.apache.maven.api.Node;
 import org.apache.maven.api.annotations.Experimental;
 

api/maven-api-core/src/main/java/org/apache/maven/api/services/DependencyCoordinateFactoryRequest.java

@@ -18,11 +18,10 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Dependency;
 import org.apache.maven.api.Exclusion;
@@ -32,6 +31,8 @@ import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  *
  * @since 4.0

api/maven-api-core/src/main/java/org/apache/maven/api/services/LocalRepositoryManager.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.LocalRepository;
 import org.apache.maven.api.RemoteRepository;

api/maven-api-core/src/main/java/org/apache/maven/api/services/Lookup.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
 
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.api.Service;
 
 public interface Lookup extends Service {

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilder.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Service;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderRequest.java

@@ -18,10 +18,9 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.ArtifactCoordinate;
 import org.apache.maven.api.Session;
@@ -31,6 +30,8 @@ import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * Request used to build a {@link org.apache.maven.api.Project} using
  * the {@link ProjectBuilder} service.

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectBuilderResult.java

@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
+
 import org.apache.maven.api.Project;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ProjectManager.java

@@ -22,6 +22,7 @@ import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+
 import org.apache.maven.api.Artifact;
 import org.apache.maven.api.Node;
 import org.apache.maven.api.Project;

api/maven-api-core/src/main/java/org/apache/maven/api/services/Prompter.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.List;
+
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
 

api/maven-api-core/src/main/java/org/apache/maven/api/services/RepositoryFactory.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.LocalRepository;
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.Service;

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilder.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.nio.file.Path;
+
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderRequest.java

@@ -18,10 +18,9 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
@@ -29,6 +28,8 @@ import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 /**
  * Collects settings that control the building of effective settings.
  */

api/maven-api-core/src/main/java/org/apache/maven/api/services/SettingsBuilderResult.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.List;
+
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.settings.Settings;
 

api/maven-api-core/src/main/java/org/apache/maven/api/services/Source.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.services;
 
 import java.io.IOException;
 import java.io.InputStream;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainManager.java

@@ -21,6 +21,7 @@ package org.apache.maven.api.services;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+
 import org.apache.maven.api.Service;
 import org.apache.maven.api.Session;
 import org.apache.maven.api.Toolchain;

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderRequest.java

@@ -18,15 +18,16 @@
  */
 package org.apache.maven.api.services;
 
-import static org.apache.maven.api.services.BaseRequest.nonNull;
-
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.Session;
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.annotations.NotThreadSafe;
 import org.apache.maven.api.annotations.Nullable;
 
+import static org.apache.maven.api.services.BaseRequest.nonNull;
+
 public interface ToolchainsBuilderRequest {
     @Nonnull
     Session getSession();

api/maven-api-core/src/main/java/org/apache/maven/api/services/ToolchainsBuilderResult.java

@@ -19,6 +19,7 @@
 package org.apache.maven.api.services;
 
 import java.util.List;
+
 import org.apache.maven.api.annotations.Nonnull;
 import org.apache.maven.api.toolchain.PersistedToolchains;
 

api/maven-api-core/src/main/java/org/apache/maven/api/services/Transport.java

@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Optional;
+
 import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.annotations.Consumer;
 import org.apache.maven.api.annotations.Experimental;

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlFactory.java

@@ -25,6 +25,7 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.nio.file.Path;
+
 import org.apache.maven.api.Service;
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlReaderRequest.java

@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.net.URL;
 import java.nio.file.Path;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

api/maven-api-core/src/main/java/org/apache/maven/api/services/xml/XmlWriterRequest.java

@@ -21,6 +21,7 @@ package org.apache.maven.api.services.xml;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.nio.file.Path;
+
 import org.apache.maven.api.annotations.Experimental;
 
 /**

api/maven-api-xml/src/main/java/org/apache/maven/api/xml/Dom.java

@@ -20,6 +20,7 @@ package org.apache.maven.api.xml;
 
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.api.annotations.Experimental;
 import org.apache.maven.api.annotations.Immutable;
 import org.apache.maven.api.annotations.Nonnull;

api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/Helper.java

@@ -21,6 +21,7 @@ package org.codehaus.modello.plugin.velocity;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import org.codehaus.modello.ModelloRuntimeException;
 import org.codehaus.modello.model.ModelAssociation;
 import org.codehaus.modello.model.ModelClass;

api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/ModelloVelocityMojo.java

@@ -25,6 +25,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.stream.Collectors;
+
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;

api/modello-plugin-velocity/src/main/java/org/codehaus/modello/plugin/velocity/VelocityGenerator.java

@@ -27,6 +27,7 @@ import java.nio.file.Paths;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
+
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.runtime.RuntimeInstance;

maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java

@@ -22,6 +22,7 @@ import java.io.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java

@@ -24,6 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
+
 import org.apache.commons.lang3.Validate;
 import org.apache.maven.artifact.versioning.VersionRange;
 

maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java

@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.artifact.handler.ArtifactHandler;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.repository;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java

@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
 
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java

@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java

@@ -18,10 +18,10 @@
  */
 package org.apache.maven.artifact.versioning;
 
-import static org.apache.commons.lang3.math.NumberUtils.isDigits;
-
 import java.util.StringTokenizer;
 
+import static org.apache.commons.lang3.math.NumberUtils.isDigits;
+
 /**
  * Default implementation of artifact versioning.
  *

maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.versioning;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;

maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.WeakHashMap;
+
 import org.apache.maven.artifact.Artifact;
 
 /**

maven-artifact/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java

@@ -18,17 +18,18 @@
  */
 package org.apache.maven.artifact;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.junit.jupiter.api.Test;
-
 /**
  * Tests {@link ArtifactUtils}.
  *

maven-artifact/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java

@@ -18,15 +18,15 @@
  */
 package org.apache.maven.artifact;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import org.apache.maven.artifact.handler.ArtifactHandlerMock;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class DefaultArtifactTest {
 
     private DefaultArtifact artifact;

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionIT.java

@@ -18,8 +18,6 @@
  */
 package org.apache.maven.artifact.versioning;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.nio.file.FileVisitResult;
@@ -29,8 +27,11 @@ import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.regex.Pattern;
+
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ComparableVersionIT {
 
     @Test

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/ComparableVersionTest.java

@@ -18,12 +18,13 @@
  */
 package org.apache.maven.artifact.versioning;
 
+import java.util.Locale;
+
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.Locale;
-import org.junit.jupiter.api.Test;
-
 /**
  * Test ComparableVersion.
  *

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java

@@ -18,12 +18,12 @@
  */
 package org.apache.maven.artifact.versioning;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.jupiter.api.Test;
-
 /**
  * Test DefaultArtifactVersion.
  *

maven-artifact/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java

@@ -18,6 +18,11 @@
  */
 package org.apache.maven.artifact.versioning;
 
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -25,10 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.List;
-import org.apache.maven.artifact.Artifact;
-import org.junit.jupiter.api.Test;
-
 /**
  * Tests version range construction.
  *

maven-bom/pom.xml

@@ -23,7 +23,7 @@ under the License.
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
     <version>39</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <artifactId>maven-bom</artifactId>

maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemCollectorTest.java

@@ -18,13 +18,13 @@
  */
 package org.apache.maven.building;
 
+import org.apache.maven.building.Problem.Severity;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.apache.maven.building.Problem.Severity;
-import org.junit.jupiter.api.Test;
-
 public class DefaultProblemCollectorTest {
 
     @Test

maven-builder-support/src/test/java/org/apache/maven/building/DefaultProblemTest.java

@@ -18,13 +18,13 @@
  */
 package org.apache.maven.building;
 
+import org.apache.maven.building.Problem.Severity;
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
-import org.apache.maven.building.Problem.Severity;
-import org.junit.jupiter.api.Test;
-
 public class DefaultProblemTest {
 
     @Test

maven-builder-support/src/test/java/org/apache/maven/building/FileSourceTest.java

@@ -18,14 +18,15 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.io.File;
 import java.io.InputStream;
 import java.util.Scanner;
+
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class FileSourceTest {
 
     @Test

maven-builder-support/src/test/java/org/apache/maven/building/ProblemCollectorFactoryTest.java

@@ -18,12 +18,13 @@
  */
 package org.apache.maven.building;
 
+import java.util.Collections;
+
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 
-import java.util.Collections;
-import org.junit.jupiter.api.Test;
-
 public class ProblemCollectorFactoryTest {
 
     @Test

maven-builder-support/src/test/java/org/apache/maven/building/StringSourceTest.java

@@ -18,12 +18,13 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.io.InputStream;
 import java.util.Scanner;
+
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class StringSourceTest {
     @Test
     public void testGetInputStream() throws Exception {

maven-builder-support/src/test/java/org/apache/maven/building/UrlSourceTest.java

@@ -18,15 +18,16 @@
  */
 package org.apache.maven.building;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Scanner;
+
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class UrlSourceTest {
 
     @Test

maven-compat/src/main/java/org/apache/maven/artifact/deployer/ArtifactDeployer.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.deployer;
 
 import java.io.File;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-compat/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.deployer;
 import java.io.File;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;

maven-compat/src/main/java/org/apache/maven/artifact/installer/ArtifactInstaller.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.installer;
 
 import java.io.File;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-compat/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.installer;
 
 import java.io.File;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;

maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.manager;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;

maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.manager;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.wagon.ResourceDoesNotExistException;

maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.repository;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;

maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java

@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.apache.maven.artifact.UnknownRepositoryLayoutException;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.plugin.LegacySupport;

maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java

@@ -27,6 +27,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;

maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java

@@ -20,6 +20,7 @@ package org.apache.maven.artifact.repository.metadata;
 
 import java.util.Iterator;
 import java.util.List;
+
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
 /**

maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.repository.metadata;
 import java.io.File;
 import java.util.Collections;
 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;

maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactCollector.java

@@ -20,6 +20,7 @@ package org.apache.maven.artifact.resolver;
 
 import java.util.List;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;

maven-compat/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.versioning.VersionRange;
 import org.codehaus.plexus.logging.Logger;

maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java

@@ -35,6 +35,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
+
 import org.apache.maven.RepositoryUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;

maven-compat/src/main/java/org/apache/maven/artifact/resolver/UnresolvedArtifacts.java

@@ -19,6 +19,7 @@
 package org.apache.maven.artifact.resolver;
 
 import java.util.List;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 

maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.resolver.filter;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Set;
+
 import org.apache.maven.artifact.Artifact;
 
 /**

maven-compat/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java

@@ -21,6 +21,7 @@ package org.apache.maven.artifact.versioning;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+
 import org.apache.maven.artifact.Artifact;
 
 /**

maven-compat/src/main/java/org/apache/maven/profiles/DefaultMavenProfilesBuilder.java

@@ -23,6 +23,7 @@ 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.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.interpolation.EnvarBasedValueSource;

maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java

@@ -23,6 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.building.ModelProblem;

maven-compat/src/main/java/org/apache/maven/profiles/MavenProfilesBuilder.java

@@ -20,6 +20,7 @@ package org.apache.maven.profiles;
 
 import java.io.File;
 import java.io.IOException;
+
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 /**

maven-compat/src/main/java/org/apache/maven/profiles/ProfileManager.java

@@ -21,6 +21,7 @@ package org.apache.maven.profiles;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.apache.maven.model.Profile;
 import org.apache.maven.profiles.activation.ProfileActivationException;
 

maven-compat/src/main/java/org/apache/maven/profiles/ProfilesConversionUtils.java

@@ -19,6 +19,7 @@
 package org.apache.maven.profiles;
 
 import java.util.List;
+
 import org.apache.maven.model.Activation;
 import org.apache.maven.model.ActivationFile;
 import org.apache.maven.model.ActivationProperty;