diff --git a/BuildTestAll.sh b/BuildTestAll.sh index 88c960f..fa990f7 100755 --- a/BuildTestAll.sh +++ b/BuildTestAll.sh @@ -9,21 +9,21 @@ failures="" test_command () { for sys in "dse" "oss" do - echo "### Testing $1/$sys $2 ###" + echo "Testing $1/$sys $2" cd $start_location cd $1/$sys - $2 || { exit_value=$?; echo "### $1/$sys $2 Failed ###"; failures=$failures+"$1/$sys $2 Failed"+$'\n'; } + $2 || { exit_value=$?; echo "ERROR: $1/$sys $2 Failed"; failures=$failures+"$1/$sys $2 Failed"+$'\n'; } done } for language in "java" "scala" do - echo "### Testing $language Builds### " - echo "### Gradle ###" - test_command "$language/gradle" "gradle -q build" - echo "### SBT ###" - test_command "$language/sbt" "sbt --error assembly" - echo "### Maven ###" + echo "Testing $language Builds" + echo "Gradle" + test_command "$language/gradle" "gradle -q shadowJar" + echo "SBT" + test_command "$language/sbt" "sbt -Dsbt.log.noformat=true --error assembly" + echo "Maven" test_command "$language/maven" "mvn -q package" done echo $failures diff --git a/java/gradle/dse/build.gradle b/java/gradle/dse/build.gradle index c7bf387..592b166 100644 --- a/java/gradle/dse/build.gradle +++ b/java/gradle/dse/build.gradle @@ -7,13 +7,14 @@ group 'com.datastax.spark.example' version '0.1' repositories { + mavenLocal() // for testing mavenCentral() maven { url "https://repo.datastax.com/public-repos/" } } -def dseVersion = "5.1.2" +def dseVersion = "5.1.3-1" // The assembly configuration will cause jar to be included in assembled fat-jar configurations { diff --git a/java/gradle/oss/build.gradle b/java/gradle/oss/build.gradle index aca2bcc..ceee6a3 100644 --- a/java/gradle/oss/build.gradle +++ b/java/gradle/oss/build.gradle @@ -11,7 +11,7 @@ repositories { } def sparkVersion = "2.0.2" -def connectorVersion = "2.0.3" +def connectorVersion = "2.0.5" // The assembly configuration will cause jar to be included in assembled fat-jar configurations { diff --git a/java/maven/dse/pom.xml b/java/maven/dse/pom.xml index a0aff66..2bdaf92 100644 --- a/java/maven/dse/pom.xml +++ b/java/maven/dse/pom.xml @@ -9,7 +9,7 @@ UTF-8 - 5.1.2 + 5.1.3-1 diff --git a/java/maven/oss/pom.xml b/java/maven/oss/pom.xml index 13fd992..c86adbe 100644 --- a/java/maven/oss/pom.xml +++ b/java/maven/oss/pom.xml @@ -10,7 +10,7 @@ UTF-8 2.0.2 - 2.0.3 + 2.0.5