s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Include git commit id in released versions

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-11-22 20:08:31 +00:00
parent 8a72d359e0
commit ed6900f180
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/RefineServlet.java
View File

@ -112,9 +112,9 @@ public class RefineServlet extends Butterfly {
} }
if (REVISION.equals("$REVISION")) { if (REVISION.equals("$REVISION")) {
ClassLoader classLoader = getClass().getClassLoader(); ClassLoader classLoader = getClass().getClassLoader();
try {
InputStream gitStats = classLoader.getResourceAsStream("git.properties"); InputStream gitStats = classLoader.getResourceAsStream("git.properties");
ObjectMapper mapper = new ObjectMapper(); ObjectMapper mapper = new ObjectMapper();
try {
ObjectNode parsedGit = mapper.readValue(gitStats, ObjectNode.class); ObjectNode parsedGit = mapper.readValue(gitStats, ObjectNode.class);
REVISION = parsedGit.get("git.commit.id.abbrev").asText("TRUNK"); REVISION = parsedGit.get("git.commit.id.abbrev").asText("TRUNK");
} catch (IOException e) { } catch (IOException e) {

5
packaging/pom.xml
View File

@ -46,6 +46,11 @@
<exclude name="WEB-INF/lib/icu4j*.jar"/> <exclude name="WEB-INF/lib/icu4j*.jar"/>
</fileset> </fileset>
</copy> </copy>
<copy todir="${built.webapp.dir}">
<fileset dir="${webapp.dir}">
<include name="**/*.properties"/>
</fileset>
</copy>
<copy todir="${built.webapp.dir}/WEB-INF/lib/"> <copy todir="${built.webapp.dir}/WEB-INF/lib/">
<fileset dir="${webapp.target}"> <fileset dir="${webapp.target}">
<include name="openrefine-main.jar" /> <include name="openrefine-main.jar" />