Add build number to filtered resource.

atomix · Aug 20, 2018 · db4d5e4 · johnou · Aug 20, 2018 · db4d5e4
1 parent f9ed5dd
commit db4d5e4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/cluster/src/main/java/io/atomix/cluster/AtomixCluster.java b/cluster/src/main/java/io/atomix/cluster/AtomixCluster.java
@@ -45,7 +45,10 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collections;
+import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
@@ -278,7 +281,13 @@ protected CompletableFuture<Void> startServices() {
 
   protected CompletableFuture<Void> completeStartup() {
     started.set(true);
-    LOGGER.info("Started");
+    final Properties properties = new Properties();
+    try (final InputStream stream = getClass().getResourceAsStream("atomix.properties")) {
+      properties.load(stream);
+    } catch (IOException ignore) {
+      // ignore
+    }
+    LOGGER.info("Started " + properties.getProperty("atomixBuildNumber", "SNAPSHOT"));
     return CompletableFuture.completedFuture(null);
   }
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -63,7 +63,20 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/filtered-resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>

diff --git a/core/src/main/filtered-resources/atomix.properties b/core/src/main/filtered-resources/atomix.properties
@@ -0,0 +1,2 @@
+# must be different name to avoid recursive bug in Eclipse
+atomixBuildNumber=${buildNumber}
diff --git a/pom.xml b/pom.xml
@@ -214,6 +214,36 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>buildnumber-maven-plugin</artifactId>
+          <version>1.4</version>
+          <configuration>
+            <revisionOnScmFailure>N/A</revisionOnScmFailure>
+            <format>{0} (revision {1} built on {2,date,yyyy-MM-dd HH:mm:ss})</format>
+            <items>
+              <item>${project.version}</item>
+              <item>scmVersion</item>
+              <item>timestamp</item>
+            </items>
+            <shortRevisionLength>6</shortRevisionLength>
+            <doCheck>false</doCheck>
+            <doUpdate>false</doUpdate>
+          </configuration>
+          <executions>
+            <execution>
+              <id>configure-buildnumber</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>create</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>