Merge branch 'master' of github.com:metabase/metabase into param-reorder

bin/build-for-test

+#!/usr/bin/env bash
+
+set -eu
+
+VERSION_PROPERTY_NAME="src_hash"
+
+source-hash() {
+  # hash all the files that might change a backend-only uberjar build (for integration tests)
+  (
+    find src project.clj resources/sample-dataset.db.mv.db -type f -print0 | xargs -0 shasum ;
+    find resources -type f \( -iname \*.clj -o -iname \*.edn -o -iname \*.yaml -o -iname \*.properties \) -not -name "version.properties" -print0 | xargs -0 shasum ;
+  ) | shasum | awk '{ print $1 }'
+}
+
+uberjar-hash() {
+  # java -jar target/uberjar/metabase.jar version | grep -oE 'source_hash [a-f0-9]+' | awk '{ print $2 }'
+  # pulling the version.properties directly from the jar is much faster
+  unzip -c target/uberjar/metabase.jar version.properties | grep "$VERSION_PROPERTY_NAME" | cut -f2 -d=
+}
+
+check-uberjar-hash() {
+  expected_hash=$(source-hash)
+  actual_hash=$(uberjar-hash)
+  if [ "$expected_hash" == "$actual_hash" ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+build-uberjar-for-test() {
+  ./bin/build version
+  echo "$VERSION_PROPERTY_NAME=$(source-hash)" >> resources/version.properties
+  ./bin/build uberjar
+}
+
+if [ ! -f "target/uberjar/metabase.jar" ] || ! check-uberjar-hash; then
+  echo "Building uberjar for testing"
+  build-uberjar-for-test
+else
+  echo "Uberjar already up to date for testing"
+fi

docs/operations-guide/running-the-metabase-jar-file.md

@@ -19,7 +19,7 @@ You should see output such as:
     Java(TM) SE Runtime Environment (build 1.8.0_31-b13)
     Java HotSpot(TM) 64-Bit Server VM (build 25.31-b07, mixed mode)
 
-If you did not see the output above and instead saw either an error or your Java version is less than 1.7, then you need to install the Java Runtime.
+If you did not see the output above and instead saw either an error or your Java version is less than 1.8, then you need to install the Java Runtime.
 
 [OpenJDK Downloads](http://openjdk.java.net/install/)
 [Oracle's Java Downloads](http://www.oracle.com/technetwork/java/javase/downloads/index.html)