From d2147ec87c12e8555ac01dff068b1c986f468889 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Wed, 21 Nov 2018 19:54:09 +0000 Subject: [PATCH 1/4] Add Maven plugin to add commit id to UI --- main/pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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 + + + From 1d2888ba0198a78f2ca6e763c07e120ea70cb5b7 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 22 Nov 2018 19:46:30 +0000 Subject: [PATCH 2/4] Display git commit id instead of TRUNK. Closes #1305. --- main/src/com/google/refine/RefineServlet.java | 14 +++++++++++++- server/src/com/google/refine/Refine.java | 5 ----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/main/src/com/google/refine/RefineServlet.java b/main/src/com/google/refine/RefineServlet.java index 5597aab83..4297edb2a 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(); + InputStream gitStats = classLoader.getResourceAsStream("git.properties"); + ObjectMapper mapper = new ObjectMapper(); + try { + 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/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; /** From 8a72d359e001f9566ad9a90c04832fbb09fe0951 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 22 Nov 2018 19:48:11 +0000 Subject: [PATCH 3/4] Fix indentation --- main/src/com/google/refine/RefineServlet.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main/src/com/google/refine/RefineServlet.java b/main/src/com/google/refine/RefineServlet.java index 4297edb2a..93018457c 100644 --- a/main/src/com/google/refine/RefineServlet.java +++ b/main/src/com/google/refine/RefineServlet.java @@ -115,11 +115,11 @@ public class RefineServlet extends Butterfly { InputStream gitStats = classLoader.getResourceAsStream("git.properties"); ObjectMapper mapper = new ObjectMapper(); try { - ObjectNode parsedGit = mapper.readValue(gitStats, ObjectNode.class); - REVISION = parsedGit.get("git.commit.id.abbrev").asText("TRUNK"); - } catch (IOException e) { - REVISION = "TRUNK"; - } + 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 + "]"; From ed6900f1800e1c8abc1153dc9f5c421a4bdd453a Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Thu, 22 Nov 2018 20:08:31 +0000 Subject: [PATCH 4/4] 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 @@ + + + + +