From 5815f7b9921eb5620467e963c00bb01fa12d819f Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Mon, 12 Apr 2021 09:28:31 +0200 Subject: [PATCH] Use a proper property different from the maven-buildtime-extension one, fixes #389 --- .../main/java/org/mvndaemon/mvnd/common/Environment.java | 6 +++++- .../java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java | 5 +++-- dist/src/main/distro/bin/mvnd-bash-completion.bash | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java index e3898564..23f3ad31 100644 --- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java +++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java @@ -231,7 +231,11 @@ public enum Environment { * Internal property to tell the daemon which JAVA_HOME was used to start it. It needs to be passed explicitly * because the value may differ from what the daemon sees through System.getProperty("java.home"). */ - MVND_JAVA_HOME("mvnd.java.home", null, null, OptionType.PATH, Flags.INTERNAL); + MVND_JAVA_HOME("mvnd.java.home", null, null, OptionType.PATH, Flags.INTERNAL), + /** + * Log mojos execution time at the end of the build. + */ + MVND_BUILD_TIME("mvnd.buildTime", null, null, OptionType.BOOLEAN, Flags.NONE); static Properties properties; 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 4ca92250..488bab23 100644 --- a/daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java +++ b/daemon/src/main/java/org/mvndaemon/mvnd/timing/BuildTimeEventSpy.java @@ -32,6 +32,7 @@ import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecution; import org.codehaus.plexus.util.StringUtils; import org.eclipse.sisu.Typed; +import org.mvndaemon.mvnd.common.Environment; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +43,6 @@ public class BuildTimeEventSpy extends AbstractEventSpy { public static final int MAX_NAME_LENGTH = 58; public static final String DIVIDER = "------------------------------------------------------------------------"; - public static final String BUILDTIME_OUTPUT_LOG_PROPERTY = "buildtime.output.log"; private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -89,7 +89,8 @@ public class BuildTimeEventSpy extends AbstractEventSpy { break; case SessionEnded: - String prop = getExecutionProperty(event, BUILDTIME_OUTPUT_LOG_PROPERTY, "false"); + String prop = getExecutionProperty(event, Environment.MVND_BUILD_TIME.getProperty(), + Environment.MVND_BUILD_TIME.getDefault()); boolean output = Boolean.parseBoolean(prop); doReport(output); break; diff --git a/dist/src/main/distro/bin/mvnd-bash-completion.bash b/dist/src/main/distro/bin/mvnd-bash-completion.bash index 2247c301..30465a0b 100644 --- a/dist/src/main/distro/bin/mvnd-bash-completion.bash +++ b/dist/src/main/distro/bin/mvnd-bash-completion.bash @@ -147,7 +147,7 @@ _mvnd() local mvnd_opts="-1" local mvnd_long_opts="--completion|--purge|--serial|--status|--stop" - local mvnd_properties="-Djava.home|-Dmaven.multiModuleProjectDirectory|-Dmaven.repo.local|-Dmaven.settings|-Dmvnd.builder|-Dmvnd.daemonStorage|-Dmvnd.debug|-Dmvnd.duplicateDaemonGracePeriod|-Dmvnd.enableAssertions|-Dmvnd.expirationCheckDelay|-Dmvnd.home|-Dmvnd.idleTimeout|-Dmvnd.jvmArgs|-Dmvnd.keepAlive|-Dmvnd.logPurgePeriod|-Dmvnd.logback|-Dmvnd.maxHeapSize|-Dmvnd.maxLostKeepAlive|-Dmvnd.minHeapSize|-Dmvnd.minThreads|-Dmvnd.noBuffering|-Dmvnd.noDaemon|-Dmvnd.propertiesPath|-Dmvnd.registry|-Dmvnd.rollingWindowSize|-Dmvnd.serial|-Dmvnd.threads|-Dstyle.color|-Duser.dir|-Duser.home" + local mvnd_properties="-Djava.home|-Dmaven.multiModuleProjectDirectory|-Dmaven.repo.local|-Dmaven.settings|-Dmvnd.buildTime|-Dmvnd.builder|-Dmvnd.daemonStorage|-Dmvnd.debug|-Dmvnd.duplicateDaemonGracePeriod|-Dmvnd.enableAssertions|-Dmvnd.expirationCheckDelay|-Dmvnd.home|-Dmvnd.idleTimeout|-Dmvnd.jvmArgs|-Dmvnd.keepAlive|-Dmvnd.logPurgePeriod|-Dmvnd.logback|-Dmvnd.maxHeapSize|-Dmvnd.maxLostKeepAlive|-Dmvnd.minHeapSize|-Dmvnd.minThreads|-Dmvnd.noBuffering|-Dmvnd.noDaemon|-Dmvnd.propertiesPath|-Dmvnd.registry|-Dmvnd.rollingWindowSize|-Dmvnd.serial|-Dmvnd.threads|-Dstyle.color|-Duser.dir|-Duser.home" local opts="-am|-amd|-B|-C|-c|-cpu|-D|-e|-emp|-ep|-f|-fae|-ff|-fn|-gs|-h|-l|-N|-npr|-npu|-nsu|-o|-P|-pl|-q|-rf|-s|-T|-t|-U|-up|-V|-v|-X|${mvnd_opts}" local long_opts="--also-make|--also-make-dependents|--batch-mode|--strict-checksums|--lax-checksums|--check-plugin-updates|--define|--errors|--encrypt-master-password|--encrypt-password|--file|--fail-at-end|--fail-fast|--fail-never|--global-settings|--help|--log-file|--non-recursive|--no-plugin-registry|--no-plugin-updates|--no-snapshot-updates|--offline|--activate-profiles|--projects|--quiet|--resume-from|--settings|--threads|--toolchains|--update-snapshots|--update-plugins|--show-version|--version|--debug|${mvnd_long_opts}"