Move BuildProperties to the client (#630)

client/pom.xml

@@ -74,6 +74,21 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <configuration>
+                    <locale>en_US</locale>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>io.takari.maven.plugins</groupId>
                 <artifactId>takari-lifecycle-plugin</artifactId>

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

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.mvndaemon.mvnd.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public class BuildProperties {
+
+    private static final BuildProperties INSTANCE = load();
+
+    public static BuildProperties getInstance() {
+        return INSTANCE;
+    }
+
+    public static BuildProperties load() {
+        final Properties buildProperties = new Properties();
+        try (InputStream is = BuildProperties.class.getResourceAsStream("build.properties")) {
+            buildProperties.load(is);
+        } catch (IOException e) {
+            throw new RuntimeException("Could not read build.properties");
+        }
+        return new BuildProperties(
+                buildProperties.getProperty("version"),
+                buildProperties.getProperty("revision"),
+                buildProperties.getProperty("os.detected.name"),
+                buildProperties.getProperty("os.detected.arch"));
+    }
+
+    private final String version;
+    private final String osName;
+    private final String osArch;
+    private final String revision;
+
+    public BuildProperties(String version, String revision, String os, String arch) {
+        this.version = version;
+        this.revision = revision;
+        this.osName = os;
+        this.osArch = arch;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getOsName() {
+        return osName;
+    }
+
+    public String getOsArch() {
+        return osArch;
+    }
+
+    public String getRevision() {
+        return revision;
+    }
+}

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

@@ -41,7 +41,6 @@ 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;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.mvndaemon.mvnd.common.BuildProperties;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.common.Os;
 import org.mvndaemon.mvnd.common.SocketFamily;

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

@@ -39,7 +39,6 @@ import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.internal.CLibrary;
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStyle;
-import org.mvndaemon.mvnd.common.BuildProperties;
 import org.mvndaemon.mvnd.common.DaemonException;
 import org.mvndaemon.mvnd.common.DaemonInfo;
 import org.mvndaemon.mvnd.common.DaemonRegistry;
@@ -187,11 +186,10 @@ public class DefaultClient implements Client {
         if (version || showVersion || debug) {
             // Print mvnd version
             BuildProperties buildProperties = BuildProperties.getInstance();
-            final String mvndVersionString = "mvnd "
-                    + (Environment.isNative() ? "native client " : "JVM client ")
-                    + buildProperties.getVersion()
-                    + "-" + buildProperties.getOsName()
-                    + "-" + buildProperties.getOsArch()
+            final String mvndVersionString = "mvnd " + buildProperties.getVersion() + " "
+                    + (Environment.isNative()
+                            ? buildProperties.getOsName() + "-" + buildProperties.getOsArch() + " native client"
+                            : "JVM client")
                     + " (" + buildProperties.getRevision() + ")";
 
             boolean isColored = !"never".equals(Environment.MAVEN_COLOR.getCommandLineOption(args));

client/src/main/resources/org/mvndaemon/mvnd/client/build.properties

@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+revision=${buildNumber}
+version=${project.version}
+os.detected.name=${os.detected.name}
+os.detected.arch=${os.detected.arch}