From 862979fc878d9a25e69db7374fdcc87b9a4a1579 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 28 Dec 2016 17:48:03 +0000
Subject: [PATCH] Upgrade to spring framework 5

- Enable snapshot repos and pump up to
  framework 5.0.0 and boot 2.0.0 snapshots.
- Due to issue in github.com/spring-gradle-plugins/dependency-management-plugin/issues/136
  define newer log4j version for spring-statemachine-zookeeper
- There were some other minor issues preventing to do this earlier
  which are now fixed in framework snapshots.
- Fixes #296
---
 build.gradle      | 8 ++++++--
 gradle.properties | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3f70d3b2..c59dfcc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,12 +2,13 @@ buildscript {
 	repositories {
 		maven { url 'http://repo.springsource.org/libs-release'}
 		maven { url 'http://repo.springsource.org/plugins-release' }
+		maven { url 'http://repo.springsource.org/plugins-snapshot' }
 	}
 	dependencies {
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
 		classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.2')
 		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.4.1.RELEASE")
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
 	}
 }
 
@@ -56,6 +57,7 @@ configure(allprojects) {
 
 	repositories {
 		mavenCentral()
+		maven { url "http://repo.springsource.org/libs-snapshot" }
 		maven { url "http://repo.springsource.org/libs-release" }
 		maven { url "http://repo.springsource.org/libs-milestone" }
 	}
@@ -199,6 +201,8 @@ project('spring-statemachine-zookeeper') {
 		compile project(":spring-statemachine-core")
 		compile project(":spring-statemachine-kryo")
 		compile "org.apache.curator:curator-recipes:$curatorVersion"
+		// github.com/spring-gradle-plugins/dependency-management-plugin/issues/136
+		runtime "log4j:log4j:$log4jVersion"
 
 		testCompile project(":spring-statemachine-test")
 		testCompile "org.apache.curator:curator-test:$curatorVersion"
@@ -348,7 +352,7 @@ project('spring-statemachine-recipes-common') {
 }
 
 configure(sampleProjects()) {
-	apply plugin: 'spring-boot'
+	apply plugin: 'org.springframework.boot'
 	configurations.archives.artifacts.removeAll { it.archiveTask.is jar }
 	tasks.findByPath("artifactoryPublish")?.enabled = false
 	// as samples are not published, we can use jdk8
diff --git a/gradle.properties b/gradle.properties
index 7459f7b1..29b59e55 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,14 +7,14 @@ eclipseEmfXmiVersion=2.11.1-v20150805-0538
 eclipseUml2CommonVersion=2.0.0-v20140602-0749
 junitVersion=4.12
 commonsPool2Version=2.4.2
-springBootVersion=1.4.1.RELEASE
+springBootVersion=2.0.0.BUILD-SNAPSHOT
 mockitoVersion=1.9.5
 springSessionVersion=1.0.2.RELEASE
 eclipseEmfEcoreVersion=2.11.1-v20150805-0538
 tomcatEmbedVersion=8.5.5
 springSecurityVersion=4.0.3.RELEASE
 eclipseEmfCommonVersion=2.11.0-v20150805-0538
-springVersion=4.3.3.RELEASE
+springVersion=5.0.0.BUILD-SNAPSHOT
 eclipseUml2TypesVersion=2.0.0-v20140602-0749
 hsqlVersion=2.3.1
 jsonpathVersion=2.0.0