diff --git a/build.gradle b/build.gradle index 1f6df2d7de..32ec6ab4ee 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ allprojects { apply plugin: "build-time-tracker" group = 'io.snappydata' - version = '0.9' + version = '1.0.0-rc1' // apply compiler options tasks.withType(JavaCompile) { @@ -99,7 +99,7 @@ allprojects { scalaBinaryVersion = '2.11' scalaVersion = scalaBinaryVersion + '.8' sparkVersion = '2.1.1' - snappySparkVersion = '2.1.1.1' + snappySparkVersion = '2.1.1.1-rc1' sparkDistName = "spark-${sparkVersion}-bin-hadoop2.7" log4jVersion = '1.2.17' slf4jVersion = '1.7.21' @@ -112,7 +112,7 @@ allprojects { thriftVersion = '0.9.3' derbyVersion = '10.12.1.1' pegdownVersion = '1.6.0' - snappyStoreVersion = '1.5.5' + snappyStoreVersion = '1.5.6-rc1' pulseVersion = '1.5.1' buildFlags = '' createdBy = System.getProperty('user.name') @@ -122,7 +122,7 @@ allprojects { buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z') buildNumber = new Date().format('MMddyy') jdkVersion = System.getProperty('java.version') - sparkJobServerVersion = '0.6.2.5' + sparkJobServerVersion = '0.6.2.6-rc1' gitCmd = "git --git-dir=${rootDir}/.git --work-tree=${rootDir}" gitBranch = "${gitCmd} rev-parse --abbrev-ref HEAD".execute().text.trim() @@ -404,6 +404,9 @@ subprojects { } exclude '**/*Suite.class' exclude '**/*DUnitTest.class' + if (!rootProject.hasProperty('snappydata.enterprise')) { + exclude '**/*DUnitSecurityTest.class' + } workingDir = "${testResultsBase}/dunit-security" diff --git a/cluster/build.gradle b/cluster/build.gradle index 50a59aa8a9..0c60f37951 100644 --- a/cluster/build.gradle +++ b/cluster/build.gradle @@ -176,5 +176,9 @@ scalaTest { cleanIntermediateFiles(project.path) } } -check.dependsOn test, scalaTest, dunitTest, dunitSecurityTest +check.dependsOn test, scalaTest, dunitTest +if (rootProject.hasProperty('snappydata.enterprise')) { + check.dependsOn dunitSecurityTest +} + archivesBaseName = 'snappydata-cluster_' + scalaBinaryVersion diff --git a/core/build.gradle b/core/build.gradle index 473aab8edd..abb7e79edf 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -168,7 +168,11 @@ task getApacheSparkDist { test.dependsOn ':cleanJUnit' dunitTest.dependsOn getApacheSparkDist dunitSecurityTest.dependsOn getApacheSparkDist -check.dependsOn test, scalaTest, dunitTest, dunitSecurityTest +check.dependsOn test, scalaTest, dunitTest +if (rootProject.hasProperty('snappydata.enterprise')) { + check.dependsOn dunitSecurityTest +} + archivesBaseName = 'snappydata-core_' + scalaBinaryVersion shadowJar { diff --git a/spark b/spark index 59339f827d..86ef2b75d9 160000 --- a/spark +++ b/spark @@ -1 +1 @@ -Subproject commit 59339f827d99305ab198738611b0c42a1dfe1887 +Subproject commit 86ef2b75d98cde637ba5ff7505593b5bdff5c056 diff --git a/spark-jobserver b/spark-jobserver index 204b9fec30..77fdb5e024 160000 --- a/spark-jobserver +++ b/spark-jobserver @@ -1 +1 @@ -Subproject commit 204b9fec30099566dfb9a015a7ce45294144e419 +Subproject commit 77fdb5e024f6f55a4a0d14863653b7dbdd6e7dc6 diff --git a/store b/store index 7dd9ca6154..bd25a58f86 160000 --- a/store +++ b/store @@ -1 +1 @@ -Subproject commit 7dd9ca6154bcc132201c78205551fb10f1d34e1a +Subproject commit bd25a58f86f8e53140a26f6d5eb9805901ed9402