lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-05 17:38:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip providedRuntime configuration block with war projects

Browse Source 
Closes gh-796
This commit is contained in:
Stephane Nicoll 2019-01-10 14:57:10 +01:00
parent e34720a35a
commit 1fcf48e2fa
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,12 +49,14 @@ repositories {
{{/repositoryValues}}
}
{{^war}}
{{#providedDependencies}}
configurations {
providedRuntime
}
{{/providedDependencies}}
{{/war}}
{{#hasBuildPropertiesVersions}}
ext {
{{#buildPropertiesVersions}}

6
initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java
View File

@ -219,7 +219,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation 'org.springframework.boot:spring-boot-starter-test'")
.contains("configurations {") // declare providedRuntime config
.doesNotContain("configurations {") // no need to declare providedRuntime
.contains("providedRuntime").contains(
"providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'");
}
@ -235,7 +235,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation 'org.springframework.boot:spring-boot-starter-test'")
.contains("configurations {") // declare providedRuntime config
.doesNotContain("configurations {") // no need to declare providedRuntime
.contains("providedRuntime").contains(
"providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'");
}
@ -497,7 +497,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"implementation 'org.springframework.boot:spring-boot-starter-data-jpa'")
// declare providedRuntime config
// declare providedRuntime config for jar-based projects
.contains("runtimeOnly 'org.h2:h2'").contains("configurations {")
.contains("providedRuntime")
.contains("providedRuntime 'javax.servlet:servlet-api'")

4
initializr-generator/src/test/resources/project/groovy/standard/war-build.gradle.gen
View File

@ -23,10 +23,6 @@ repositories {
mavenCentral()
}
configurations {
providedRuntime
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.codehaus.groovy:groovy'

4
initializr-generator/src/test/resources/project/java/standard/war-build.gradle.gen
View File

@ -23,10 +23,6 @@ repositories {
mavenCentral()
}
configurations {
providedRuntime
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'

4
initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen
View File

@ -27,10 +27,6 @@ repositories {
mavenCentral()
}
configurations {
providedRuntime
}
dependencies {
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"