You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/12/13 22:27:39 UTC
[maven-mvnd] branch pr176 created (now e6548a6b)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch pr176
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
at e6548a6b Merge remote-tracking branch 'origin/master' into pr176
This branch includes the following new commits:
new e6548a6b Merge remote-tracking branch 'origin/master' into pr176
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-mvnd] 01/01: Merge remote-tracking branch 'origin/master' into pr176
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch pr176
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit e6548a6bcb3059ec88def88f1362b48dfcbc1ef4
Merge: d0b06ba3 1249211b
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Dec 13 23:07:36 2022 +0100
Merge remote-tracking branch 'origin/master' into pr176
# Conflicts:
# client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
# common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
# common/src/test/java/org/mvndaemon/mvnd/common/OsUtilsTest.java
.git-blame-ignore-revs | 21 +
.github/workflows/early-access.yaml | 19 +-
.github/workflows/release.yaml | 21 +-
agent/pom.xml | 110 +-
.../main/java/org/mvndaemon/mvnd/agent/Agent.java | 40 +-
build-plugin/pom.xml | 164 +--
.../org/mvndaemon/mvnd/plugin/doc/DocMojo.java | 46 +-
build/eclipse-formatter-config.xml | 281 -----
client/pom.xml | 337 +++---
.../org/mvndaemon/mvnd/client/BuildProperties.java | 25 +-
.../java/org/mvndaemon/mvnd/client/Client.java | 26 +-
.../java/org/mvndaemon/mvnd/client/Completion.java | 26 +-
.../mvnd/client/DaemonClientConnection.java | 39 +-
.../org/mvndaemon/mvnd/client/DaemonConnector.java | 173 ++--
.../mvndaemon/mvnd/client/DaemonDiagnostics.java | 67 +-
.../mvndaemon/mvnd/client/DaemonParameters.java | 133 +--
.../org/mvndaemon/mvnd/client/DefaultClient.java | 117 ++-
.../org/mvndaemon/mvnd/client/ExecutionResult.java | 26 +-
.../mvnd/client/svm/ReflectionRegistration.java | 25 +-
.../client/svm/StaticMDCBinderSubstitution.java | 26 +-
.../mvnd/client/CompletionGeneratorTest.java | 31 +-
.../mvndaemon/mvnd/client/DaemonConnectorTest.java | 29 +-
.../org/mvndaemon/mvnd/client/EnvironmentTest.java | 60 +-
.../org/mvndaemon/mvnd/client/OsUtilsTest.java | 25 +-
common/pom.xml | 340 +++----
.../org/mvndaemon/mvnd/common/BufferCaster.java | 26 +-
.../org/mvndaemon/mvnd/common/BufferHelper.java | 35 +-
.../mvndaemon/mvnd/common/ByteChannelWrapper.java | 25 +-
.../mvnd/common/DaemonCompatibilitySpec.java | 35 +-
.../mvndaemon/mvnd/common/DaemonConnection.java | 32 +-
.../org/mvndaemon/mvnd/common/DaemonException.java | 26 +-
.../mvnd/common/DaemonExpirationStatus.java | 25 +-
.../java/org/mvndaemon/mvnd/common/DaemonInfo.java | 75 +-
.../org/mvndaemon/mvnd/common/DaemonRegistry.java | 71 +-
.../org/mvndaemon/mvnd/common/DaemonState.java | 26 +-
.../org/mvndaemon/mvnd/common/DaemonStopEvent.java | 33 +-
.../org/mvndaemon/mvnd/common/Environment.java | 88 +-
.../mvndaemon/mvnd/common/InterpolationHelper.java | 53 +-
.../java/org/mvndaemon/mvnd/common/IoUtils.java | 31 +-
.../org/mvndaemon/mvnd/common/JavaVersion.java | 25 +-
.../org/mvndaemon/mvnd/common/MavenDaemon.java | 61 +-
.../java/org/mvndaemon/mvnd/common/Message.java | 443 ++++----
.../java/org/mvndaemon/mvnd/common/OptionType.java | 25 +-
.../main/java/org/mvndaemon/mvnd/common/Os.java | 29 +-
.../java/org/mvndaemon/mvnd/common/OsUtils.java | 59 +-
.../org/mvndaemon/mvnd/common/ProcessHelper.java | 29 +-
.../org/mvndaemon/mvnd/common/SocketFamily.java | 88 +-
.../org/mvndaemon/mvnd/common/SocketHelper.java | 25 +-
.../java/org/mvndaemon/mvnd/common/TimeUtils.java | 46 +-
.../mvnd/common/logging/ClientOutput.java | 25 +-
.../mvnd/common/logging/TerminalOutput.java | 538 +++++-----
.../mvndaemon/mvnd/common/DaemonRegistryTest.java | 108 +-
.../org/mvndaemon/mvnd/common/MessageTest.java | 33 +-
.../org/mvndaemon/mvnd/common/OsUtilsTest.java | 29 +-
.../mvndaemon/mvnd/common/SocketFamilyTest.java | 36 +-
.../org/mvndaemon/mvnd/common/TimeUtilsTest.java | 33 +-
daemon/pom.xml | 187 ++--
.../maven/classrealm/MvndClassRealmManager.java | 106 +-
.../java/org/apache/maven/cli/DaemonMavenCli.java | 661 ++++++------
.../org/apache/maven/cli/MvndHelpFormatter.java | 170 ++--
.../maven/project/CachingProjectBuilder.java | 410 ++++----
.../apache/maven/project/SnapshotModelCache.java | 32 +-
.../mvndaemon/mvnd/builder/DependencyGraph.java | 111 +-
.../mvndaemon/mvnd/builder/ProjectComparator.java | 55 +-
.../mvnd/builder/ProjectExecutorService.java | 67 +-
.../mvndaemon/mvnd/builder/ReactorBuildQueue.java | 29 +-
.../mvndaemon/mvnd/builder/ReactorBuildStats.java | 46 +-
.../org/mvndaemon/mvnd/builder/SmartBuilder.java | 51 +-
.../mvndaemon/mvnd/builder/SmartBuilderImpl.java | 54 +-
.../main/java/org/mvndaemon/mvnd/cache/Cache.java | 26 +-
.../org/mvndaemon/mvnd/cache/CacheFactory.java | 26 +-
.../java/org/mvndaemon/mvnd/cache/CacheRecord.java | 26 +-
.../mvnd/cache/impl/DefaultCacheFactory.java | 26 +-
.../mvnd/cache/impl/TimestampCacheFactory.java | 72 +-
.../mvnd/cache/impl/WatchServiceCacheFactory.java | 42 +-
.../InvalidatingExtensionRealmCache.java | 36 +-
.../InvalidatingPluginArtifactsCache.java | 32 +-
.../InvalidatingPluginDescriptorCache.java | 33 +-
.../invalidating/InvalidatingPluginRealmCache.java | 32 +-
.../InvalidatingProjectArtifactsCache.java | 66 +-
.../InvalidatingRealmCacheEventSpy.java | 55 +-
.../java/org/mvndaemon/mvnd/cli/EnvHelper.java | 37 +-
.../mvndaemon/mvnd/daemon/ClientDispatcher.java | 127 ++-
.../java/org/mvndaemon/mvnd/daemon/Connection.java | 26 +-
.../mvndaemon/mvnd/daemon/DaemonExpiration.java | 113 ++-
.../mvndaemon/mvnd/daemon/DaemonMemoryStatus.java | 52 +-
.../java/org/mvndaemon/mvnd/daemon/Server.java | 200 ++--
.../mvnd/execution/BuildResumptionAnalyzer.java | 52 -
.../mvnd/execution/BuildResumptionData.java | 60 --
.../execution/BuildResumptionDataRepository.java | 72 --
.../BuildResumptionPersistenceException.java | 46 -
.../execution/DefaultBuildResumptionAnalyzer.java | 85 --
.../DefaultBuildResumptionDataRepository.java | 150 ---
.../mvnd/interactivity/DaemonPrompter.java | 33 +-
.../logging/internal/MvndSlf4jConfiguration.java | 46 +-
.../mvnd/logging/internal/SimpleAppender.java | 55 +-
.../mvnd/logging/internal/Slf4jLogger.java | 7 +-
.../mvnd/logging/internal/Slf4jLoggerManager.java | 16 +-
.../mvnd/logging/smart/BuildEventListener.java | 58 +-
.../logging/smart/LoggingExecutionListener.java | 47 +-
.../mvnd/logging/smart/LoggingOutputStream.java | 25 +-
.../logging/smart/ProjectBuildLogAppender.java | 41 +-
.../mvnd/plugin/CachingPluginVersionResolver.java | 49 +-
.../mvnd/plugin/CliMavenPluginManager.java | 170 ++--
.../plugin/ValidatingConfigurationListener.java | 7 +-
.../syncontext/DaemonNamedLockFactorySelector.java | 36 +-
.../mvndaemon/mvnd/timing/BuildTimeEventSpy.java | 101 +-
.../mvnd/transfer/DaemonMavenTransferListener.java | 25 +-
.../main/resources/META-INF/maven/extension.xml | 5 +
.../mvnd/builder/AbstractSmartBuilderTest.java | 26 +-
.../org/mvndaemon/mvnd/builder/DagWidthTest.java | 82 +-
.../mvnd/builder/ProjectComparatorTest.java | 30 +-
.../mvnd/builder/ProjectExecutorServiceTest.java | 36 +-
.../mvnd/builder/ReactorBuildQueueTest.java | 25 +-
.../mvnd/builder/TestProjectDependencyGraph.java | 25 +-
.../mvnd/cache/impl/CacheFactoryTest.java | 31 +-
.../java/org/mvndaemon/mvnd/cli/EnvHelperTest.java | 35 +-
.../mvnd/daemon/ClientDispatcherTest.java | 26 +-
.../java/org/mvndaemon/mvnd/daemon/ServerTest.java | 29 +-
dist/pom.xml | 108 +-
dist/src/main/provisio/maven-distro.xml | 8 +-
helper/pom.xml | 22 +-
.../java/org/mvndaemon/mvnd/pump/AgentHelper.java | 31 +-
integration-tests/pom.xml | 322 +++---
.../mvnd/assertj/MatchInOrderAmongOthers.java | 30 +-
.../mvndaemon/mvnd/assertj/TestClientOutput.java | 35 +-
.../mvnd/it/AttachedArtifactResolutionTest.java | 26 +-
.../org/mvndaemon/mvnd/it/BootstrapPluginTest.java | 32 +-
.../org/mvndaemon/mvnd/it/CompletionNativeIT.java | 25 +-
.../java/org/mvndaemon/mvnd/it/CompletionTest.java | 28 +-
.../mvndaemon/mvnd/it/ConcurrentDownloadsTest.java | 33 +-
.../org/mvndaemon/mvnd/it/DaemonCrashTest.java | 38 +-
.../org/mvndaemon/mvnd/it/DeleteRepoNativeIT.java | 29 +-
.../java/org/mvndaemon/mvnd/it/DeleteRepoTest.java | 29 +-
.../test/java/org/mvndaemon/mvnd/it/DistroIT.java | 44 +-
.../test/java/org/mvndaemon/mvnd/it/DupGATest.java | 25 +-
.../org/mvndaemon/mvnd/it/EnvironmentTest.java | 46 +-
.../java/org/mvndaemon/mvnd/it/ExecOutputTest.java | 33 +-
.../org/mvndaemon/mvnd/it/ExtensionsNativeIT.java | 33 +-
.../java/org/mvndaemon/mvnd/it/ExtensionsTest.java | 29 +-
.../java/org/mvndaemon/mvnd/it/ForkedTest.java | 37 +-
.../org/mvndaemon/mvnd/it/InteractiveTest.java | 34 +-
.../org/mvndaemon/mvnd/it/InvokerNativeIT.java | 32 +-
.../java/org/mvndaemon/mvnd/it/InvokerTest.java | 29 +-
.../org/mvndaemon/mvnd/it/JUnitPlatformTest.java | 30 +-
.../org/mvndaemon/mvnd/it/MavenConfNativeIT.java | 45 +-
.../java/org/mvndaemon/mvnd/it/MavenConfTest.java | 29 +-
.../org/mvndaemon/mvnd/it/MaxHeapNativeIT.java | 65 +-
.../java/org/mvndaemon/mvnd/it/MaxHeapTest.java | 38 +-
.../mvndaemon/mvnd/it/ModuleAndPluginNativeIT.java | 57 +-
.../org/mvndaemon/mvnd/it/ModuleAndPluginTest.java | 29 +-
.../org/mvndaemon/mvnd/it/MultiLookupTest.java | 34 +-
.../org/mvndaemon/mvnd/it/MultiModuleTest.java | 70 +-
.../java/org/mvndaemon/mvnd/it/MvndTestUtil.java | 29 +-
.../mvnd/it/NewManagedModuleNativeIT.java | 32 +-
.../mvndaemon/mvnd/it/NewManagedModuleTest.java | 29 +-
.../mvndaemon/mvnd/it/ParentWithPropertyTest.java | 25 +-
.../java/org/mvndaemon/mvnd/it/RawStreamsTest.java | 35 +-
.../mvndaemon/mvnd/it/ResidentExtensionsTest.java | 46 +-
.../mvndaemon/mvnd/it/SingleModuleNativeIT.java | 33 +-
.../org/mvndaemon/mvnd/it/SingleModuleTest.java | 39 +-
.../mvndaemon/mvnd/it/SpecificFileNativeIT.java | 62 +-
.../java/org/mvndaemon/mvnd/it/StopStatusTest.java | 29 +-
.../mvndaemon/mvnd/it/ThreadOptionNativeIT.java | 25 +-
.../org/mvndaemon/mvnd/it/ThreadOptionTest.java | 25 +-
.../org/mvndaemon/mvnd/it/TypeDescriptionTest.java | 25 +-
.../mvndaemon/mvnd/it/UpgradesInBomNativeIT.java | 40 +-
.../org/mvndaemon/mvnd/it/UpgradesInBomTest.java | 28 +-
.../org/mvndaemon/mvnd/it/VersionNativeIT.java | 29 +-
.../java/org/mvndaemon/mvnd/it/VersionTest.java | 26 +-
.../org/mvndaemon/mvnd/junit/ClientFactory.java | 25 +-
.../org/mvndaemon/mvnd/junit/JvmTestClient.java | 30 +-
.../org/mvndaemon/mvnd/junit/MvndNativeTest.java | 25 +-
.../java/org/mvndaemon/mvnd/junit/MvndTest.java | 25 +-
.../mvndaemon/mvnd/junit/MvndTestExtension.java | 131 ++-
.../org/mvndaemon/mvnd/junit/NativeTestClient.java | 34 +-
.../org/mvndaemon/mvnd/junit/TestParameters.java | 45 +-
.../org/mvndaemon/mvnd/junit/TestRegistry.java | 36 +-
.../java/org/mvndaemon/mvnd/junit/TestUtils.java | 26 +-
.../src/test/projects/concurrent-downloads/pom.xml | 10 +-
.../src/test/projects/daemon-crash/pom.xml | 10 +-
.../src/test/projects/delete-repo/pom.xml | 10 +-
integration-tests/src/test/projects/dup-ga/pom.xml | 10 +-
.../src/test/projects/exec-output/pom.xml | 12 +-
integration-tests/src/test/projects/forked/pom.xml | 10 +-
.../src/test/projects/invoker/pom.xml | 10 +-
.../projects/invoker/src/it/invoke-hello/pom.xml | 10 +-
.../src/test/projects/junit-platform/pom.xml | 12 +-
.../src/test/projects/module-and-plugin/pom.xml | 10 +-
.../src/test/projects/multi-lookup/pom.xml | 10 +-
.../src/test/projects/multi-module/pom.xml | 10 +-
.../projects/new-managed-module/changes/pom.xml | 10 +-
.../projects/new-managed-module/parent/pom.xml | 10 +-
.../src/test/projects/raw-streams/pom.xml | 20 +-
.../projects/resident-extensions/project1/pom.xml | 10 +-
.../projects/resident-extensions/project2/pom.xml | 10 +-
.../src/test/projects/single-module/pom.xml | 10 +-
.../src/test/projects/type-description/pom.xml | 16 +-
.../projects/upgrades-in-bom/hello-0.0.1/pom.xml | 10 +-
.../upgrades-in-bom/hello-0.0.2-SNAPSHOT/pom.xml | 10 +-
.../test/projects/upgrades-in-bom/parent/pom.xml | 10 +-
native/pom.xml | 178 ++--
.../java/org/mvndaemon/mvnd/nativ/CLibrary.java | 26 +-
.../org/mvndaemon/mvnd/nativ/MvndNativeLoader.java | 57 +-
.../main/java/org/mvndaemon/mvnd/nativ/OSInfo.java | 35 +-
.../org/mvndaemon/mvnd/nativ/CLibraryTest.java | 31 +-
.../mvndaemon/mvnd/nativ/MvndNativeLoaderTest.java | 25 +-
pom.xml | 1071 +++++++++-----------
208 files changed, 6575 insertions(+), 6514 deletions(-)
diff --cc client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
index d79ced3e,858975e5..e81335e7
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonParameters.java
@@@ -138,9 -139,7 +139,8 @@@ public class DaemonParameters
.orLocalProperty(provider, globalPropertiesPath())
.orSystemProperty()
.orEnvironmentVariable()
- .or(new ValueSource(description -> description.append("java command"), this::javaHomeFromPath))
+ .or(new ValueSource(
- description -> description.append("java command"),
- DaemonParameters::javaHomeFromPath))
++ description -> description.append("java command"), DaemonParameters::javaHomeFromPath))
.orFail()
.asPath();
try {
@@@ -150,11 -149,8 +150,12 @@@
}
}
- private String javaHomeFromPath() {
- final String jHome = OsUtils.findJavaHomeFromPath();
+ private static String javaHomeFromPath() {
- LOG.warn("Falling back to finding JAVA_HOME by running java executable available in PATH."
- + " You may want to avoid this time consumig task by setting JAVA_HOME environment variable"
- + " or by passing java.home system property through command line or in one of mvnd configuration files.");
++ LOG.warn(
++ "Falling back to finding JAVA_HOME by running java executable available in PATH."
++ + " You may want to avoid this time consumig task by setting JAVA_HOME environment variable"
++ + " or by passing java.home system property through command line or in one of mvnd configuration files.");
+ final String jHome = OsUtils.findJavaHomeFromJavaExecutable("java");
if (null != jHome) {
System.setProperty(Environment.JAVA_HOME.getProperty(), jHome);
}
diff --cc common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
index f3a9ca55,eb0569db..45ae8826
--- a/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
@@@ -101,23 -111,16 +111,23 @@@ public class OsUtils
}
}
- public static String findJavaHomeFromPath() {
- String[] cmd = {"java", "-XshowSettings:properties", "-version"};
- final List<String> output = new ArrayList<String>(1);
+ /**
+ * Executes the given {@code javaExecutable} with {@code -XshowSettings:properties -version} parameters and extracts
+ * the value of {@code java.home} from the output.
+ *
+ * @param javaExecutable pass {@code "java"} to get {@code java} binary available in {@code PATH} environment
+ * variable or pass an absolute path to a {@code "java"} executable
+ * @return a {@code java.home} value or null
+ */
+ public static String findJavaHomeFromJavaExecutable(String javaExecutable) {
- String[] cmd = { javaExecutable, "-XshowSettings:properties", "-version" };
++ String[] cmd = {javaExecutable, "-XshowSettings:properties", "-version"};
+ final List<String> output = new ArrayList<String>();
exec(cmd, output);
- List<String> javaHomeLines =
- output.stream().filter(l -> l.contains(" java.home = ")).collect(Collectors.toList());
- if (javaHomeLines.size() == 1) {
- return javaHomeLines.get(0).trim().replaceFirst("java.home = ", "");
- }
- return null;
+ return output.stream()
+ .filter(l -> l.contains(" java.home = "))
+ .map(l -> l.substring(l.indexOf('=') + 1).trim())
+ .findFirst()
+ .orElse(null);
}
private static void exec(String[] cmd, final List<String> output) {
diff --cc common/src/test/java/org/mvndaemon/mvnd/common/OsUtilsTest.java
index d4085e44,41cb71bd..dd8eac32
--- a/common/src/test/java/org/mvndaemon/mvnd/common/OsUtilsTest.java
+++ b/common/src/test/java/org/mvndaemon/mvnd/common/OsUtilsTest.java
@@@ -28,11 -31,4 +31,11 @@@ public class OsUtilsTest
Assertions.assertEquals("1g", OsUtils.kbTohumanReadable(1024 * 1024));
Assertions.assertEquals("1t", OsUtils.kbTohumanReadable(1024 * 1024 * 1024));
}
+
+ @Test
+ void findJavaHomeFromPath() {
+ final String expectedJavaHome = System.getProperty("java.home");
- Assertions.assertEquals(expectedJavaHome, OsUtils.findJavaHomeFromJavaExecutable(expectedJavaHome + "/bin/java"));
++ Assertions.assertEquals(
++ expectedJavaHome, OsUtils.findJavaHomeFromJavaExecutable(expectedJavaHome + "/bin/java"));
+ }
-
}