Merge pull request #333 from sdeleuze:kotlin-1.0.6

* pr/333:
  Upgrade to Kotlin 1.0.6 with kotlin-spring plugin

initializr-generator/src/main/resources/templates/Application.kt

@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration<% } %>
 @Configuration
 @ComponentScan
 @EnableAutoConfiguration <% } %>
-open class ${applicationName}
+class ${applicationName}
 
 fun main(args: Array<String>) {
     SpringApplication.run(${applicationName}::class.java, *args)

initializr-generator/src/main/resources/templates/starter-build.gradle

@@ -10,11 +10,13 @@ buildscript {
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:\${springBootVersion}")<% if (!bootOneThreeAvailable) { %>
 		classpath('io.spring.gradle:dependency-management-plugin:${dependencyManagementPluginVersion}')<% } %><% if (language=='kotlin') { %>
-		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:\${kotlinVersion}")<% } %>
+		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:\${kotlinVersion}")
+		classpath("org.jetbrains.kotlin:kotlin-allopen:\${kotlinVersion}")<% } %>
 	}
 }
 
-apply plugin: '${language}'<% if (packaging=='war') {  %>
+apply plugin: '${language}'<% if (language=='kotlin') { %>
+apply plugin: 'kotlin-spring'<% } %><% if (packaging=='war') {  %>
 apply plugin: 'eclipse-wtp'<% } else { %>
 apply plugin: 'eclipse'<% } %>
 apply plugin: '${springBootPluginName}'<% if (!bootOneThreeAvailable) { %>

initializr-generator/src/main/resources/templates/starter-pom.xml

@@ -118,6 +118,11 @@
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>\${kotlin.version}</version>
+				<configuration>
+					<compilerPlugins>
+						<plugin>spring</plugin>
+					</compilerPlugins>
+				</configuration>
 				<executions>
 					<execution>
 						<id>compile</id>
@@ -134,6 +139,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.jetbrains.kotlin</groupId>
+						<artifactId>kotlin-maven-allopen</artifactId>
+						<version>\${kotlin.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin><% } %>
 		</plugins>
 	</build>

initializr-generator/src/test/resources/project/kotlin/standard/DemoApplication.kt.gen

@@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 
 @SpringBootApplication
-open class DemoApplication
+class DemoApplication
 
 fun main(args: Array<String>) {
     SpringApplication.run(DemoApplication::class.java, *args)

initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen

@@ -10,10 +10,12 @@ buildscript {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
 		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
+		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
 	}
 }
 
 apply plugin: 'kotlin'
+apply plugin: 'kotlin-spring'
 apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'

initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen

@@ -55,6 +55,11 @@
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
+				<configuration>
+					<compilerPlugins>
+						<plugin>spring</plugin>
+					</compilerPlugins>
+				</configuration>
 				<executions>
 					<execution>
 						<id>compile</id>
@@ -71,6 +76,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.jetbrains.kotlin</groupId>
+						<artifactId>kotlin-maven-allopen</artifactId>
+						<version>${kotlin.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>

initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen

@@ -10,10 +10,12 @@ buildscript {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
 		classpath('io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE')
 		classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
+		classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
 	}
 }
 
 apply plugin: 'kotlin'
+apply plugin: 'kotlin-spring'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'spring-boot'
 apply plugin: 'io.spring.dependency-management'

initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen

@@ -60,6 +60,11 @@
 				<artifactId>kotlin-maven-plugin</artifactId>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<version>${kotlin.version}</version>
+				<configuration>
+					<compilerPlugins>
+						<plugin>spring</plugin>
+					</compilerPlugins>
+				</configuration>
 				<executions>
 					<execution>
 						<id>compile</id>
@@ -76,6 +81,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.jetbrains.kotlin</groupId>
+						<artifactId>kotlin-maven-allopen</artifactId>
+						<version>${kotlin.version}</version>
+					</dependency>
+				</dependencies>
 			</plugin>
 		</plugins>
 	</build>

initializr-service/src/main/resources/application.yml

@@ -80,7 +80,7 @@ initializr:
     gradle:
       dependency-management-plugin-version: 0.6.0.RELEASE
     kotlin:
-      version: 1.0.5-2
+      version: 1.0.6
   dependencies:
     - name: Core
       content: