From 84d95ab51fd7ed4f22aa0865113bce9316fca36c Mon Sep 17 00:00:00 2001
From: Antoine Rey <antoine.rey@gmail.com>
Date: Tue, 9 Jul 2019 08:44:22 +0200
Subject: [PATCH] Upgrade do Spring Boot 2.2.0.M4

---
 build.gradle.kts    | 15 ++++++++-------
 readme.md           | 11 +++++------
 settings.gradle.kts | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 settings.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 7a3f862..e38095c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,16 +2,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 
 project.description = "Kotlin version of the Spring Petclinic application"
+project.group = "org.springframework.samples"
 // Align with Spring Version
-project.version = "2.1.6"
+project.version = "2.2.0.M4"
 
 plugins {
-    val kotlinVersion = "1.3.21"
-    id("org.springframework.boot") version "2.1.6.RELEASE"
-    id("org.jetbrains.kotlin.jvm") version kotlinVersion
-    id("org.jetbrains.kotlin.plugin.spring") version kotlinVersion
+    val kotlinVersion = "1.3.31"
+    id("org.springframework.boot") version "2.2.0.M4"
     id("io.spring.dependency-management") version "1.0.7.RELEASE"
     id("com.google.cloud.tools.jib") version "1.3.0"
+    kotlin("jvm") version kotlinVersion
+    kotlin("plugin.spring") version kotlinVersion
 }
 
 val boostrapVersion = "3.3.6"
@@ -33,6 +34,8 @@ tasks.withType<Test> {
 
 repositories {
     mavenCentral()
+    maven { url = uri("https://repo.spring.io/snapshot") }
+    maven { url = uri("https://repo.spring.io/milestone") }
 }
 
 dependencies {
@@ -61,11 +64,9 @@ dependencies {
     runtimeOnly("mysql:mysql-connector-java")
 }
 
-
 jib {
     to {
         image = "springcommunity/spring-petclinic-kotlin"
         tags = setOf(project.version.toString(), "latest")
     }
 }
-
diff --git a/readme.md b/readme.md
index 6a48c84..e0c2d0a 100644
--- a/readme.md
+++ b/readme.md
@@ -83,6 +83,11 @@ into the [Docker Hub](https://cloud.docker.com/u/springcommunity/repository/dock
 repository.
 The [build.gradle.kts](build.gradle.kts) has been configured to publish the image with a the `springcommunity/spring-petclinic-kotlin` image name.
 
+Build and push the container image of Petclinic to the Docker Hub registry:
+```
+gradle jib -Djib.to.auth.username=<username> -Djib.to.auth.password=<password>
+```
+
 
 ## Interesting Spring Petclinic forks
 
@@ -94,12 +99,6 @@ hosted in a special GitHub org: [spring-petclinic](https://github.com/spring-pet
 If you have a special interest in a different technology stack
 that could be used to implement the Pet Clinic then please join the community there.
 
-Build and push the container image of Petclinc to the Docker Hub registry:
-T
-```
-gradle jib -Djib.to.auth.username=<username> -Djib.to.auth.password=<password>
-```
-
 
 ## Interaction with other open source projects
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..a43db30
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,14 @@
+pluginManagement {
+	repositories {
+		maven { url = uri("https://repo.spring.io/snapshot") }
+		maven { url = uri("https://repo.spring.io/milestone") }
+		gradlePluginPortal()
+	}
+	resolutionStrategy {
+		eachPlugin {
+			if (requested.id.id == "org.springframework.boot") {
+				useModule("org.springframework.boot:spring-boot-gradle-plugin:${requested.version}")
+			}
+		}
+	}
+}