From 71fb0ce8695a5a9b7f21442d3e07965f3e34a5eb Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Fri, 25 Dec 2015 17:59:00 +0000
Subject: [PATCH] Version upgrades

- Framework to 4.2.4
- For tests, boot to 1.3.1 and embedded tomcat to 8.0.30
- Polish and re-organise gradle files
- Can now run sample boot apps in sts due to mix of
  previously sts getting older tomcat version.
---
 build.gradle                             |  1 -
 gradle.properties                        |  6 +++---
 spring-statemachine-samples/build.gradle | 18 ++++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9ae00c04..53399c87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -227,7 +227,6 @@ configure(sampleProjects()) {
 	tasks.findByPath("artifactoryPublish")?.enabled = false
 	dependencies {
 		compile project(":spring-statemachine-samples-common")
-		compile project(":spring-statemachine-zookeeper")
 		compile "org.springframework:spring-context-support:$springVersion"
 		testCompile "org.springframework:spring-test:$springVersion"
 		testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
diff --git a/gradle.properties b/gradle.properties
index 86c3559f..ccb15538 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,14 +3,14 @@ springSecurityVersion=4.0.3.RELEASE
 springDataRedisVersion=1.6.2.RELEASE
 jedisVersion=2.7.3
 junitVersion=4.12
-springVersion=4.2.2.RELEASE
+springVersion=4.2.4.RELEASE
 kryoVersion=3.0.3
 log4jVersion=1.2.17
-springBootVersion=1.2.5.RELEASE
+springBootVersion=1.3.1.RELEASE
 version=1.1.0.BUILD-SNAPSHOT
 mockitoVersion = 1.9.5
 hamcrestVersion=1.3
 springSessionVersion=1.0.2.RELEASE
 curatorVersion=2.8.0
-tomcatEmbedVersion=7.0.56
+tomcatEmbedVersion=8.0.30
 servletApiVersion=3.0.1
diff --git a/spring-statemachine-samples/build.gradle b/spring-statemachine-samples/build.gradle
index a3340fda..78bfc158 100644
--- a/spring-statemachine-samples/build.gradle
+++ b/spring-statemachine-samples/build.gradle
@@ -1,27 +1,30 @@
 description = 'Spring State Machine Samples Common'
 
 project('spring-statemachine-samples-turnstile') {
-  description = 'Spring State Machine Turnstile Sample'
+	description = 'Spring State Machine Turnstile Sample'
 }
 
 project('spring-statemachine-samples-showcase') {
-  description = 'Spring State Machine Showcase Sample'
+	description = 'Spring State Machine Showcase Sample'
 }
 
 project('spring-statemachine-samples-cdplayer') {
-  description = 'Spring State Machine CD Player Sample'
+	description = 'Spring State Machine CD Player Sample'
 }
 
 project('spring-statemachine-samples-tasks') {
-  description = 'Spring State Machine Parallel Regions Sample'
+	description = 'Spring State Machine Parallel Regions Sample'
 }
 
 project('spring-statemachine-samples-washer') {
-  description = 'Spring State Machine History State Sample'
+	description = 'Spring State Machine History State Sample'
 }
 
 project('spring-statemachine-samples-zookeeper') {
-  description = 'Spring State Machine Distributed Sample'
+	description = 'Spring State Machine Distributed Sample'
+	dependencies {
+		compile project(":spring-statemachine-zookeeper")
+	}
 }
 
 project('spring-statemachine-samples-persist') {
@@ -36,6 +39,7 @@ project('spring-statemachine-samples-persist') {
 project('spring-statemachine-samples-web') {
 	description = 'Spring State Machine Web Sample'
 	dependencies {
+		compile project(":spring-statemachine-zookeeper")
 		compile("org.springframework.boot:spring-boot-starter-security:$springBootVersion")
 		compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
 		compile("org.springframework.boot:spring-boot-starter-websocket:$springBootVersion")
@@ -50,8 +54,6 @@ project('spring-statemachine-samples-scope') {
 	description = 'Spring State Machine Web Scope Sample'
 	dependencies {
 		compile("org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion")
-//		compile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
-//		compile("org.springframework:spring-webmvc:$springVersion")
 	}
 }