lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-20 18:48:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #135 from jadekler/master

Browse Source 
* pull135:
  Quote harmonization in build.gradle
This commit is contained in:
Stephane Nicoll
2015-09-27 15:57:57 +02:00
parent 3a3336dea7 1a2a5771c2
commit 0a9cfa2cb2
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:\${springBootVersion}") <% if (!bootOneThreeAvailable) { %> classpath("org.springframework.boot:spring-boot-gradle-plugin:\${springBootVersion}") <% if (!bootOneThreeAvailable) { %>
classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")<% } %> classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')<% } %>
} }
} }
@@ -39,13 +39,13 @@ repositories {
} }
<% } %> <% } %>
dependencies {<% compileDependencies.each { %> dependencies {<% compileDependencies.each { %>
compile("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %><% if (language=='groovy') { %> compile('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %><% if (language=='groovy') { %>
compile("org.codehaus.groovy:groovy")<% } %><% runtimeDependencies.each { %> compile('org.codehaus.groovy:groovy')<% } %><% runtimeDependencies.each { %>
runtime("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %><% if (packaging=='war') { %> runtime('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %><% if (packaging=='war') { %>
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")<% } %><% providedDependencies.each { %> providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')<% } %><% providedDependencies.each { %>
providedRuntime("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %> providedRuntime('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %>
testCompile("org.springframework.boot:spring-boot-starter-test") <% testDependencies.each { %> testCompile('org.springframework.boot:spring-boot-starter-test') <% testDependencies.each { %>
testCompile("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %> testCompile('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %>
} }
<% if (boms) { %> <% if (boms) { %>
dependencyManagement { dependencyManagement {

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

@@ -264,9 +264,9 @@ class ProjectGeneratorTests {
projectGenerator.metadata = metadata projectGenerator.metadata = metadata
def request = createProjectRequest('whatever', 'data-jpa', 'web') def request = createProjectRequest('whatever', 'data-jpa', 'web')
generateGradleBuild(request) generateGradleBuild(request)
.contains("compile(\"org.springframework.boot:spring-boot-starter-web\")") .contains("compile('org.springframework.boot:spring-boot-starter-web')")
.contains("compile(\"org.springframework.boot:spring-boot-starter-data-jpa\")") .contains("compile('org.springframework.boot:spring-boot-starter-data-jpa')")
.contains("compile(\"org.acme:whatever:1.2.3\")") .contains("compile('org.acme:whatever:1.2.3')")
} }
@Test @Test
@@ -303,11 +303,11 @@ class ProjectGeneratorTests {
projectGenerator.metadata = metadata projectGenerator.metadata = metadata
def request = createProjectRequest('hamcrest', 'h2', 'servlet-api', 'data-jpa', 'web') def request = createProjectRequest('hamcrest', 'h2', 'servlet-api', 'data-jpa', 'web')
generateGradleBuild(request) generateGradleBuild(request)
.contains("compile(\"org.springframework.boot:spring-boot-starter-web\")") .contains("compile('org.springframework.boot:spring-boot-starter-web')")
.contains("compile(\"org.springframework.boot:spring-boot-starter-data-jpa\")") .contains("compile('org.springframework.boot:spring-boot-starter-data-jpa')")
.contains("runtime(\"org.h2:h2\")") .contains("runtime('org.h2:h2')")
.contains("providedRuntime(\"javax.servlet:servlet-api\")") .contains("providedRuntime('javax.servlet:servlet-api')")
.contains("testCompile(\"org.hamcrest:hamcrest\")") .contains("testCompile('org.hamcrest:hamcrest')")
} }
@Test @Test
@@ -316,7 +316,7 @@ class ProjectGeneratorTests {
request.bootVersion = '1.2.3.RELEASE' request.bootVersion = '1.2.3.RELEASE'
generateGradleBuild(request) generateGradleBuild(request)
.contains("springBootVersion = '1.2.3.RELEASE'") .contains("springBootVersion = '1.2.3.RELEASE'")
.contains('classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")') .contains("classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')")
.contains("apply plugin: 'spring-boot'") .contains("apply plugin: 'spring-boot'")
.contains("apply plugin: 'io.spring.dependency-management'") .contains("apply plugin: 'io.spring.dependency-management'")
} }
@@ -328,7 +328,7 @@ class ProjectGeneratorTests {
generateGradleBuild(request) generateGradleBuild(request)
.contains("springBootVersion = '1.3.0.BUILD-SNAPSHOT'") .contains("springBootVersion = '1.3.0.BUILD-SNAPSHOT'")
.contains("apply plugin: 'spring-boot'") .contains("apply plugin: 'spring-boot'")
.doesNotContain('classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")') .doesNotContain("classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')")
.doesNotContain("apply plugin: 'io.spring.dependency-management'") .doesNotContain("apply plugin: 'io.spring.dependency-management'")
} }