You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by cr...@apache.org on 2014/07/31 23:48:47 UTC

[2/2] git commit: SAMZA-360; check-all.sh sets java home for gradle correctly now

SAMZA-360; check-all.sh sets java home for gradle correctly now


Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/38d659b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/38d659b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/38d659b3

Branch: refs/heads/master
Commit: 38d659b33565900e96822ac85e4e0a644ac38a66
Parents: 97476e3
Author: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Authored: Thu Jul 31 14:48:34 2014 -0700
Committer: Chris Riccomini <cr...@criccomi-mn.linkedin.biz>
Committed: Thu Jul 31 14:48:34 2014 -0700

----------------------------------------------------------------------
 bin/check-all.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/38d659b3/bin/check-all.sh
----------------------------------------------------------------------
diff --git a/bin/check-all.sh b/bin/check-all.sh
index cc31942..8a87c02 100755
--- a/bin/check-all.sh
+++ b/bin/check-all.sh
@@ -61,9 +61,11 @@ do
   for scala_version in "${SCALAs[@]}"
   do
     jdk_number=${i:4:1}
-    echo "------------- Running check task against JDK${jdk_number}/Scala ${scala_version}"
-    JAVA_HOME=${!i}
-    $base_dir/gradlew -PscalaVersion=${scala_version} clean check
-    echo "------------- Finished running check task against JDK${jdk_number}/Scala ${scala_version}"
+    # skip because Scala 2.9.2 doesn't work with JDK8
+    if [[ "$jdk_number" != "8" ]] || [[ "$scala_version" != "2.9.2" ]]; then
+      echo "------------- Running check task against JDK${jdk_number}/Scala ${scala_version}"
+      $base_dir/gradlew -PscalaVersion=${scala_version} -Dorg.gradle.java.home=${!i} clean check $@
+      echo "------------- Finished running check task against JDK${jdk_number}/Scala ${scala_version}"
+    fi
   done
 done