Upgrade to maven parent 39 and reformat accordingly

build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java

@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
+
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;

client/pom.xml

@@ -32,8 +32,8 @@
 
   <properties>
     <maven.compiler.release>11</maven.compiler.release>
-    <graalvm-native-static-opt/>
-    <graalvm-native-glibc-opt/>
+    <graalvm-native-static-opt />
+    <graalvm-native-glibc-opt />
   </properties>
 
   <dependencies>

client/src/main/java/org/mvndaemon/mvnd/client/Client.java

@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.client;
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.mvndaemon.mvnd.common.logging.ClientOutput;
 
 public interface Client {

client/src/main/java/org/mvndaemon/mvnd/client/DaemonClientConnection.java

@@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
+
 import org.mvndaemon.mvnd.common.DaemonConnection;
 import org.mvndaemon.mvnd.common.DaemonException;
 import org.mvndaemon.mvnd.common.DaemonException.ConnectException;

client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java

@@ -18,9 +18,6 @@
  */
 package org.mvndaemon.mvnd.client;
 
-import static java.lang.Thread.sleep;
-import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -45,6 +42,7 @@ import java.util.Scanner;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
+
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
 import org.mvndaemon.mvnd.common.DaemonConnection;
@@ -62,6 +60,9 @@ import org.mvndaemon.mvnd.common.logging.ClientOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.lang.Thread.sleep;
+import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
+
 /**
  * File origin:
  * https://github.com/gradle/gradle/blob/v5.6.2/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonConnector.java

client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java

@@ -40,6 +40,7 @@ import java.util.function.IntUnaryOperator;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.maven.cli.internal.extension.model.CoreExtension;
 import org.apache.maven.cli.internal.extension.model.io.xpp3.CoreExtensionsXpp3Reader;
 import org.codehaus.plexus.util.StringUtils;

client/src/test/java/org/mvndaemon/mvnd/client/CompletionGeneratorTest.java

@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.common.Environment.OptionOrigin;

client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java

@@ -18,11 +18,11 @@
  */
 package org.mvndaemon.mvnd.client;
 
+import org.junit.jupiter.api.Test;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.jupiter.api.Test;
-
 public class DaemonConnectorTest {
 
     @Test

client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java

@@ -18,8 +18,6 @@
  */
 package org.mvndaemon.mvnd.client;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,12 +25,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.client.DaemonParameters.EnvValue;
 import org.mvndaemon.mvnd.client.DaemonParameters.ValueSource;
 import org.mvndaemon.mvnd.common.Environment;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class EnvironmentTest {
 
     @Test

common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java

@@ -34,6 +34,7 @@ import java.nio.channels.SocketChannel;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

common/src/main/java/org/mvndaemon/mvnd/common/DaemonInfo.java

@@ -18,11 +18,11 @@
  */
 package org.mvndaemon.mvnd.common;
 
+import java.util.List;
+
 import static org.mvndaemon.mvnd.common.DaemonState.Busy;
 import static org.mvndaemon.mvnd.common.DaemonState.Idle;
 
-import java.util.List;
-
 /**
  * File origin:
  * https://github.com/gradle/gradle/blob/v5.6.2/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/registry/DaemonInfo.java

common/src/main/java/org/mvndaemon/mvnd/common/DaemonRegistry.java

@@ -18,9 +18,6 @@
  */
 package org.mvndaemon.mvnd.common;
 
-import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
-import static org.mvndaemon.mvnd.common.DaemonState.Idle;
-
 import java.io.IOException;
 import java.lang.management.ManagementFactory;
 import java.nio.BufferOverflowException;
@@ -42,9 +39,13 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
+import static org.mvndaemon.mvnd.common.DaemonState.Idle;
+
 /**
  * Access to daemon registry files. Useful also for testing.
  *

common/src/main/java/org/mvndaemon/mvnd/common/OptionType.java

@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.util.Comparator;
 import java.util.Properties;
 import java.util.stream.Stream;
+
 import org.mvndaemon.mvnd.common.Environment.DocumentedEnumEntry;
 
 public enum OptionType {

common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java

@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

common/src/main/java/org/mvndaemon/mvnd/common/logging/ClientOutput.java

@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.common.logging;
 
 import java.util.List;
 import java.util.function.Consumer;
+
 import org.mvndaemon.mvnd.common.Message;
 
 /**

common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java

@@ -38,6 +38,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Consumer;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+
 import org.fusesource.jansi.internal.CLibrary;
 import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;

common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java

@@ -18,10 +18,6 @@
  */
 package org.mvndaemon.mvnd.common;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -36,10 +32,15 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Random;
 import java.util.UUID;
+
 import org.junit.jupiter.api.AfterEach;
 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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class DaemonRegistryTest {
 
     private PrintStream oldSysErr;

common/src/test/java/org/mvndaemon/mvnd/common/MessageTest.java

@@ -18,17 +18,18 @@
  */
 package org.mvndaemon.mvnd.common;
 
-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 java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
+
 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 MessageTest {
 
     @Test

common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java

@@ -18,17 +18,18 @@
  */
 package org.mvndaemon.mvnd.common;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.UnknownHostException;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledForJreRange;
 import org.junit.jupiter.api.condition.JRE;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class SocketFamilyTest {
 
     @Test

common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java

@@ -18,11 +18,12 @@
  */
 package org.mvndaemon.mvnd.common;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.time.Duration;
+
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class TimeUtilsTest {
 
     @Test

daemon/src/main/java/org/apache/maven/classrealm/MvndClassRealmManager.java

@@ -18,6 +18,10 @@
  */
 package org.apache.maven.classrealm;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
@@ -29,9 +33,7 @@ import java.util.Objects;
 import java.util.Random;
 import java.util.Set;
 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.extension.internal.CoreExportsProvider;
 import org.apache.maven.model.Model;

daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java

@@ -18,10 +18,6 @@
  */
 package org.apache.maven.cli;
 
-import static java.util.Comparator.comparing;
-import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
-
-import com.google.inject.AbstractModule;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -43,6 +39,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import com.google.inject.AbstractModule;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
@@ -111,6 +109,9 @@ import org.slf4j.LoggerFactory;
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
 import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
 
+import static java.util.Comparator.comparing;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
+
 /**
  * File origin:
  * https://github.com/apache/maven/blob/maven-3.6.2/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

daemon/src/main/java/org/apache/maven/cli/MvndHelpFormatter.java

@@ -28,6 +28,7 @@ import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.commons.cli.HelpFormatter;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.common.OptionType;

daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java

@@ -18,6 +18,10 @@
  */
 package org.apache.maven.project;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.AbstractMap;
@@ -32,9 +36,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-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.artifact.InvalidArtifactRTException;

daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java

@@ -34,6 +34,7 @@ import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.project.MavenProject;

daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectComparator.java

@@ -28,6 +28,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.function.ToLongFunction;
+
 import org.apache.maven.project.MavenProject;
 
 /**

daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectExecutorService.java

@@ -29,6 +29,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+
 import org.apache.maven.lifecycle.internal.BuildThreadFactory;
 import org.apache.maven.project.MavenProject;
 

daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildQueue.java

@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Stream;
+
 import org.apache.maven.project.MavenProject;
 
 /**

daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildStats.java

@@ -18,7 +18,6 @@
  */
 package org.mvndaemon.mvnd.builder;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -30,6 +29,8 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import com.google.common.collect.ImmutableMap;
 import org.apache.maven.project.MavenProject;
 
 /**

daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java

@@ -18,6 +18,10 @@
  */
 package org.mvndaemon.mvnd.builder;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +30,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.lifecycle.internal.LifecycleModuleBuilder;
 import org.apache.maven.lifecycle.internal.ProjectBuildList;

daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilderImpl.java

@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
+
 import org.apache.maven.execution.BuildFailure;
 import org.apache.maven.execution.BuildSuccess;
 import org.apache.maven.execution.BuildSummary;

daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java

@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.cache.impl;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
+
 import org.eclipse.sisu.Priority;
 import org.mvndaemon.mvnd.cache.Cache;
 import org.mvndaemon.mvnd.cache.CacheFactory;

daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java

@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import org.mvndaemon.mvnd.cache.Cache;
 import org.mvndaemon.mvnd.cache.CacheFactory;
 import org.mvndaemon.mvnd.cache.CacheRecord;

daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java

@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Stream;
+
 import org.mvndaemon.mvnd.cache.Cache;
 import org.mvndaemon.mvnd.cache.CacheFactory;
 import org.mvndaemon.mvnd.cache.CacheRecord;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.DefaultExtensionRealmCache;
 import org.apache.maven.project.ExtensionDescriptor;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.DefaultPluginArtifactsCache;
 import org.apache.maven.plugin.PluginResolutionException;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java

@@ -18,14 +18,16 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
 import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.DefaultPluginDescriptorCache;
 import org.apache.maven.plugin.InvalidPluginDescriptorException;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
-import java.nio.file.Path;
-import java.util.List;
-import java.util.stream.Stream;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.stream.Stream;
+
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.DefaultPluginRealmCache;
 import org.apache.maven.plugin.PluginContainerException;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java

@@ -18,6 +18,10 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -29,9 +33,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
-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.lifecycle.LifecycleExecutionException;

daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java

@@ -18,6 +18,10 @@
  */
 package org.mvndaemon.mvnd.cache.invalidating;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.FileSystems;
@@ -26,9 +30,7 @@ import java.nio.file.PathMatcher;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
 import org.apache.maven.eventspy.AbstractEventSpy;
 import org.apache.maven.eventspy.EventSpy;
 import org.apache.maven.execution.MavenExecutionRequest;

daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java

@@ -32,6 +32,7 @@ import java.util.TreeMap;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.jline.utils.ExecHelper;
 import org.mvndaemon.mvnd.common.JavaVersion;
 import org.mvndaemon.mvnd.common.Os;

daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java

@@ -25,6 +25,7 @@ import java.util.Map.Entry;
 import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
+
 import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecution;

daemon/src/main/java/org/mvndaemon/mvnd/daemon/Connection.java

@@ -19,6 +19,7 @@
 package org.mvndaemon.mvnd.daemon;
 
 import java.util.function.Predicate;
+
 import org.mvndaemon.mvnd.common.Message;
 
 public interface Connection {

daemon/src/main/java/org/mvndaemon/mvnd/daemon/DaemonExpiration.java

@@ -18,11 +18,8 @@
  */
 package org.mvndaemon.mvnd.daemon;
 
-import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.DO_NOT_EXPIRE;
-import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.GRACEFUL_EXPIRE;
-import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.IMMEDIATE_EXPIRE;
-import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.QUIET_EXPIRE;
-import static org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationResult.NOT_TRIGGERED;
+import javax.management.Attribute;
+import javax.management.ObjectName;
 
 import java.lang.management.ManagementFactory;
 import java.nio.file.Files;
@@ -37,8 +34,7 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import javax.management.Attribute;
-import javax.management.ObjectName;
+
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
 import org.mvndaemon.mvnd.common.DaemonExpirationStatus;
@@ -49,6 +45,12 @@ import org.mvndaemon.mvnd.common.Os;
 import org.mvndaemon.mvnd.common.TimeUtils;
 import org.mvndaemon.mvnd.nativ.CLibrary;
 
+import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.DO_NOT_EXPIRE;
+import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.GRACEFUL_EXPIRE;
+import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.IMMEDIATE_EXPIRE;
+import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.QUIET_EXPIRE;
+import static org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationResult.NOT_TRIGGERED;
+
 /**
  * File origin:
  * https://github.com/gradle/gradle/blob/v5.6.2/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/MasterExpirationStrategy.java

daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java

@@ -18,12 +18,6 @@
  */
 package org.mvndaemon.mvnd.daemon;
 
-import static org.mvndaemon.mvnd.common.DaemonState.Broken;
-import static org.mvndaemon.mvnd.common.DaemonState.Busy;
-import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
-import static org.mvndaemon.mvnd.common.DaemonState.StopRequested;
-import static org.mvndaemon.mvnd.common.DaemonState.Stopped;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InterruptedIOException;
@@ -55,6 +49,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+
 import org.apache.maven.cli.DaemonMavenCli;
 import org.mvndaemon.mvnd.builder.SmartBuilder;
 import org.mvndaemon.mvnd.common.DaemonConnection;
@@ -78,6 +73,12 @@ import org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.mvndaemon.mvnd.common.DaemonState.Broken;
+import static org.mvndaemon.mvnd.common.DaemonState.Busy;
+import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
+import static org.mvndaemon.mvnd.common.DaemonState.StopRequested;
+import static org.mvndaemon.mvnd.common.DaemonState.Stopped;
+
 public class Server implements AutoCloseable, Runnable {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);

daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.interactivity;
 
+import javax.inject.Named;
+
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import javax.inject.Named;
+
 import org.codehaus.plexus.components.interactivity.AbstractInputHandler;
 import org.codehaus.plexus.components.interactivity.InputHandler;
 import org.codehaus.plexus.components.interactivity.OutputHandler;

daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java

@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.logging.smart;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
+
 import org.apache.maven.execution.ExecutionEvent;
 import org.apache.maven.execution.ExecutionListener;
 import org.apache.maven.execution.MavenSession;

daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/ProjectBuildLogAppender.java

@@ -18,6 +18,8 @@
  */
 package org.mvndaemon.mvnd.logging.smart;
 
+import java.util.Map;
+
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.PatternLayout;
@@ -25,7 +27,6 @@ import ch.qos.logback.classic.pattern.ClassicConverter;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
 import ch.qos.logback.core.Context;
-import java.util.Map;
 import org.apache.maven.shared.utils.logging.LoggerLevelRenderer;
 import org.apache.maven.shared.utils.logging.MessageUtils;
 import org.slf4j.LoggerFactory;

daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java

@@ -18,13 +18,15 @@
  */
 package org.mvndaemon.mvnd.plugin;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
 import org.apache.maven.artifact.repository.metadata.io.MetadataReader;
 import org.apache.maven.plugin.MavenPluginManager;
 import org.apache.maven.plugin.version.PluginVersionRequest;

daemon/src/main/java/org/mvndaemon/mvnd/syncontext/DaemonNamedLockFactoryAdapterFactoryImpl.java

@@ -18,10 +18,12 @@
  */
 package org.mvndaemon.mvnd.syncontext;
 
-import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
+import java.util.Map;
+
 import org.eclipse.aether.impl.RepositorySystemLifecycle;
 import org.eclipse.aether.internal.impl.synccontext.named.NameMapper;
 import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapterFactoryImpl;

daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java

@@ -18,6 +18,9 @@
  */
 package org.mvndaemon.mvnd.timing;
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
@@ -27,8 +30,7 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
 import org.apache.maven.eventspy.AbstractEventSpy;
 import org.apache.maven.eventspy.EventSpy;
 import org.apache.maven.execution.ExecutionEvent;

daemon/src/test/java/org/mvndaemon/mvnd/builder/AbstractSmartBuilderTest.java

@@ -21,6 +21,7 @@ package org.mvndaemon.mvnd.builder;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+
 import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Assertions;
 

daemon/src/test/java/org/mvndaemon/mvnd/builder/DagWidthTest.java

@@ -18,8 +18,6 @@
  */
 package org.mvndaemon.mvnd.builder;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -31,9 +29,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.builder.DependencyGraph.DagWidth;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class DagWidthTest {
 
     @Test

daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectComparatorTest.java

@@ -18,17 +18,18 @@
  */
 package org.mvndaemon.mvnd.builder;
 
-import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
-
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.PriorityQueue;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
+
 public class ProjectComparatorTest extends AbstractSmartBuilderTest {
 
     @Test

daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectExecutorServiceTest.java

@@ -18,9 +18,6 @@
  */
 package org.mvndaemon.mvnd.builder;
 
-import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
-
-import com.google.common.util.concurrent.Monitor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -28,11 +25,15 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+
+import com.google.common.util.concurrent.Monitor;
 import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.builder.ProjectExecutorService.ProjectRunnable;
 
+import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
+
 public class ProjectExecutorServiceTest extends AbstractSmartBuilderTest {
 
     @Test

daemon/src/test/java/org/mvndaemon/mvnd/builder/TestProjectDependencyGraph.java

@@ -18,11 +18,12 @@
  */
 package org.mvndaemon.mvnd.builder;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
 import org.apache.maven.execution.ProjectDependencyGraph;
 import org.apache.maven.project.MavenProject;
 import org.junit.jupiter.api.Assertions;

daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/CacheFactoryTest.java

@@ -26,6 +26,7 @@ import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java

@@ -18,9 +18,6 @@
  */
 package org.mvndaemon.mvnd.cli;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -30,10 +27,14 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.common.Os;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class EnvHelperTest {
 
     @Test

daemon/src/test/java/org/mvndaemon/mvnd/daemon/ServerTest.java

@@ -18,14 +18,15 @@
  */
 package org.mvndaemon.mvnd.daemon;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.Arrays;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.PriorityBlockingQueue;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.common.Message;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 public class ServerTest {
 
     @Test

integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/MatchInOrderAmongOthers.java

@@ -24,6 +24,7 @@ import java.util.Objects;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.assertj.core.api.Condition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/TestClientOutput.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
+
 import org.assertj.core.api.Assertions;
 import org.mvndaemon.mvnd.common.Message;
 import org.mvndaemon.mvnd.common.logging.ClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/AttachedArtifactResolutionTest.java

@@ -19,6 +19,7 @@
 package org.mvndaemon.mvnd.it;
 
 import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/BootstrapPluginTest.java

@@ -18,10 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.fail;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
@@ -33,6 +33,8 @@ import org.mvndaemon.mvnd.common.DaemonInfo;
 import org.mvndaemon.mvnd.junit.MvndTest;
 import org.mvndaemon.mvnd.junit.TestRegistry;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 @MvndTest(projectDir = "src/test/projects/bootstrap-plugin")
 @DisabledOnOs(OS.WINDOWS)
 public class BootstrapPluginTest {

integration-tests/src/test/java/org/mvndaemon/mvnd/it/CompletionNativeIT.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java

@@ -18,10 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
@@ -29,6 +29,8 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.common.Message;
 import org.mvndaemon.mvnd.junit.MvndTest;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/concurrent-downloads")
 public class ConcurrentDownloadsTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/DaemonCrashTest.java

@@ -18,13 +18,13 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import javax.inject.Inject;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -34,6 +34,8 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.common.DaemonException;
 import org.mvndaemon.mvnd.junit.MvndTest;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 @MvndTest(projectDir = "src/test/projects/daemon-crash", keepAlive = "100ms", maxLostKeepAlive = "30")
 @Timeout(60)
 public class DaemonCrashTest {

integration-tests/src/test/java/org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java

@@ -18,9 +18,11 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.file.Path;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java

@@ -29,6 +29,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/DupGATest.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/EnvironmentTest.java

@@ -18,12 +18,12 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
@@ -33,6 +33,8 @@ import org.mvndaemon.mvnd.junit.MvndTest;
 import org.mvndaemon.mvnd.junit.TestParameters;
 import org.mvndaemon.mvnd.junit.TestRegistry;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/environment")
 public class EnvironmentTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExecOutputTest.java

@@ -18,16 +18,18 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.junit.MvndTest;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/exec-output")
 public class ExecOutputTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java

@@ -18,10 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
@@ -31,6 +31,8 @@ import org.mvndaemon.mvnd.common.DaemonInfo;
 import org.mvndaemon.mvnd.junit.MvndNativeTest;
 import org.mvndaemon.mvnd.junit.TestRegistry;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndNativeTest(projectDir = "src/test/projects/extensions")
 public class ExtensionsNativeIT {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ForkedTest.java

@@ -18,16 +18,18 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.junit.MvndTest;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/forked")
 public class ForkedTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/InvokerNativeIT.java

@@ -18,13 +18,15 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/JUnitPlatformTest.java

@@ -18,9 +18,8 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
@@ -28,6 +27,8 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.common.Message;
 import org.mvndaemon.mvnd.junit.MvndTest;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/junit-platform")
 public class JUnitPlatformTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java

@@ -18,16 +18,18 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.junit.MvndNativeTest;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndNativeTest(projectDir = "src/test/projects/maven-conf")
 public class MavenConfNativeIT {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java

@@ -18,13 +18,12 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import javax.inject.Inject;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -34,6 +33,8 @@ import org.mvndaemon.mvnd.client.Client;
 import org.mvndaemon.mvnd.junit.MvndNativeTest;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class MaxHeapNativeIT {
 
     static class BaseTest {

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiLookupTest.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.junit.ClientFactory;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiModuleTest.java

@@ -18,6 +18,8 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -25,7 +27,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/MvndTestUtil.java

@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;
+
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java

@@ -18,12 +18,14 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.stream.Stream;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ParentWithPropertyTest.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.nio.file.Path;
 import javax.inject.Inject;
+
+import java.nio.file.Path;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/RawStreamsTest.java

@@ -18,10 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
@@ -30,6 +30,8 @@ import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.junit.MvndTest;
 import org.mvndaemon.mvnd.junit.TestRegistry;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/raw-streams")
 public class RawStreamsTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java

@@ -18,12 +18,11 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
@@ -32,6 +31,9 @@ import org.mvndaemon.mvnd.junit.MvndTest;
 import org.mvndaemon.mvnd.junit.TestParameters;
 import org.mvndaemon.mvnd.junit.TestRegistry;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 @MvndTest(projectDir = "src/test/projects/resident-extensions")
 public class ResidentExtensionsTest {
 

integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleNativeIT.java

@@ -18,13 +18,15 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Properties;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleTest.java

@@ -21,6 +21,7 @@ package org.mvndaemon.mvnd.it;
 import java.util.List;
 import java.util.Properties;
 import java.util.stream.Collectors;
+
 import org.assertj.core.api.Assertions;
 import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/SpecificFileNativeIT.java

@@ -18,11 +18,11 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import javax.inject.Inject;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import javax.inject.Inject;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;
@@ -30,6 +30,8 @@ import org.mvndaemon.mvnd.junit.ClientFactory;
 import org.mvndaemon.mvnd.junit.MvndNativeTest;
 import org.mvndaemon.mvnd.junit.TestParameters;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * NOTE: there is no related JVM test because the support for the maven
  * multiModuleProjectDiscovery is done very early in the client in order

integration-tests/src/test/java/org/mvndaemon/mvnd/it/StopStatusTest.java

@@ -18,9 +18,11 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.util.stream.Collectors;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/ThreadOptionNativeIT.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/TypeDescriptionTest.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java

@@ -18,10 +18,12 @@
  */
 package org.mvndaemon.mvnd.it;
 
+import javax.inject.Inject;
+
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Arrays;
-import javax.inject.Inject;
+
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;

integration-tests/src/test/java/org/mvndaemon/mvnd/it/VersionNativeIT.java

@@ -18,8 +18,10 @@
  */
 package org.mvndaemon.mvnd.it;
 
-import java.io.IOException;
 import javax.inject.Inject;
+
+import java.io.IOException;
+
 import org.junit.jupiter.api.Test;
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.Client;

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java

@@ -21,6 +21,7 @@ package org.mvndaemon.mvnd.junit;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
+
 import org.mvndaemon.mvnd.assertj.TestClientOutput;
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.client.DefaultClient;

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndNativeTest.java

@@ -22,6 +22,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mvndaemon.mvnd.client.Client;
 

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTest.java

@@ -22,6 +22,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.junit.jupiter.api.extension.ExtendWith;
 
 @ExtendWith(MvndTestExtension.class)

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java

@@ -18,8 +18,6 @@
  */
 package org.mvndaemon.mvnd.junit;
 
-import static org.mvndaemon.mvnd.junit.TestUtils.deleteDir;
-
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.reflect.Field;
@@ -30,6 +28,7 @@ import java.nio.file.Paths;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Stream;
+
 import org.apache.log4j.Logger;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;
@@ -42,6 +41,8 @@ import org.mvndaemon.mvnd.common.DaemonRegistry;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.common.TimeUtils;
 
+import static org.mvndaemon.mvnd.junit.TestUtils.deleteDir;
+
 public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback {
 
     private static final Logger LOG = Logger.getLogger(MvndTestExtension.class);

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/NativeTestClient.java

@@ -26,6 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+
 import org.mvndaemon.mvnd.client.Client;
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.client.ExecutionResult;

integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java

@@ -20,6 +20,7 @@ package org.mvndaemon.mvnd.junit;
 
 import java.nio.file.Path;
 import java.time.Duration;
+
 import org.mvndaemon.mvnd.client.DaemonParameters;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.common.TimeUtils;