Upgrade to SCDF 1.0.0.RELASE SCDF APPS 1.0.2 RELEASE, Geode 1.0.0.M3 .....

.gitignore

@@ -7,7 +7,6 @@ vf.gf.*
 *.log
 **/.idea/**/*.*
 **/.gradle/**/*.*
-**/gradle/**/*.*
 **/.class
 **/.Rapp.history
 **/.settings
@@ -19,3 +18,5 @@ vf.gf.*
 **/locator/**/*.*
 start-scdf-*.sh
 dump.rdb
+spring-cloud-dataflow-server-cloudfoundry-1.0.0.RELEASE.jar
+spring-cloud-dataflow-shell-1.0.0.RELEASE.jar

ClusteringService/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
 	ext {
-		springBootVersion = '1.3.3.RELEASE'
+		springBootVersion = '1.3.7.RELEASE'
 	}
 	repositories {
 		mavenCentral()
@@ -18,6 +18,7 @@ apply plugin: 'eclipse'
 apply plugin: 'java'
 apply plugin: 'spring-boot' 
 apply plugin: "io.spring.dependency-management"
+apply plugin: "maven"
 
 
 sourceCompatibility = 1.8
@@ -58,24 +59,23 @@ dependencies {
     compile "org.scala-lang:scala-library:$scalaVersion"
 
     compile ('org.apache.spark:spark-core_2.10:1.6.0'){
-    	exclude group: 'com.fasterxml.jackson.core'
-		exclude group: 'com.fasterxml.jackson.module'
-		exclude group: 'org.slf4j'
-		exclude group: 'org.eclipse.jetty.orbit'
-	}
+      exclude group: 'com.fasterxml.jackson.core'
+      exclude group: 'com.fasterxml.jackson.module'
+      exclude group: 'org.slf4j'
+      exclude group: 'org.eclipse.jetty.orbit'
+    }
 
 
 	compile ('org.apache.spark:spark-mllib_2.10:1.6.0'){
-    	exclude group: 'com.fasterxml.jackson.core'
+		exclude group: 'com.fasterxml.jackson.core'
 		exclude group: 'com.fasterxml.jackson.module'
 		exclude group: 'org.slf4j'
 		exclude group: 'org.eclipse.jetty.orbit'
 	}
 
 	compile('org.springframework.boot:spring-boot-starter-web'){
 		exclude group: 'com.fasterxml.jackson.core'
-		exclude (group: 'org.springframework.boot', module: 'spring-boot-starter-logging')
-
+		exclude (group: 'org.springframework.boot', module: 'spring-boot-starter-logging')	 
 	}
 
 	compile ('com.fasterxml.jackson.core:jackson-databind:2.6.5')
@@ -94,8 +94,9 @@ dependencies {
 		exclude group: 'com.fasterxml.jackson.core'
 	}
 
-	compile ('com.redislabs:spark-redis:0.1.1'){
-    	exclude group: 'org.slf4j'	
+//	compile ('com.redislabs:spark-redis:0.1.1'){
+	compile ('RedisLabs:spark-redis:0.3.2'){
+		exclude group: 'org.slf4j'
 		exclude group: 'org.scala-lang'
 		exclude group: 'org.apache.spark'	
 	}
@@ -119,6 +120,10 @@ tasks.withType(ScalaCompile) {
     scalaCompileOptions.useAnt = false
 }
 
+repositories {
+    maven {
+        url  "http://dl.bintray.com/spark-packages/maven"
+    }
+}
 
-
-
+install.dependsOn(bootRepackage)

ClusteringService/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Sep 06 17:18:11 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

Enrich-processor/build.gradle

@@ -51,7 +51,4 @@ eclipse {
 	}
 }
 
-
-
-
-
+install.dependsOn(bootRepackage)

Enrich-processor/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Sep 07 18:08:27 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip

GemfireServer/build.gradle

@@ -10,7 +10,7 @@ buildscript {
 apply plugin: 'spring-boot'
 apply plugin: 'java'
 apply plugin: 'eclipse'
-
+// apply plugin: "maven"
 
 repositories {
     mavenCentral()        
@@ -19,13 +19,10 @@ repositories {
     maven { url "http://repo.spring.io/libs-snapshot" }
 }
 
-
 dependencies {
-
     compile ("io.pivotal.gemfire:gemfire-greenplum:1.0.0-beta-6-SNAPSHOT")
     compile ("com.gemstone.gemfire:gemfire:8.1.0")
-    compile ("org.apache.logging.log4j:log4j-core:2.4")	
-
+    compile ("org.apache.logging.log4j:log4j-core:2.4")	    
 }
 
 jar {
@@ -41,11 +38,12 @@ task serverJar(type: Jar, dependsOn: jar){
 
 bootRepackage.withJarTask = jar
 
-
 artifacts{
     archives jar, serverJar
 }   
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.3'
 }
+
+//install.dependsOn(bootRepackage)

GemfireServer/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Sep 07 18:08:27 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip

GemfireServer/startup.gfsh

@@ -1,2 +1,2 @@
-start locator --name=locator --J=-Dgemfire.http-service-port=7575 --hostname-for-clients=192.168.11.1  
-start server --name=server1 --cache-xml-file=src/main/resources/server-cache.xml --J=-Dgemfire.start-dev-rest-api=true --J=-Dgemfire.http-service-bind-address=192.168.11.1 --J=-Dgemfire.http-service-port=8888 --locators=192.168.11.1[10334] --hostname-for-clients=192.168.11.1 --server-bind-address=192.168.11.1 
+start locator --name=locator --hostname-for-clients=192.168.11.1 --J=-Dgemfire.http-service-port=7575
+start server --name=server1 --cache-xml-file=src/main/resources/server-cache.xml --locators=192.168.0.10[10334] --hostname-for-clients=192.168.11.1 --server-bind-address=192.168.11.1 --J=-Dgemfire.start-dev-rest-api=true --J=-Dgemfire.http-service-bind-address=192.168.11.1 --J=-Dgemfire.http-service-port=8888