From fa7d9790a1b6032620d24967646c47efc9814be7 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 30 Jul 2015 09:52:50 +0200
Subject: [PATCH] Upgrade to Spring Boot 1.3.0

Closes gh-123
---
 initializr-service/application.yml            |  7 +---
 initializr/pom.xml                            | 33 +----------------
 ...izrMetricsExporterAutoConfiguration.groovy | 37 +++----------------
 .../src/main/resources/static/install.sh      |  2 +-
 .../resources/application-test-default.yml    |  2 +-
 5 files changed, 10 insertions(+), 71 deletions(-)

diff --git a/initializr-service/application.yml b/initializr-service/application.yml
index 94ec92c4..71987044 100644
--- a/initializr-service/application.yml
+++ b/initializr-service/application.yml
@@ -1,13 +1,10 @@
 info:
   project:
     name: Spring Start
-    version: 0.3.1
+    version: 0.4.0
   # remember to update static/install.sh as well:
   spring-boot:
-    version: 1.2.5.RELEASE
-endpoints:
-  env:
-    keysToSanitize: key,secret,password,VCAP_SERVICES
+    version: 1.3.0.RELEASE
 
 initializr:
   env:
diff --git a/initializr/pom.xml b/initializr/pom.xml
index 1a145ebe..7b01824a 100644
--- a/initializr/pom.xml
+++ b/initializr/pom.xml
@@ -10,8 +10,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<selenium.version>2.43.1</selenium.version>
-		<spring.boot.version>1.2.5.RELEASE</spring.boot.version>
-		<groovy.version>2.4.4</groovy.version>
+		<spring.boot.version>1.3.0.RELEASE</spring.boot.version>
 		<java.version>1.7</java.version>
 	</properties>
 
@@ -106,36 +105,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-ant</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-groovydoc</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-json</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-templates</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.groovy</groupId>
-				<artifactId>groovy-xml</artifactId>
-				<version>${groovy.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-dependencies</artifactId>
diff --git a/initializr/src/main/groovy/io/spring/initializr/config/InitializrMetricsExporterAutoConfiguration.groovy b/initializr/src/main/groovy/io/spring/initializr/config/InitializrMetricsExporterAutoConfiguration.groovy
index 1101d0f2..886f5d5f 100644
--- a/initializr/src/main/groovy/io/spring/initializr/config/InitializrMetricsExporterAutoConfiguration.groovy
+++ b/initializr/src/main/groovy/io/spring/initializr/config/InitializrMetricsExporterAutoConfiguration.groovy
@@ -17,25 +17,20 @@
 package io.spring.initializr.config
 
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.actuate.metrics.export.Exporter
-import org.springframework.boot.actuate.metrics.export.MetricCopyExporter
-import org.springframework.boot.actuate.metrics.repository.InMemoryMetricRepository
-import org.springframework.boot.actuate.metrics.repository.MetricRepository
+import org.springframework.boot.actuate.autoconfigure.ExportMetricWriter
+import org.springframework.boot.actuate.autoconfigure.MetricExportAutoConfiguration
 import org.springframework.boot.actuate.metrics.repository.redis.RedisMetricRepository
 import org.springframework.boot.actuate.metrics.writer.MetricWriter
 import org.springframework.boot.autoconfigure.AutoConfigureAfter
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.boot.autoconfigure.redis.RedisAutoConfiguration
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Primary
 import org.springframework.data.redis.connection.RedisConnectionFactory
 import org.springframework.scheduling.annotation.EnableScheduling
-import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.util.ObjectUtils
 
 /**
@@ -50,8 +45,7 @@ import org.springframework.util.ObjectUtils
 @ConditionalOnProperty(value = 'spring.metrics.export.enabled')
 @EnableScheduling
 @EnableConfigurationProperties(MetricsProperties)
-@AutoConfigureAfter(value = RedisAutoConfiguration,
-		name = "org.springframework.boot.actuate.autoconfigure.MetricExportAutoConfiguration")
+@AutoConfigureAfter([RedisAutoConfiguration, MetricExportAutoConfiguration])
 class InitializrMetricsExporterAutoConfiguration {
 
 	@Autowired
@@ -64,7 +58,7 @@ class InitializrMetricsExporterAutoConfiguration {
 	ApplicationContext context
 
 	@Bean
-	// @ExportMetricWriter // Add this when upgrading to Boot 1.3
+	@ExportMetricWriter
 	MetricWriter writer() {
 		new RedisMetricRepository(connectionFactory,
 				metrics.prefix + metrics.getId(context.getId()) + '.'
@@ -72,25 +66,4 @@ class InitializrMetricsExporterAutoConfiguration {
 				metrics.key)
 	}
 
-	// Remove this when upgrading to Boot 1.3
-	@Bean
-	@ConditionalOnMissingClass(name = 'org.springframework.boot.actuate.autoconfigure.ActuatorMetricWriter')
-	@Primary
-	MetricRepository reader() {
-		new InMemoryMetricRepository()
-	}
-
-	// Remove this when upgrading to Boot 1.3
-	@Bean
-	@ConditionalOnMissingClass(name = 'org.springframework.boot.actuate.autoconfigure.ActuatorMetricWriter')
-	Exporter exporter(InMemoryMetricRepository reader) {
-		new MetricCopyExporter(reader, writer()) {
-			@Override
-			@Scheduled(fixedRateString = '${spring.metrics.export.default.delayMillis:5000}')
-			void export() {
-				super.export()
-			}
-		}
-	}
-
 }
diff --git a/initializr/src/main/resources/static/install.sh b/initializr/src/main/resources/static/install.sh
index 895ae081..20cf3fb4 100644
--- a/initializr/src/main/resources/static/install.sh
+++ b/initializr/src/main/resources/static/install.sh
@@ -3,7 +3,7 @@
 set -e
 # set -x
 
-VERSION="1.2.5.RELEASE"
+VERSION="1.3.0.RELEASE"
 if [ -z "${PREFIX}" ]; then
     PREFIX="/usr/local/bin"
 fi
diff --git a/initializr/src/test/resources/application-test-default.yml b/initializr/src/test/resources/application-test-default.yml
index 67092f32..bfca8d7e 100644
--- a/initializr/src/test/resources/application-test-default.yml
+++ b/initializr/src/test/resources/application-test-default.yml
@@ -2,7 +2,6 @@ info:
   spring-boot:
     version: 1.1.4.RELEASE
 
-
 initializr:
   dependencies:
     - name: Core
@@ -111,3 +110,4 @@ initializr:
     - name: 1.0.2
       id: 1.0.2.RELEASE
       default: false
+