From 5ec61f35d9e51ce3754b6e054d92bcf5ed8362e6 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Sun, 20 Mar 2016 09:46:08 +0000
Subject: [PATCH] Polish

---
 README.adoc                              | 5 +++--
 build.gradle                             | 8 --------
 gradle.properties                        | 3 +++
 spring-statemachine-samples/build.gradle | 5 ++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/README.adoc b/README.adoc
index 7de26f5f..d28babdf 100644
--- a/README.adoc
+++ b/README.adoc
@@ -40,10 +40,11 @@ a cross-platform, self-contained bootstrap mechanism for the build.
 
 === Prerequisites
 http://help.github.com/set-up-git-redirect[Git] and the
-http://www.oracle.com/technetwork/java/javase/downloads[JDK7 build].
+http://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
 
 Be sure that your `JAVA_HOME` environment variable points to the
-`jdk1.7.0` folder extracted from the JDK download.
+`jdk` folder extracted from the JDK download. While build requires
+`JDK8`, created artifacts are with `JDK7` compatible.
 
 === Check out sources
 [indent=0]
diff --git a/build.gradle b/build.gradle
index 3f59ae4a..c47d37c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,13 +55,6 @@ configure(allprojects) {
 	test {
 		exclude '**/*IntegrationTests.*'
 	}
-    
-	// servlet-api (2.5) and tomcat-servlet-api (3.0) classpath entries should not be
-	// exported to dependent projects in Eclipse to avoid false compilation errors due
-	// to changing APIs across these versions
-//	eclipse.classpath.file.whenMerged { classpath ->
-//		classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
-//	}
 }
 
 configure(subprojects) { subproject ->
@@ -226,7 +219,6 @@ configure(sampleProjects()) {
 	configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
 	tasks.findByPath("artifactoryPublish")?.enabled = false
 	dependencies {
-//		compile project(":spring-statemachine-samples-common")
 		compile project(":spring-statemachine-core")
 		compile "org.springframework:spring-context-support:$springVersion"
 		testCompile "org.springframework:spring-test:$springVersion"
diff --git a/gradle.properties b/gradle.properties
index ccb15538..06989a3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,3 +14,6 @@ springSessionVersion=1.0.2.RELEASE
 curatorVersion=2.8.0
 tomcatEmbedVersion=8.0.30
 servletApiVersion=3.0.1
+commonsPool2Version=2.4.2
+hsqlVersion=2.3.1
+
diff --git a/spring-statemachine-samples/build.gradle b/spring-statemachine-samples/build.gradle
index 193bd28a..b9f3eab4 100644
--- a/spring-statemachine-samples/build.gradle
+++ b/spring-statemachine-samples/build.gradle
@@ -48,7 +48,7 @@ project('spring-statemachine-samples-persist') {
 	dependencies {
 		compile project(":spring-statemachine-samples-common")
 		compile project(":spring-statemachine-recipes-common")
-		compile ("org.hsqldb:hsqldb:2.3.1")
+		compile ("org.hsqldb:hsqldb:$hsqlVersion")
 		compile ("org.springframework:spring-jdbc:$springVersion")
 	}
 }
@@ -89,7 +89,6 @@ project('spring-statemachine-samples-eventservice') {
 	dependencies {
 		compile project(":spring-statemachine-redis")
 		compile("org.springframework.boot:spring-boot-starter-thymeleaf:$springBootVersion")
-//		compile("org.springframework.boot:spring-boot-starter-redis:$springBootVersion")
-		compile("org.apache.commons:commons-pool2:2.4.2")
+		compile("org.apache.commons:commons-pool2:$commonsPool2Version")
 	}
 }