From 297c0471b115af0504e97d7dcc1e26fbc1f55768 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Mon, 9 Jul 2018 16:26:10 +0100
Subject: [PATCH] Fix AWS sample to build better with Gradle

---
 .../function-sample-aws/build.gradle                | 13 +++++++------
 .../gradle/wrapper/gradle-wrapper.properties        |  2 +-
 .../function-sample-aws/pom.xml                     |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle
index 74f9a94a2..1b429ee22 100644
--- a/spring-cloud-function-samples/function-sample-aws/build.gradle
+++ b/spring-cloud-function-samples/function-sample-aws/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
 	ext {
-		springBootVersion = '1.5.12.RELEASE'
-		wrapperVersion = '1.0.11.RELEASE'
+		springBootVersion = '2.0.3.RELEASE'
+		wrapperVersion = '1.0.13.BUILD-SNAPSHOT'
 		shadowVersion = '2.0.1'
 	}
 	repositories {
-		jcenter()
 		mavenLocal()
+		jcenter()
 		mavenCentral()
 		maven { url "https://repo.spring.io/snapshot" }
 		maven { url "https://repo.spring.io/milestone" }
@@ -22,7 +22,8 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'eclipse'
 apply plugin: 'com.github.johnrengelman.shadow'
-apply plugin: 'spring-boot'
+apply plugin: 'io.spring.dependency-management'
+apply plugin: 'org.springframework.boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
 group = 'io.spring.sample'
@@ -44,11 +45,11 @@ ext {
 }
 ext['reactor.version'] = "3.1.7.RELEASE"
 
-assemble.dependsOn = [shadowJar, bootRepackage]
+assemble.dependsOn = [shadowJar, thinJar]
 
 jar {
   manifest {
-    attributes 'Start-Class': 'example.Config'
+    attributes 'Main-Class': 'example.Config'
   }
 }
 
diff --git a/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties
index a0b285197..717f03890 100644
--- a/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-cloud-function-samples/function-sample-aws/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml
index 1869c291a..1583c97f1 100644
--- a/spring-cloud-function-samples/function-sample-aws/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<wrapper.version>1.0.10.RELEASE</wrapper.version>
+		<wrapper.version>1.0.11.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>