This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-0.9.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit 4e6a1e837c920ddd98d81bc919e27f9743075c12
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Jan 6 13:56:26 2023 +0100
Upgrade to maven parent 39 and reformat accordingly
# Conflicts:
#
daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
#
daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
#
daemon/src/main/java/org/mvndaemon/mvnd/syncontext/DaemonNamedLockFactoryAdapterFactoryImpl.java
---
.../main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java | 1 +
client/pom.xml | 4 ++--
.../src/main/java/org/mvndaemon/mvnd/client/Client.java | 1 +
.../mvndaemon/mvnd/client/DaemonClientConnection.java | 1 +
.../java/org/mvndaemon/mvnd/client/DaemonConnector.java | 7 ++++---
.../java/org/mvndaemon/mvnd/client/DaemonParameters.java | 1 +
.../mvndaemon/mvnd/client/CompletionGeneratorTest.java | 1 +
.../org/mvndaemon/mvnd/client/DaemonConnectorTest.java | 4 ++--
.../java/org/mvndaemon/mvnd/client/EnvironmentTest.java | 5 +++--
.../java/org/mvndaemon/mvnd/common/DaemonConnection.java | 1 +
.../main/java/org/mvndaemon/mvnd/common/DaemonInfo.java | 4 ++--
.../java/org/mvndaemon/mvnd/common/DaemonRegistry.java | 7 ++++---
.../main/java/org/mvndaemon/mvnd/common/OptionType.java | 1 +
.../src/main/java/org/mvndaemon/mvnd/common/OsUtils.java | 1 +
.../org/mvndaemon/mvnd/common/logging/ClientOutput.java | 1 +
.../mvndaemon/mvnd/common/logging/TerminalOutput.java | 1 +
.../org/mvndaemon/mvnd/common/DaemonRegistryTest.java | 9 +++++----
.../test/java/org/mvndaemon/mvnd/common/MessageTest.java | 9 +++++----
.../java/org/mvndaemon/mvnd/common/SocketFamilyTest.java | 5 +++--
.../java/org/mvndaemon/mvnd/common/TimeUtilsTest.java | 5 +++--
.../apache/maven/classrealm/MvndClassRealmManager.java | 8 +++++---
.../main/java/org/apache/maven/cli/DaemonMavenCli.java | 9 +++++----
.../java/org/apache/maven/cli/MvndHelpFormatter.java | 1 +
.../org/apache/maven/project/CachingProjectBuilder.java | 8 +++++---
.../java/org/mvndaemon/mvnd/builder/DependencyGraph.java | 1 +
.../org/mvndaemon/mvnd/builder/ProjectComparator.java | 1 +
.../mvndaemon/mvnd/builder/ProjectExecutorService.java | 1 +
.../org/mvndaemon/mvnd/builder/ReactorBuildQueue.java | 1 +
.../org/mvndaemon/mvnd/builder/ReactorBuildStats.java | 3 ++-
.../java/org/mvndaemon/mvnd/builder/SmartBuilder.java | 8 +++++---
.../org/mvndaemon/mvnd/builder/SmartBuilderImpl.java | 1 +
.../mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java | 1 +
.../mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java | 1 +
.../mvnd/cache/impl/WatchServiceCacheFactory.java | 1 +
.../invalidating/InvalidatingExtensionRealmCache.java | 8 +++++---
.../invalidating/InvalidatingPluginArtifactsCache.java | 8 +++++---
.../invalidating/InvalidatingPluginDescriptorCache.java | 8 +++++---
.../cache/invalidating/InvalidatingPluginRealmCache.java | 8 +++++---
.../invalidating/InvalidatingProjectArtifactsCache.java | 8 +++++---
.../invalidating/InvalidatingRealmCacheEventSpy.java | 8 +++++---
.../src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java | 1 +
.../java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java | 1 +
.../main/java/org/mvndaemon/mvnd/daemon/Connection.java | 1 +
.../java/org/mvndaemon/mvnd/daemon/DaemonExpiration.java | 16 +++++++++-------
.../src/main/java/org/mvndaemon/mvnd/daemon/Server.java | 13 +++++++------
.../mvnd/execution/BuildResumptionAnalyzer.java | 1 +
.../mvnd/execution/DefaultBuildResumptionAnalyzer.java | 6 ++++--
.../execution/DefaultBuildResumptionDataRepository.java | 6 ++++--
.../org/mvndaemon/mvnd/interactivity/DaemonPrompter.java | 4 +++-
.../mvnd/logging/smart/LoggingExecutionListener.java | 1 +
.../mvnd/logging/smart/ProjectBuildLogAppender.java | 3 ++-
.../mvnd/plugin/CachingPluginVersionResolver.java | 6 ++++--
.../org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java | 8 +++++---
.../mvnd/plugin/ValidatingConfigurationListener.java | 1 +
.../org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java | 6 ++++--
.../mvndaemon/mvnd/builder/AbstractSmartBuilderTest.java | 1 +
.../java/org/mvndaemon/mvnd/builder/DagWidthTest.java | 5 +++--
.../mvndaemon/mvnd/builder/ProjectComparatorTest.java | 5 +++--
.../mvnd/builder/ProjectExecutorServiceTest.java | 7 ++++---
.../mvnd/builder/TestProjectDependencyGraph.java | 5 +++--
.../org/mvndaemon/mvnd/cache/impl/CacheFactoryTest.java | 1 +
.../test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java | 7 ++++---
.../test/java/org/mvndaemon/mvnd/daemon/ServerTest.java | 5 +++--
.../mvndaemon/mvnd/assertj/MatchInOrderAmongOthers.java | 1 +
.../org/mvndaemon/mvnd/assertj/TestClientOutput.java | 1 +
.../mvnd/it/AttachedArtifactResolutionTest.java | 1 +
.../java/org/mvndaemon/mvnd/it/BootstrapPluginTest.java | 6 ++++--
.../java/org/mvndaemon/mvnd/it/CompletionNativeIT.java | 4 +++-
.../org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java | 6 ++++--
.../test/java/org/mvndaemon/mvnd/it/DaemonCrashTest.java | 6 ++++--
.../java/org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java | 4 +++-
.../src/test/java/org/mvndaemon/mvnd/it/DistroIT.java | 1 +
.../src/test/java/org/mvndaemon/mvnd/it/DupGATest.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/EnvironmentTest.java | 6 ++++--
.../test/java/org/mvndaemon/mvnd/it/ExecOutputTest.java | 6 ++++--
.../java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java | 6 ++++--
.../src/test/java/org/mvndaemon/mvnd/it/ForkedTest.java | 6 ++++--
.../test/java/org/mvndaemon/mvnd/it/InteractiveTest.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/InvokerNativeIT.java | 4 +++-
.../java/org/mvndaemon/mvnd/it/JUnitPlatformTest.java | 5 +++--
.../java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java | 6 ++++--
.../test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java | 5 +++--
.../org/mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/MultiLookupTest.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/MultiModuleTest.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/MvndTestUtil.java | 1 +
.../org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java | 4 +++-
.../org/mvndaemon/mvnd/it/ParentWithPropertyTest.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/RawStreamsTest.java | 6 ++++--
.../org/mvndaemon/mvnd/it/ResidentExtensionsTest.java | 8 +++++---
.../java/org/mvndaemon/mvnd/it/SingleModuleNativeIT.java | 4 +++-
.../java/org/mvndaemon/mvnd/it/SingleModuleTest.java | 1 +
.../java/org/mvndaemon/mvnd/it/SpecificFileNativeIT.java | 6 ++++--
.../test/java/org/mvndaemon/mvnd/it/StopStatusTest.java | 4 +++-
.../java/org/mvndaemon/mvnd/it/ThreadOptionNativeIT.java | 4 +++-
.../java/org/mvndaemon/mvnd/it/TypeDescriptionTest.java | 4 +++-
.../org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java | 4 +++-
.../test/java/org/mvndaemon/mvnd/it/VersionNativeIT.java | 4 +++-
.../java/org/mvndaemon/mvnd/junit/JvmTestClient.java | 1 +
.../java/org/mvndaemon/mvnd/junit/MvndNativeTest.java | 1 +
.../src/test/java/org/mvndaemon/mvnd/junit/MvndTest.java | 1 +
.../java/org/mvndaemon/mvnd/junit/MvndTestExtension.java | 5 +++--
.../java/org/mvndaemon/mvnd/junit/NativeTestClient.java | 1 +
.../java/org/mvndaemon/mvnd/junit/TestParameters.java | 1 +
.../test/java/org/mvndaemon/mvnd/junit/TestRegistry.java | 1 +
.../test/java/org/mvndaemon/mvnd/nativ/CLibraryTest.java | 7 ++++---
pom.xml | 4 ++--
107 files changed, 294 insertions(+), 148 deletions(-)
diff --git
a/build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java
b/build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java
index 5a660b8a..891e9d82 100644
--- a/build-plugin/src/main/java/org/mvndaemon/mvnd/plugin/doc/DocMojo.java
+++ b/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;
diff --git a/client/pom.xml b/client/pom.xml
index 0bf6ed9f..b34f3f2f 100644
--- a/client/pom.xml
+++ b/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>
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/Client.java
b/client/src/main/java/org/mvndaemon/mvnd/client/Client.java
index 8f82b4e0..15b2f97d 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/Client.java
+++ b/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 {
diff --git
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonClientConnection.java
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonClientConnection.java
index 24e5875e..5ae288c7 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonClientConnection.java
+++ b/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;
diff --git
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 8b867176..cd5f416d 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/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
diff --git
a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index e81335e7..e6c6a4ec 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/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;
diff --git
a/client/src/test/java/org/mvndaemon/mvnd/client/CompletionGeneratorTest.java
b/client/src/test/java/org/mvndaemon/mvnd/client/CompletionGeneratorTest.java
index 1f5f4afb..a6f3c567 100644
---
a/client/src/test/java/org/mvndaemon/mvnd/client/CompletionGeneratorTest.java
+++
b/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;
diff --git
a/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
b/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
index 2e28d084..d7b74c30 100644
--- a/client/src/test/java/org/mvndaemon/mvnd/client/DaemonConnectorTest.java
+++ b/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
diff --git
a/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java
b/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java
index 0d14670d..31de5b1a 100644
--- a/client/src/test/java/org/mvndaemon/mvnd/client/EnvironmentTest.java
+++ b/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
diff --git
a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
b/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
index ba79896e..80e61db4 100755
--- a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
+++ b/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;
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonInfo.java
b/common/src/main/java/org/mvndaemon/mvnd/common/DaemonInfo.java
index 3d435a97..eb86ef45 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonInfo.java
+++ b/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
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonRegistry.java
b/common/src/main/java/org/mvndaemon/mvnd/common/DaemonRegistry.java
index 449e3f1a..4b81f8ce 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonRegistry.java
+++ b/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.
*
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/OptionType.java
b/common/src/main/java/org/mvndaemon/mvnd/common/OptionType.java
index 9f73fdec..717f0587 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/OptionType.java
+++ b/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 {
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
index 45ae8826..39d685f1 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
+++ b/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;
diff --git
a/common/src/main/java/org/mvndaemon/mvnd/common/logging/ClientOutput.java
b/common/src/main/java/org/mvndaemon/mvnd/common/logging/ClientOutput.java
index 0d1425a4..04119ef5 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/logging/ClientOutput.java
+++ b/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;
/**
diff --git
a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
index a7e024ef..85ad87d2 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
+++ b/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;
diff --git
a/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java
b/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java
index 6ec7ef81..f6984e44 100644
--- a/common/src/test/java/org/mvndaemon/mvnd/common/DaemonRegistryTest.java
+++ b/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;
diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/MessageTest.java
b/common/src/test/java/org/mvndaemon/mvnd/common/MessageTest.java
index 7d6fdb6b..907f8ff1 100644
--- a/common/src/test/java/org/mvndaemon/mvnd/common/MessageTest.java
+++ b/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
diff --git
a/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java
b/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java
index e6f9fa28..f98601c1 100644
--- a/common/src/test/java/org/mvndaemon/mvnd/common/SocketFamilyTest.java
+++ b/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
diff --git a/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java
b/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java
index 6c9a0831..8dc6906f 100644
--- a/common/src/test/java/org/mvndaemon/mvnd/common/TimeUtilsTest.java
+++ b/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
diff --git
a/daemon/src/main/java/org/apache/maven/classrealm/MvndClassRealmManager.java
b/daemon/src/main/java/org/apache/maven/classrealm/MvndClassRealmManager.java
index 90e03d18..67dea464 100644
---
a/daemon/src/main/java/org/apache/maven/classrealm/MvndClassRealmManager.java
+++
b/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;
diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index 214c0196..a296b4af 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/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;
@@ -45,6 +41,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;
@@ -120,6 +118,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
diff --git a/daemon/src/main/java/org/apache/maven/cli/MvndHelpFormatter.java
b/daemon/src/main/java/org/apache/maven/cli/MvndHelpFormatter.java
index 68ce2ef2..271836b0 100644
--- a/daemon/src/main/java/org/apache/maven/cli/MvndHelpFormatter.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
index 7b6610c8..0a9445ec 100644
--- a/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java
+++ b/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;
@@ -31,9 +35,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidArtifactRTException;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
index e20aaf58..49a9d5fb 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/DependencyGraph.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectComparator.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectComparator.java
index fee21ce0..8b3c915b 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectComparator.java
+++ b/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;
/**
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectExecutorService.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectExecutorService.java
index 58f56f0b..d7dc8431 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ProjectExecutorService.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildQueue.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildQueue.java
index d4c289b3..a387c2fa 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildQueue.java
+++ b/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;
/**
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildStats.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildStats.java
index 18d660be..1a00bb45 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/ReactorBuildStats.java
+++ b/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;
/**
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java
index fad26e32..6cbd712c 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilder.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilderImpl.java
b/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilderImpl.java
index 027a66e3..81cdc6bd 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/builder/SmartBuilderImpl.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
index 354af14d..c5751541 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
index c7bf4a0a..0bb752f0 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
index b40c75fc..e8ab45ca 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
index 630cdc96..8f9be623 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
index a5be4346..4173a065 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
index fb5f4d24..23862274 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
index 6817d854..67796309 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
index 70d2aae8..f97ea1a0 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
index 40c90ec5..e69da0a0 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingRealmCacheEventSpy.java
+++
b/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;
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java
b/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java
index 766b9bb4..3ed9e305 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cli/EnvHelper.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
index 743ea7a9..92bbf631 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/ClientDispatcher.java
+++ b/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;
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Connection.java
b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Connection.java
index 08929367..382117a9 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Connection.java
+++ b/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 {
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/DaemonExpiration.java
b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/DaemonExpiration.java
index ed293f62..87e70b8f 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/DaemonExpiration.java
+++ b/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
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
index 61bb75df..115417cd 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
+++ b/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);
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
index 33986f66..d75c4772 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
+++
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/BuildResumptionAnalyzer.java
@@ -37,6 +37,7 @@ package org.mvndaemon.mvnd.execution;
* under the License.
*/
import java.util.Optional;
+
import org.apache.maven.execution.MavenExecutionResult;
/**
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
index 4e6680c9..a0207d5d 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
+++
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionAnalyzer.java
@@ -36,11 +36,13 @@ package org.mvndaemon.mvnd.execution;
* specific language governing permissions and limitations
* under the License.
*/
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.execution.BuildFailure;
import org.apache.maven.execution.BuildSuccess;
import org.apache.maven.execution.MavenExecutionResult;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
index 8c3c2726..bbf377e3 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
+++
b/daemon/src/main/java/org/mvndaemon/mvnd/execution/DefaultBuildResumptionDataRepository.java
@@ -36,6 +36,9 @@ package org.mvndaemon.mvnd.execution;
* specific language governing permissions and limitations
* under the License.
*/
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
@@ -44,8 +47,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Properties;
import java.util.stream.Stream;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.project.MavenProject;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java
b/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java
index f763a6d2..392a76f5 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/interactivity/DaemonPrompter.java
+++ b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
b/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
index c0c36857..3fe2a20a 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/LoggingExecutionListener.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/ProjectBuildLogAppender.java
b/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/ProjectBuildLogAppender.java
index c28e1ad7..64ea0872 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/logging/smart/ProjectBuildLogAppender.java
+++
b/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;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
index c65a602d..19c73f9b 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
+++
b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CachingPluginVersionResolver.java
@@ -18,12 +18,14 @@
*/
package org.mvndaemon.mvnd.plugin;
+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.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.plugin.version.PluginVersionRequest;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolver;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
index 1b0d7d5e..203f20c7 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
@@ -18,6 +18,10 @@
*/
package org.mvndaemon.mvnd.plugin;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
import java.io.BufferedInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -38,9 +42,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
+
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.classrealm.ClassRealmManager;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/ValidatingConfigurationListener.java
b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/ValidatingConfigurationListener.java
index a7aa258b..06d8b65f 100644
---
a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/ValidatingConfigurationListener.java
+++
b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/ValidatingConfigurationListener.java
@@ -21,6 +21,7 @@ package org.mvndaemon.mvnd.plugin;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.Parameter;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
diff --git
a/daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java
b/daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java
index 87f1d1bd..99241e9d 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java
+++ b/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;
diff --git
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/AbstractSmartBuilderTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/builder/AbstractSmartBuilderTest.java
index 86a77e7b..c6e32947 100644
---
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/AbstractSmartBuilderTest.java
+++
b/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;
diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/builder/DagWidthTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/builder/DagWidthTest.java
index 340df6b6..2dd2fa1b 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/builder/DagWidthTest.java
+++ b/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
diff --git
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectComparatorTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectComparatorTest.java
index 761c3917..7657dcdc 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectComparatorTest.java
+++ b/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
diff --git
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectExecutorServiceTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectExecutorServiceTest.java
index 0cfe3352..f1ad7da5 100644
---
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/ProjectExecutorServiceTest.java
+++
b/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
diff --git
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/TestProjectDependencyGraph.java
b/daemon/src/test/java/org/mvndaemon/mvnd/builder/TestProjectDependencyGraph.java
index 9db0c648..47d6a104 100644
---
a/daemon/src/test/java/org/mvndaemon/mvnd/builder/TestProjectDependencyGraph.java
+++
b/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;
diff --git
a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/CacheFactoryTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/CacheFactoryTest.java
index 012a7406..6d47f3a4 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/CacheFactoryTest.java
+++ b/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;
diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java
index 516d4718..69d6a49e 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/cli/EnvHelperTest.java
+++ b/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
diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ServerTest.java
b/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ServerTest.java
index 9350be98..18243fd8 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/daemon/ServerTest.java
+++ b/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
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/MatchInOrderAmongOthers.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/MatchInOrderAmongOthers.java
index 5bf67b77..7ad472e5 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/MatchInOrderAmongOthers.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/TestClientOutput.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/TestClientOutput.java
index e5739616..07e5578c 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/assertj/TestClientOutput.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/AttachedArtifactResolutionTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/AttachedArtifactResolutionTest.java
index 6e8ebb4f..c65b1d1e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/AttachedArtifactResolutionTest.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/BootstrapPluginTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/BootstrapPluginTest.java
index a1401eab..57a8d67c 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/BootstrapPluginTest.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/CompletionNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/CompletionNativeIT.java
index 067cb2b9..d06ea9a5 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/CompletionNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
index 703bcc9c..739d0b6e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ConcurrentDownloadsTest.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DaemonCrashTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DaemonCrashTest.java
index d50ca1f6..6ade3a0f 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DaemonCrashTest.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java
index e62648b5..610cb8df 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java
index a51494da..1044673d 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DistroIT.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DupGATest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DupGATest.java
index 0a461207..89494a53 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/DupGATest.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/EnvironmentTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/EnvironmentTest.java
index 1ecb5e33..6e3f993a 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/EnvironmentTest.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExecOutputTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExecOutputTest.java
index 5453945d..23eceedd 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExecOutputTest.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
index 74b46511..719f13db 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ExtensionsNativeIT.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ForkedTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ForkedTest.java
index e8f867f9..7fb23296 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ForkedTest.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java
index 56b7ee25..5a281983 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InteractiveTest.java
+++ b/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.mvndaemon.mvnd.assertj.TestClientOutput;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InvokerNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InvokerNativeIT.java
index be5ec704..abb78b3a 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/InvokerNativeIT.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/JUnitPlatformTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/JUnitPlatformTest.java
index cd70da31..0f14094e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/JUnitPlatformTest.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java
index 8d109e82..f562b233 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MavenConfNativeIT.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java
index bf992dbf..2b00562f 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MaxHeapNativeIT.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java
index f72a0921..ff20b9d3 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiLookupTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiLookupTest.java
index b2c8d48f..85c4b611 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiLookupTest.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiModuleTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiModuleTest.java
index 144b02b6..2695d7da 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MultiModuleTest.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MvndTestUtil.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MvndTestUtil.java
index 925dafdf..05e9f537 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/MvndTestUtil.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java
index 77612907..889e7315 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/NewManagedModuleNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ParentWithPropertyTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ParentWithPropertyTest.java
index ce8a6f17..66ad833c 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ParentWithPropertyTest.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/RawStreamsTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/RawStreamsTest.java
index c3785484..889ed265 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/RawStreamsTest.java
+++ b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java
index 75181eb6..ffd72a98 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ResidentExtensionsTest.java
+++
b/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 {
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleNativeIT.java
index 66a8b9d6..a8be5941 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleTest.java
index 4662b2a6..9a7d524d 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SingleModuleTest.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SpecificFileNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SpecificFileNativeIT.java
index 356c4189..59a3d96b 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/SpecificFileNativeIT.java
+++
b/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
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/StopStatusTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/StopStatusTest.java
index ba5e05ad..b2a096d8 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/StopStatusTest.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ThreadOptionNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ThreadOptionNativeIT.java
index 935c8f5d..ea14bc36 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/ThreadOptionNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/TypeDescriptionTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/TypeDescriptionTest.java
index 0af95c5f..83b81880 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/TypeDescriptionTest.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java
index 5a798124..b9b6a51b 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/UpgradesInBomNativeIT.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/VersionNativeIT.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/it/VersionNativeIT.java
index 681e9471..9a6caa76 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/it/VersionNativeIT.java
+++ b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java
index f1664d7f..82549d3e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndNativeTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndNativeTest.java
index a342e7f4..e91f9090 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndNativeTest.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTest.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTest.java
index d26a0b73..710cce3a 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTest.java
+++ b/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)
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
index c56afda3..4aa6a7b0 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/MvndTestExtension.java
+++
b/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);
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/NativeTestClient.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/NativeTestClient.java
index 83419968..6325282e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/NativeTestClient.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java
index 07876360..90ef6f8e 100644
---
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestParameters.java
+++
b/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;
diff --git
a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestRegistry.java
b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestRegistry.java
index d5d4e104..cffeb18b 100644
--- a/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestRegistry.java
+++ b/integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestRegistry.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
+
import org.assertj.core.api.Assertions;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.DaemonRegistry;
diff --git a/native/src/test/java/org/mvndaemon/mvnd/nativ/CLibraryTest.java
b/native/src/test/java/org/mvndaemon/mvnd/nativ/CLibraryTest.java
index cf1af713..ee1a2aa7 100644
--- a/native/src/test/java/org/mvndaemon/mvnd/nativ/CLibraryTest.java
+++ b/native/src/test/java/org/mvndaemon/mvnd/nativ/CLibraryTest.java
@@ -18,14 +18,15 @@
*/
package org.mvndaemon.mvnd.nativ;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import java.io.File;
+
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class CLibraryTest {
@Test
diff --git a/pom.xml b/pom.xml
index b9427503..0057b0ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>38</version>
- <relativePath/>
+ <version>39</version>
+ <relativePath />
</parent>
<groupId>org.apache.maven.daemon</groupId>
