From ed6900f1800e1c8abc1153dc9f5c421a4bdd453a Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Thu, 22 Nov 2018 20:08:31 +0000
Subject: [PATCH] Include git commit id in released versions

---
 main/src/com/google/refine/RefineServlet.java | 4 ++--
 packaging/pom.xml                             | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/src/com/google/refine/RefineServlet.java b/main/src/com/google/refine/RefineServlet.java
index 93018457c..27d16cd3b 100644
--- a/main/src/com/google/refine/RefineServlet.java
+++ b/main/src/com/google/refine/RefineServlet.java
@@ -112,9 +112,9 @@ public class RefineServlet extends Butterfly {
         }
         if (REVISION.equals("$REVISION")) {
             ClassLoader classLoader = getClass().getClassLoader();
-            InputStream gitStats = classLoader.getResourceAsStream("git.properties");
-            ObjectMapper mapper = new ObjectMapper();
             try {
+                InputStream gitStats = classLoader.getResourceAsStream("git.properties");
+                ObjectMapper mapper = new ObjectMapper();
                 ObjectNode parsedGit = mapper.readValue(gitStats, ObjectNode.class);
                 REVISION = parsedGit.get("git.commit.id.abbrev").asText("TRUNK");
             } catch (IOException e) {
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 33c2d7348..83cd44710 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -46,6 +46,11 @@
                             <exclude name="WEB-INF/lib/icu4j*.jar"/>
                         </fileset>
                     </copy>
+                    <copy todir="${built.webapp.dir}">
+                        <fileset dir="${webapp.dir}">
+                            <include name="**/*.properties"/>
+                        </fileset>
+                    </copy>
                     <copy todir="${built.webapp.dir}/WEB-INF/lib/">
                         <fileset dir="${webapp.target}">
                             <include name="openrefine-main.jar" />