diff --git a/build.gradle b/build.gradle
index bdbb88e4..8fd0b158 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
 		maven { url 'https://repo.springsource.org/plugins-snapshot' }
 	}
 	dependencies {
-		classpath("io.spring.gradle:propdeps-plugin:0.0.8")
+		classpath('io.spring.gradle:propdeps-plugin:0.0.8')
 		classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.6')
 		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
@@ -80,9 +80,9 @@ configure(allprojects) {
 
 	repositories {
 		mavenCentral()
-		maven { url "https://repo.springsource.org/libs-snapshot" }
-		maven { url "https://repo.springsource.org/libs-release" }
-		maven { url "https://repo.springsource.org/libs-milestone" }
+		maven { url 'https://repo.springsource.org/libs-snapshot' }
+		maven { url 'https://repo.springsource.org/libs-release' }
+		maven { url 'https://repo.springsource.org/libs-milestone' }
 	}
 
 	dependencyManagement {
@@ -168,35 +168,35 @@ configure(subprojects) { subproject ->
 }
 
 project('spring-statemachine-core') {
-	description = "Spring State Machine Core"
+	description = 'Spring State Machine Core'
 
 	configurations {
 		testArtifacts
 	}
 
 	dependencies {
-		compile "org.springframework:spring-tx"
-		compile "org.springframework:spring-messaging"
-		compile "io.projectreactor:reactor-core"
-		optional "org.springframework.security:spring-security-core"
+		compile 'org.springframework:spring-tx'
+		compile 'org.springframework:spring-messaging'
+		compile 'io.projectreactor:reactor-core'
+		optional 'org.springframework.security:spring-security-core'
 
-		testCompile "org.springframework:spring-test"
-		testCompile "org.springframework:spring-web"
-		testCompile "org.springframework:spring-webmvc"
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.apache.tomcat.embed:tomcat-embed-core"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile("org.mockito:mockito-core") { dep ->
-			exclude group: "org.hamcrest"
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.springframework:spring-web'
+		testCompile 'org.springframework:spring-webmvc'
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.apache.tomcat.embed:tomcat-embed-core'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile('org.mockito:mockito-core') { dep ->
+			exclude group: 'org.hamcrest'
 		}
-		testCompile "junit:junit"
-		testCompile "org.assertj:assertj-core"
-		testCompile "org.springframework.security:spring-security-config"
-		testCompile "org.springframework.security:spring-security-test"
-		testCompile "javax.servlet:javax.servlet-api"
-		testCompile "org.awaitility:awaitility"
-		testRuntime "org.apache.logging.log4j:log4j-core"
+		testCompile 'junit:junit'
+		testCompile 'org.assertj:assertj-core'
+		testCompile 'org.springframework.security:spring-security-config'
+		testCompile 'org.springframework.security:spring-security-test'
+		testCompile 'javax.servlet:javax.servlet-api'
+		testCompile 'org.awaitility:awaitility'
+		testRuntime 'org.apache.logging.log4j:log4j-core'
 	}
 
 	task testJar(type: Jar) {
@@ -210,28 +210,28 @@ project('spring-statemachine-core') {
 }
 
 project('spring-statemachine-autoconfigure') {
-	description = "Spring State Machine Boot Autoconfigure"
+	description = 'Spring State Machine Boot Autoconfigure'
 
 	dependencies {
-		compile project(":spring-statemachine-core")
-		compile "org.springframework.boot:spring-boot-autoconfigure"
-		compile "org.springframework.boot:spring-boot-actuator-autoconfigure"
-		compile "org.springframework.boot:spring-boot-actuator"
-		optional project(":spring-statemachine-data-common:spring-statemachine-data-jpa")
-		optional project(":spring-statemachine-data-common:spring-statemachine-data-redis")
-		optional project(":spring-statemachine-data-common:spring-statemachine-data-mongodb")
-		optional "org.springframework.boot:spring-boot-autoconfigure-processor"
-		optional "io.micrometer:micrometer-core"
-		optional "org.eclipse.persistence:javax.persistence"
-		optional "org.springframework.boot:spring-boot-starter-data-jpa"
-		optional "org.springframework.boot:spring-boot-starter-data-redis"
-		optional "org.springframework.boot:spring-boot-starter-data-mongodb"
-		testRuntime "com.h2database:h2"
-		testCompile "org.springframework.boot:spring-boot-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
+		compile project(':spring-statemachine-core')
+		compile 'org.springframework.boot:spring-boot-autoconfigure'
+		compile 'org.springframework.boot:spring-boot-actuator-autoconfigure'
+		compile 'org.springframework.boot:spring-boot-actuator'
+		optional project(':spring-statemachine-data-common:spring-statemachine-data-jpa')
+		optional project(':spring-statemachine-data-common:spring-statemachine-data-redis')
+		optional project(':spring-statemachine-data-common:spring-statemachine-data-mongodb')
+		optional 'org.springframework.boot:spring-boot-autoconfigure-processor'
+		optional 'io.micrometer:micrometer-core'
+		optional 'org.eclipse.persistence:javax.persistence'
+		optional 'org.springframework.boot:spring-boot-starter-data-jpa'
+		optional 'org.springframework.boot:spring-boot-starter-data-redis'
+		optional 'org.springframework.boot:spring-boot-starter-data-mongodb'
+		testRuntime 'com.h2database:h2'
+		testCompile 'org.springframework.boot:spring-boot-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
 	}
 }
 
@@ -239,55 +239,55 @@ project('spring-statemachine-test') {
 	description = "Spring State Machine Test"
 
 	dependencies {
-		compile "org.springframework:spring-context"
-		compile project(":spring-statemachine-core")
-		compile "org.springframework:spring-test"
-		compile "org.hamcrest:hamcrest-core"
-		compile "org.hamcrest:hamcrest-library"
-		compile "junit:junit"
-		compile "org.assertj:assertj-core"
-		testCompile("org.mockito:mockito-core") { dep ->
-			exclude group: "org.hamcrest"
+		compile 'org.springframework:spring-context'
+		compile project(':spring-statemachine-core')
+		compile 'org.springframework:spring-test'
+		compile 'org.hamcrest:hamcrest-core'
+		compile 'org.hamcrest:hamcrest-library'
+		compile 'junit:junit'
+		compile 'org.assertj:assertj-core'
+		testCompile('org.mockito:mockito-core') { dep ->
+			exclude group: 'org.hamcrest'
 		}
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
 	}
 }
 
 project('spring-statemachine-kryo') {
-	description = "Spring State Machine Kryo"
+	description = 'Spring State Machine Kryo'
 
 	dependencies {
-		compile project(":spring-statemachine-core")
-		compile "com.esotericsoftware:kryo-shaded"
+		compile project(':spring-statemachine-core')
+		compile 'com.esotericsoftware:kryo-shaded'
 
-		testCompile project(":spring-statemachine-test")
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
-		testRuntime "org.apache.logging.log4j:log4j-core"
+		testCompile project(':spring-statemachine-test')
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
+		testRuntime 'org.apache.logging.log4j:log4j-core'
 	}
 }
 
 project('spring-statemachine-zookeeper') {
-	description = "Spring State Machine Zookeeper"
+	description = 'Spring State Machine Zookeeper'
 
 	dependencies {
-		compile "org.springframework:spring-context"
-		compile project(":spring-statemachine-core")
-		compile project(":spring-statemachine-kryo")
-		compile "org.apache.curator:curator-recipes"
+		compile 'org.springframework:spring-context'
+		compile project(':spring-statemachine-core')
+		compile project(':spring-statemachine-kryo')
+		compile 'org.apache.curator:curator-recipes'
 		// github.com/spring-gradle-plugins/dependency-management-plugin/issues/136
-		runtime "log4j:log4j"
+		runtime 'log4j:log4j'
 
-		testCompile project(":spring-statemachine-test")
-		testCompile "org.apache.curator:curator-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
-		testRuntime "org.apache.logging.log4j:log4j-core"
+		testCompile project(':spring-statemachine-test')
+		testCompile 'org.apache.curator:curator-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
+		testRuntime 'org.apache.logging.log4j:log4j-core'
 	}
 }
 
@@ -296,17 +296,17 @@ project('spring-statemachine-data-common') {
 		testArtifacts.extendsFrom testRuntime
 	}
 	dependencies {
-		compile project(":spring-statemachine-core")
-		compile project(":spring-statemachine-kryo")
-		compile "org.springframework.data:spring-data-commons"
-		optional "org.springframework.security:spring-security-core"
-		compile "com.fasterxml.jackson.core:jackson-core"
-		compile "com.fasterxml.jackson.core:jackson-databind"
-		testCompile project(":spring-statemachine-test")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework.boot:spring-boot-starter-test"
-		testRuntime "org.springframework.boot:spring-boot-starter-web"
+		compile project(':spring-statemachine-core')
+		compile project(':spring-statemachine-kryo')
+		compile 'org.springframework.data:spring-data-commons'
+		optional 'org.springframework.security:spring-security-core'
+		compile 'com.fasterxml.jackson.core:jackson-core'
+		compile 'com.fasterxml.jackson.core:jackson-databind'
+		testCompile project(':spring-statemachine-test')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework.boot:spring-boot-starter-test'
+		testRuntime 'org.springframework.boot:spring-boot-starter-web'
 	}
 	task testJar(type: Jar) {
 		classifier = 'tests'
@@ -318,114 +318,114 @@ project('spring-statemachine-data-common') {
 }
 
 project('spring-statemachine-cluster') {
-	description = "Spring State Machine Cluster"
+	description = 'Spring State Machine Cluster'
 
 	dependencies {
-		compile project(":spring-statemachine-zookeeper")
-		compile "org.springframework.integration:spring-integration-zookeeper"
+		compile project(':spring-statemachine-zookeeper')
+		compile 'org.springframework.integration:spring-integration-zookeeper'
 
-		testCompile project(":spring-statemachine-test")
-		testCompile "org.apache.curator:curator-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
-		testRuntime "org.apache.logging.log4j:log4j-core"
+		testCompile project(':spring-statemachine-test')
+		testCompile 'org.apache.curator:curator-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
+		testRuntime 'org.apache.logging.log4j:log4j-core'
 	}
 }
 
 project('spring-statemachine-uml') {
-	description = "Spring State Machine Uml"
+	description = 'Spring State Machine Uml'
 
 	dependencies {
-		compile project(":spring-statemachine-core")
-		optional "org.springframework.security:spring-security-core"
+		compile project(':spring-statemachine-core')
+		optional 'org.springframework.security:spring-security-core'
 
 		// these eclipse maven deps are simply broken
-		compile("org.eclipse.uml2:uml") { dep ->
-			exclude group: "org.eclipse.core", module: "runtime"
-			exclude group: "org.eclipse.emf", module: "ecore"
-			exclude group: "org.eclipse.emf.ecore", module: "xmi"
-			exclude group: "org.eclipse.emf.mapping", module: "ecore2xml"
-			exclude group: "org.eclipse.uml2", module: "common"
-			exclude group: "org.eclipse.uml2", module: "types"
+		compile('org.eclipse.uml2:uml') { dep ->
+			exclude group: 'org.eclipse.core', module: 'runtime'
+			exclude group: 'org.eclipse.emf', module: 'ecore'
+			exclude group: 'org.eclipse.emf.ecore', module: 'xmi'
+			exclude group: 'org.eclipse.emf.mapping', module: 'ecore2xml'
+			exclude group: 'org.eclipse.uml2', module: 'common'
+			exclude group: 'org.eclipse.uml2', module: 'types'
 		}
-		compile("org.eclipse.uml2:types") { dep ->
-			exclude group: "org.eclipse.core", module: "runtime"
-			exclude group: "org.eclipse.emf", module: "ecore"
-			exclude group: "org.eclipse.uml2", module: "common"
+		compile('org.eclipse.uml2:types') { dep ->
+			exclude group: 'org.eclipse.core', module: 'runtime'
+			exclude group: 'org.eclipse.emf', module: 'ecore'
+			exclude group: 'org.eclipse.uml2', module: 'common'
 		}
-		compile("org.eclipse.uml2:common") { dep ->
-			exclude group: "org.eclipse.core", module: "runtime"
-			exclude group: "org.eclipse.emf", module: "ecore"
+		compile('org.eclipse.uml2:common') { dep ->
+			exclude group: 'org.eclipse.core', module: 'runtime'
+			exclude group: 'org.eclipse.emf', module: 'ecore'
 		}
-		compile "org.eclipse.emf:org.eclipse.emf.ecore.xmi"
-		compile "org.eclipse.emf:org.eclipse.emf.ecore"
-		compile "org.eclipse.emf:org.eclipse.emf.common"
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
-		testRuntime "org.apache.logging.log4j:log4j-core"
+		compile 'org.eclipse.emf:org.eclipse.emf.ecore.xmi'
+		compile 'org.eclipse.emf:org.eclipse.emf.ecore'
+		compile 'org.eclipse.emf:org.eclipse.emf.common'
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
+		testRuntime 'org.apache.logging.log4j:log4j-core'
 	}
 }
 
 project('spring-statemachine-build-tests') {
-	description = "Spring State Machine Build Tests"
+	description = 'Spring State Machine Build Tests'
 	configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
-	tasks.findByPath("artifactoryPublish")?.enabled = false
+	tasks.findByPath('artifactoryPublish')?.enabled = false
 
 	dependencies {
-		testCompile project(":spring-statemachine-uml")
-		testCompile project(":spring-statemachine-test")
-		testCompile project(":spring-statemachine-data-common:spring-statemachine-data-jpa")
-		testCompile project(":spring-statemachine-data-common:spring-statemachine-data-redis")
-		testCompile project(":spring-statemachine-data-common:spring-statemachine-data-mongodb")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.apache.commons:commons-pool2"
-		testRuntime "org.springframework.boot:spring-boot-starter-data-mongodb"
-		testRuntime "org.springframework.boot:spring-boot-starter-data-redis"
-		testRuntime "redis.clients:jedis"
-		testCompile "org.springframework.boot:spring-boot-starter-data-jpa"
-		testCompile "com.h2database:h2"
-		testCompile "org.springframework.boot:spring-boot-starter"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
+		testCompile project(':spring-statemachine-uml')
+		testCompile project(':spring-statemachine-test')
+		testCompile project(':spring-statemachine-data-common:spring-statemachine-data-jpa')
+		testCompile project(':spring-statemachine-data-common:spring-statemachine-data-redis')
+		testCompile project(':spring-statemachine-data-common:spring-statemachine-data-mongodb')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.apache.commons:commons-pool2'
+		testRuntime 'org.springframework.boot:spring-boot-starter-data-mongodb'
+		testRuntime 'org.springframework.boot:spring-boot-starter-data-redis'
+		testRuntime 'redis.clients:jedis'
+		testCompile 'org.springframework.boot:spring-boot-starter-data-jpa'
+		testCompile 'com.h2database:h2'
+		testCompile 'org.springframework.boot:spring-boot-starter'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
 	}
 }
 
 configure(recipeProjects()) {
 	dependencies {
-		compile project(":spring-statemachine-recipes-common")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
+		compile project(':spring-statemachine-recipes-common')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
 	}
 }
 
 project('spring-statemachine-recipes-common') {
 	dependencies {
-		compile "org.springframework:spring-context"
-		compile project(":spring-statemachine-core")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
+		compile 'org.springframework:spring-context'
+		compile project(':spring-statemachine-core')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
 	}
 }
 
 project('spring-statemachine-bom') {
-	description = "Spring Statemachine (Bill of Materials)"
+	description = 'Spring Statemachine (Bill of Materials)'
 
 	dependencyManagement {
 		generatedPomCustomization {
@@ -436,13 +436,13 @@ project('spring-statemachine-bom') {
 	configurations.archives.artifacts.clear()
 	artifacts {
 		// work around GRADLE-2406 by attaching text artifact
-		archives(file("spring-statemachine-bom.txt"))
+		archives(file('spring-statemachine-bom.txt'))
 	}
 
 	install {
 		repositories.mavenInstaller {
 			pom.whenConfigured {
-				packaging = "pom"
+				packaging = 'pom'
 				withXml {
 					asNode().children().last() + {
 						delegate.dependencyManagement {
@@ -469,10 +469,10 @@ project('spring-statemachine-bom') {
 }
 
 project('spring-statemachine-starter') {
-	description = "Spring Statemachine Starter"
+	description = 'Spring Statemachine Starter'
 	dependencies {
-		compile project(":spring-statemachine-autoconfigure")
-		compile "org.springframework.boot:spring-boot-starter"
+		compile project(':spring-statemachine-autoconfigure')
+		compile 'org.springframework.boot:spring-boot-starter'
 	}
 
 	install {
@@ -495,24 +495,24 @@ project('spring-statemachine-starter') {
 configure(sampleProjects()) {
 	apply plugin: 'org.springframework.boot'
 	configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
-	tasks.findByPath("artifactoryPublish")?.enabled = false
+	tasks.findByPath('artifactoryPublish')?.enabled = false
 	// as samples are not published, we can use jdk8
 	compileJava {
 		sourceCompatibility = 1.8
 		targetCompatibility = 1.8
 	}
 	dependencies {
-		compile project(":spring-statemachine-core")
-		compile "org.springframework:spring-context-support"
-		testCompile("org.mockito:mockito-core") { dep ->
-			exclude group: "org.hamcrest"
+		compile project(':spring-statemachine-core')
+		compile 'org.springframework:spring-context-support'
+		testCompile('org.mockito:mockito-core') { dep ->
+			exclude group: 'org.hamcrest'
 		}
-		testCompile project(":spring-statemachine-test")
-		testCompile "org.springframework.boot:spring-boot-test"
-		testCompile "org.springframework:spring-test"
-		testCompile "org.hamcrest:hamcrest-core"
-		testCompile "org.hamcrest:hamcrest-library"
-		testCompile "junit:junit"
+		testCompile project(':spring-statemachine-test')
+		testCompile 'org.springframework.boot:spring-boot-test'
+		testCompile 'org.springframework:spring-test'
+		testCompile 'org.hamcrest:hamcrest-core'
+		testCompile 'org.hamcrest:hamcrest-library'
+		testCompile 'junit:junit'
 	}
 	bootJar {
 		excludeDevtools = false
@@ -522,12 +522,12 @@ configure(sampleProjects()) {
 
 project('spring-statemachine-samples-common') {
 	configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
-	tasks.findByPath("artifactoryPublish")?.enabled = false
+	tasks.findByPath('artifactoryPublish')?.enabled = false
 	dependencies {
-		compile project(":spring-statemachine-core")
-		compile "org.springframework.shell:spring-shell"
-		compile "org.springframework.boot:spring-boot-starter"
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-core')
+		compile 'org.springframework.shell:spring-shell'
+		compile 'org.springframework.boot:spring-boot-starter'
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 	}
 }
 
@@ -538,15 +538,15 @@ configure(rootProject) {
 
 	dependencies {
 		// just used to get version into docs
-		compile "org.springframework:spring-core"
-		compile "org.springframework.boot:spring-boot"
+		compile 'org.springframework:spring-core'
+		compile 'org.springframework.boot:spring-boot'
 	}
 
 	// don't publish the default jar for the root project
 	configurations.archives.artifacts.clear()
 
 	afterEvaluate {
-		tasks.findAll { it.name.startsWith("reference") }.each{ it.dependsOn.add("asciidoctor") }
+		tasks.findAll { it.name.startsWith('reference') }.each{ it.dependsOn.add('asciidoctor') }
 	}
 
 	asciidoctorj {
@@ -564,7 +564,7 @@ configure(rootProject) {
 			configurations.docs.collect { zipTree(it) }
 		}
 		// and doc sources
-		from "docs/src/reference/asciidoc/"
+		from 'docs/src/reference/asciidoc/'
 		// to a build directory of your choice
 		into "$buildDir/asciidoc/assemble"
 	}
diff --git a/spring-statemachine-data/build.gradle b/spring-statemachine-data/build.gradle
index 3bf87084..04c10ad2 100644
--- a/spring-statemachine-data/build.gradle
+++ b/spring-statemachine-data/build.gradle
@@ -1,53 +1,52 @@
-description = "Spring State Machine Data Common"
+description = 'Spring State Machine Data Common'
 
 project('spring-statemachine-data-jpa') {
-	description = "Spring State Machine Data Jpa"
+	description = 'Spring State Machine Data Jpa'
 	dependencies {
-		compile project(":spring-statemachine-data-common")
-		compile "org.springframework:spring-orm"
-		testCompile project(":spring-statemachine-test")
-		testCompile project(path:":spring-statemachine-data-common", configuration:"testArtifacts")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		optional "org.eclipse.persistence:javax.persistence"
-		testCompile "org.hsqldb:hsqldb"
-		testCompile "org.springframework.boot:spring-boot-starter-test"
-		testRuntime "org.springframework.boot:spring-boot-starter-data-jpa"
-		testRuntime "org.springframework.boot:spring-boot-starter-web"
+		compile project(':spring-statemachine-data-common')
+		compile 'org.springframework:spring-orm'
+		testCompile project(':spring-statemachine-test')
+		testCompile project(path:':spring-statemachine-data-common', configuration:'testArtifacts')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		optional 'org.eclipse.persistence:javax.persistence'
+		testCompile 'org.hsqldb:hsqldb'
+		testCompile 'org.springframework.boot:spring-boot-starter-test'
+		testRuntime 'org.springframework.boot:spring-boot-starter-data-jpa'
+		testRuntime 'org.springframework.boot:spring-boot-starter-web'
 	}
 }
 
 project('spring-statemachine-data-redis') {
-	description = "Spring State Machine Data Redis"
+	description = 'Spring State Machine Data Redis'
 	dependencies {
-		compile project(":spring-statemachine-data-common")
-		compile "org.springframework.data:spring-data-redis"
-		testCompile project(":spring-statemachine-test")
-		optional "org.eclipse.persistence:javax.persistence"
-		testCompile project(path:":spring-statemachine-data-common", configuration:"testArtifacts")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework.boot:spring-boot-starter-test"
-		testRuntime "org.apache.commons:commons-pool2"
-		testRuntime "redis.clients:jedis"
-		testRuntime "org.springframework.boot:spring-boot-starter-data-redis"
-		testRuntime "org.springframework.boot:spring-boot-starter-web"
+		compile project(':spring-statemachine-data-common')
+		compile 'org.springframework.data:spring-data-redis'
+		testCompile project(':spring-statemachine-test')
+		optional 'org.eclipse.persistence:javax.persistence'
+		testCompile project(path:':spring-statemachine-data-common', configuration:'testArtifacts')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework.boot:spring-boot-starter-test'
+		testRuntime 'org.apache.commons:commons-pool2'
+		testRuntime 'redis.clients:jedis'
+		testRuntime 'org.springframework.boot:spring-boot-starter-data-redis'
+		testRuntime 'org.springframework.boot:spring-boot-starter-web'
 	}
 }
 
 project('spring-statemachine-data-mongodb') {
-	description = "Spring State Machine Data MongoDB"
+	description = 'Spring State Machine Data MongoDB'
 	dependencies {
-		compile project(":spring-statemachine-data-common")
-		compile "org.springframework.data:spring-data-mongodb"
-		testCompile project(":spring-statemachine-test")
-		optional "org.eclipse.persistence:javax.persistence"
-		testCompile project(path:":spring-statemachine-data-common", configuration:"testArtifacts")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
-		testCompile "io.projectreactor:reactor-test"
-		testCompile "org.springframework.boot:spring-boot-starter-test"
-		testRuntime "org.springframework.boot:spring-boot-starter-data-mongodb"
-		testRuntime "org.springframework.boot:spring-boot-starter-web"
+		compile project(':spring-statemachine-data-common')
+		compile 'org.springframework.data:spring-data-mongodb'
+		testCompile project(':spring-statemachine-test')
+		optional 'org.eclipse.persistence:javax.persistence'
+		testCompile project(path:':spring-statemachine-data-common', configuration:'testArtifacts')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
+		testCompile 'io.projectreactor:reactor-test'
+		testCompile 'org.springframework.boot:spring-boot-starter-test'
+		testRuntime 'org.springframework.boot:spring-boot-starter-data-mongodb'
+		testRuntime 'org.springframework.boot:spring-boot-starter-web'
 	}
 }
-
diff --git a/spring-statemachine-samples/build.gradle b/spring-statemachine-samples/build.gradle
index 7908153b..ad8b70b7 100644
--- a/spring-statemachine-samples/build.gradle
+++ b/spring-statemachine-samples/build.gradle
@@ -3,8 +3,8 @@ description = 'Spring State Machine Samples Common'
 project('spring-statemachine-samples-turnstile') {
 	description = 'Spring State Machine Turnstile Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -12,9 +12,9 @@ project('spring-statemachine-samples-turnstile') {
 project('spring-statemachine-samples-turnstilereactive') {
 	description = 'Spring State Machine Turnstile Reactive Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
+		compile project(':spring-statemachine-samples-common')
 		compile 'org.springframework.boot:spring-boot-starter-webflux'
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 		testCompile 'org.springframework.boot:spring-boot-starter-test'
 	}
@@ -23,17 +23,17 @@ project('spring-statemachine-samples-turnstilereactive') {
 project('spring-statemachine-samples-showcase') {
 	description = 'Spring State Machine Showcase Sample'
 	dependencies {
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
-		compile project(":spring-statemachine-samples-common")
+		compile project(':spring-statemachine-samples-common')
 	}
 }
 
 project('spring-statemachine-samples-cdplayer') {
 	description = 'Spring State Machine CD Player Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -41,8 +41,8 @@ project('spring-statemachine-samples-cdplayer') {
 project('spring-statemachine-samples-tasks') {
 	description = 'Spring State Machine Parallel Regions Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -50,8 +50,8 @@ project('spring-statemachine-samples-tasks') {
 project('spring-statemachine-samples-washer') {
 	description = 'Spring State Machine History State Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -59,9 +59,9 @@ project('spring-statemachine-samples-washer') {
 project('spring-statemachine-samples-zookeeper') {
 	description = 'Spring State Machine Distributed Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		compile project(":spring-statemachine-zookeeper")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		compile project(':spring-statemachine-zookeeper')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -69,11 +69,11 @@ project('spring-statemachine-samples-zookeeper') {
 project('spring-statemachine-samples-persist') {
 	description = 'Spring State Machine Persist Sample'
 	dependencies {
-		compile project(":spring-statemachine-samples-common")
-		compile project(":spring-statemachine-recipes-common")
-		compile ("org.hsqldb:hsqldb")
-		compile ("org.springframework:spring-jdbc")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-samples-common')
+		compile project(':spring-statemachine-recipes-common')
+		compile ('org.hsqldb:hsqldb')
+		compile ('org.springframework:spring-jdbc')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -81,15 +81,15 @@ project('spring-statemachine-samples-persist') {
 project('spring-statemachine-samples-web') {
 	description = 'Spring State Machine Web Sample'
 	dependencies {
-		compile project(":spring-statemachine-cluster")
-		compile("org.springframework.boot:spring-boot-starter-security")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-websocket")
-		compile("org.springframework:spring-webmvc")
-		compile("org.springframework:spring-websocket")
-		compile("org.springframework.security:spring-security-messaging")
-		compile("org.springframework.session:spring-session-core")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-cluster')
+		compile('org.springframework.boot:spring-boot-starter-security')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-websocket')
+		compile('org.springframework:spring-webmvc')
+		compile('org.springframework:spring-websocket')
+		compile('org.springframework.security:spring-security-messaging')
+		compile('org.springframework.session:spring-session-core')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -97,9 +97,9 @@ project('spring-statemachine-samples-web') {
 project('spring-statemachine-samples-scope') {
 	description = 'Spring State Machine Web Scope Sample'
 	dependencies {
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -107,12 +107,12 @@ project('spring-statemachine-samples-scope') {
 project('spring-statemachine-samples-security') {
 	description = 'Spring State Machine Web Security Sample'
 	dependencies {
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		compile("org.springframework.boot:spring-boot-starter-security")
-		compile("org.springframework.security:spring-security-config")
-		compile("org.springframework.security:spring-security-web")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		compile('org.springframework.boot:spring-boot-starter-security')
+		compile('org.springframework.security:spring-security-config')
+		compile('org.springframework.security:spring-security-web')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -120,12 +120,12 @@ project('spring-statemachine-samples-security') {
 project('spring-statemachine-samples-eventservice') {
 	description = 'Spring State Machine Event Service Sample'
 	dependencies {
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-redis")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		compile("org.apache.commons:commons-pool2")
-        runtime("redis.clients:jedis")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-redis')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		compile('org.apache.commons:commons-pool2')
+        runtime('redis.clients:jedis')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -133,10 +133,10 @@ project('spring-statemachine-samples-eventservice') {
 project('spring-statemachine-samples-deploy') {
 	description = 'Spring State Machine Deploy Sample'
 	dependencies {
-		compile project(":spring-statemachine-uml")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-uml')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -144,10 +144,10 @@ project('spring-statemachine-samples-deploy') {
 project('spring-statemachine-samples-ordershipping') {
 	description = 'Spring State Machine Order Shipping Sample'
 	dependencies {
-		compile project(":spring-statemachine-uml")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-uml')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -155,14 +155,14 @@ project('spring-statemachine-samples-ordershipping') {
 project('spring-statemachine-samples-datajpa') {
 	description = 'Spring State Machine Data Jpa Sample'
 	dependencies {
-		compile project(":spring-statemachine-autoconfigure")
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-jpa")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		compile("org.springframework.boot:spring-boot-starter-data-jpa")
-		compile("org.springframework.boot:spring-boot-devtools")
-		compile("com.h2database:h2")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-autoconfigure')
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-jpa')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		compile('org.springframework.boot:spring-boot-starter-data-jpa')
+		compile('org.springframework.boot:spring-boot-devtools')
+		compile('com.h2database:h2')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -170,14 +170,14 @@ project('spring-statemachine-samples-datajpa') {
 project('spring-statemachine-samples-datajpamultipersist') {
 	description = 'Spring State Machine Data Jpa Multi Persist Sample'
 	dependencies {
-		compile project(":spring-statemachine-autoconfigure")
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-jpa")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		compile("org.springframework.boot:spring-boot-starter-data-jpa")
-		compile("org.springframework.boot:spring-boot-devtools")
-		compile("com.h2database:h2")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-autoconfigure')
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-jpa')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		compile('org.springframework.boot:spring-boot-starter-data-jpa')
+		compile('org.springframework.boot:spring-boot-devtools')
+		compile('com.h2database:h2')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -185,18 +185,18 @@ project('spring-statemachine-samples-datajpamultipersist') {
 project('spring-statemachine-samples-datapersist') {
 	description = 'Spring State Machine Data Persist Sample'
 	dependencies {
-		compile project(":spring-statemachine-autoconfigure")
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-jpa")
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-redis")
-		compile project(":spring-statemachine-data-common:spring-statemachine-data-mongodb")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		compile("org.springframework.boot:spring-boot-starter-data-jpa")
-		compile("org.springframework.boot:spring-boot-starter-data-redis")
-		compile("org.springframework.boot:spring-boot-starter-data-mongodb")
-		compile("org.springframework.boot:spring-boot-devtools")
-		compile("com.h2database:h2")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-autoconfigure')
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-jpa')
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-redis')
+		compile project(':spring-statemachine-data-common:spring-statemachine-data-mongodb')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		compile('org.springframework.boot:spring-boot-starter-data-jpa')
+		compile('org.springframework.boot:spring-boot-starter-data-redis')
+		compile('org.springframework.boot:spring-boot-starter-data-mongodb')
+		compile('org.springframework.boot:spring-boot-devtools')
+		compile('com.h2database:h2')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }
@@ -204,13 +204,13 @@ project('spring-statemachine-samples-datapersist') {
 project('spring-statemachine-samples-monitoring') {
 	description = 'Spring State Machine Monitoring Sample'
 	dependencies {
-		compile project(":spring-statemachine-autoconfigure")
-		compile("org.springframework.boot:spring-boot-starter-actuator")
-		compile("org.springframework.boot:spring-boot-starter-web")
-		compile("org.springframework.boot:spring-boot-starter-thymeleaf")
-		testCompile("com.jayway.jsonpath:json-path")
-		testCompile("com.jayway.jsonpath:json-path-assert")
-		testCompile project(path:":spring-statemachine-core", configuration:"testArtifacts")
+		compile project(':spring-statemachine-autoconfigure')
+		compile('org.springframework.boot:spring-boot-starter-actuator')
+		compile('org.springframework.boot:spring-boot-starter-web')
+		compile('org.springframework.boot:spring-boot-starter-thymeleaf')
+		testCompile('com.jayway.jsonpath:json-path')
+		testCompile('com.jayway.jsonpath:json-path-assert')
+		testCompile project(path:':spring-statemachine-core', configuration:'testArtifacts')
 		testCompile 'io.projectreactor:reactor-test'
 	}
 }