diff --git a/main/pom.xml b/main/pom.xml
index 720b0f64b..539992312 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -262,6 +262,32 @@
+
+ pl.project13.maven
+ git-commit-id-plugin
+ 2.2.4
+
+
+ get-the-git-infos
+
+ revision
+
+
+
+
+ ${project.basedir}/.git
+ git
+ false
+ true
+ ${project.build.outputDirectory}/git.properties
+ json
+
+ false
+ false
+ -dirty
+
+
+
diff --git a/main/src/com/google/refine/RefineServlet.java b/main/src/com/google/refine/RefineServlet.java
index 5597aab83..27d16cd3b 100644
--- a/main/src/com/google/refine/RefineServlet.java
+++ b/main/src/com/google/refine/RefineServlet.java
@@ -35,6 +35,7 @@ package com.google.refine;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URLConnection;
import java.util.ArrayList;
@@ -52,9 +53,12 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.refine.commands.Command;
import com.google.refine.importing.ImportingManager;
import com.google.refine.io.FileProjectManager;
+import com.google.refine.util.ParsingUtilities;
import edu.mit.simile.butterfly.Butterfly;
import edu.mit.simile.butterfly.ButterflyModule;
@@ -107,7 +111,15 @@ public class RefineServlet extends Butterfly {
VERSION = ASSIGNED_VERSION;
}
if (REVISION.equals("$REVISION")) {
- REVISION = "TRUNK";
+ ClassLoader classLoader = getClass().getClassLoader();
+ 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) {
+ REVISION = "TRUNK";
+ }
}
FULL_VERSION = VERSION + " [" + REVISION + "]";
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 @@
+
+
+
+
+
diff --git a/server/src/com/google/refine/Refine.java b/server/src/com/google/refine/Refine.java
index 7e6e32a9a..e0183fe85 100644
--- a/server/src/com/google/refine/Refine.java
+++ b/server/src/com/google/refine/Refine.java
@@ -39,7 +39,6 @@ import java.awt.event.ActionListener;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
-import java.lang.reflect.Method;
import java.net.BindException;
import java.net.URI;
import java.util.ArrayList;
@@ -50,9 +49,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
import org.apache.log4j.Level;
import org.mortbay.jetty.Connector;
@@ -66,7 +62,6 @@ import org.slf4j.LoggerFactory;
import com.codeberry.jdatapath.DataPath;
import com.codeberry.jdatapath.JDataPathSystem;
-
import com.google.util.threads.ThreadPoolExecutorAdapter;
/**