lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-12-26 22:25:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update generated build.gradle for Boot 1.3 to use latest plugin id

Browse Source 
Spring Boot 1.3 snapshots had changed the id of the Gradle plugin from
spring-boot to org.springframework.boot.spring-boot. This change has
since been reverted.

This commit updates the Initializr to revert back to using the old id,
spring-boot. Some custom Spring Boot 1.3 logic remains: the dependency
management plugin is not applied to a Boot 1.3 project as Spring Boot
1.3 applies it automatically.
This commit is contained in:
Andy Wilkinson
2015-04-23 17:38:04 +01:00
parent df8b2ce329
commit 3ad25078e6
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
initializr/src/main/resources/templates/starter-build.gradle
View File

@@ -16,10 +16,9 @@ buildscript {
apply plugin: '${language}'<% if (packaging=='war') { %>
apply plugin: 'eclipse-wtp'<% } else { %>
apply plugin: 'eclipse'<% } %>
apply plugin: 'idea' <% if (bootOneThreeAvailable) { %>
apply plugin: 'org.springframework.boot.spring-boot' <% } else { %>
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'<% } %><% if (packaging=='war') { %>
apply plugin: 'idea'
apply plugin: 'spring-boot' <% if (!bootOneThreeAvailable) { %>
apply plugin: 'io.spring.dependency-management' <% } %><% if (packaging=='war') { %>
apply plugin: 'war'
<% } %>

4
initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
View File

@@ -311,7 +311,6 @@ class ProjectGeneratorTests {
.contains('classpath("io.spring.gradle:dependency-management-plugin:0.5.0.RELEASE")')
.contains("apply plugin: 'spring-boot'")
.contains("apply plugin: 'io.spring.dependency-management'")
.doesNotContain("apply plugin: 'org.springframework.boot.spring-boot'")
}
@Test
@@ -320,9 +319,8 @@ class ProjectGeneratorTests {
request.bootVersion = '1.3.0.BUILD-SNAPSHOT'
generateGradleBuild(request)
.contains("springBootVersion = '1.3.0.BUILD-SNAPSHOT'")
.contains("apply plugin: 'org.springframework.boot.spring-boot'")
.contains("apply plugin: 'spring-boot'")
.doesNotContain('classpath("io.spring.gradle:dependency-management-plugin:0.5.0.RELEASE")')
.doesNotContain("apply plugin: 'spring-boot'")
.doesNotContain("apply plugin: 'io.spring.dependency-management'")
}