From 5f532d3780b3fe2d475c798999fb83754a4cbbd9 Mon Sep 17 00:00:00 2001
From: Sebastien Deleuze <sdeleuze@pivotal.io>
Date: Wed, 6 Apr 2016 11:44:40 +0200
Subject: [PATCH] Upgrade to Exposed 0.4.2 and Spring Framework 4.3.0.RC1

---
 build.gradle                                       | 14 ++++++++------
 src/main/kotlin/io/spring/messenger/Application.kt |  3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index a70c210..43c8f97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,9 @@ apply plugin: 'spring-boot'
 
 repositories {
   mavenCentral()
-  maven { url 'http://repo.spring.io/snapshot' }
-  maven { url 'https://dl.bintray.com/sdeleuze/maven/' }
+  maven { url 'http://repo.spring.io/milestone' }
+  maven { url 'https://dl.bintray.com/kotlin/exposed' } // exposed
+  maven { url 'https://dl.bintray.com/sdeleuze/maven/' } // postgis-geojson
 }
 
 jar {
@@ -35,8 +36,8 @@ jar {
 }
 
 ext['snippetsDir'] = file('build/generated-snippets')
-ext['spring.version'] = '4.3.0.BUILD-SNAPSHOT'
-ext['jackson.version'] = '2.7.1'
+ext['spring.version'] = '4.3.0.RC1'
+ext['jackson.version'] = '2.7.3'
 
 configurations {
   all*.exclude group: 'postgresql', module: 'postgresql'
@@ -51,9 +52,10 @@ dependencies {
 
 
   compile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-  compile('com.fasterxml.jackson.module:jackson-module-kotlin:2.7.1-2')
+  compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
+  compile("com.fasterxml.jackson.module:jackson-module-kotlin:${project.ext['jackson.version']}")
 
-  compile('org.jetbrains.exposed:exposed:0.4-M1') { // https://github.com/sdeleuze/Exposed
+  compile('org.jetbrains.exposed:exposed:0.4.2') {
     exclude module: 'h2'
     exclude module: 'joda-time'
   }
diff --git a/src/main/kotlin/io/spring/messenger/Application.kt b/src/main/kotlin/io/spring/messenger/Application.kt
index 5fd4077..05934e4 100644
--- a/src/main/kotlin/io/spring/messenger/Application.kt
+++ b/src/main/kotlin/io/spring/messenger/Application.kt
@@ -2,7 +2,6 @@ package io.spring.messenger
 
 import com.fasterxml.jackson.annotation.JsonInclude.Include
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
 import io.spring.messenger.domain.Message
 import io.spring.messenger.domain.User
 import io.spring.messenger.repository.MessageRepository
@@ -20,7 +19,7 @@ import javax.sql.DataSource
 open class Application {
 
     @Bean open fun objectMapper(): ObjectMapper {
-        val mapper:ObjectMapper = Jackson2ObjectMapperBuilder().modulesToInstall(PostGISModule(), KotlinModule()).build()
+        val mapper:ObjectMapper = Jackson2ObjectMapperBuilder().modulesToInstall(PostGISModule()).build()
         mapper.setSerializationInclusion(Include.NON_NULL)
         return mapper
     }