lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-30 12:48:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid overriding baseName for jar/war task

Browse Source 
Closes gh-381
This commit is contained in:
Stephane Nicoll 2017-03-15 14:19:11 +01:00
parent 9e35b8acd6
commit c6194d2357
13 changed files with 14 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,11 +41,7 @@ apply plugin: 'io.spring.dependency-management'
apply plugin: 'war'
{{/war}}
{{#war}}war{{/war}}{{^war}}jar{{/war}} {
baseName = '{{artifactId}}'
version = '{{version}}'
}
version = '{{version}}'
sourceCompatibility = {{javaVersion}}
repositories {

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

@ -168,8 +168,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
request.setType("gradle-project");
generateProject(request).isJavaWarProject().isGradleProject().gradleBuildAssert()
// This is tagged as web facet so it brings the web one
.contains("compile('org.foo:thymeleaf')").contains("war {")
.contains("compile('org.foo:thymeleaf')").contains("apply plugin: 'war'")
.contains("apply plugin: 'war'")
.contains("compile('org.foo:thymeleaf')")
.doesNotContain(
"compile('org.springframework.boot:spring-boot-starter-web')")
.contains(

3
initializr-generator/src/test/java/io/spring/initializr/test/generator/GradleBuildAssert.java
View File

@ -38,8 +38,7 @@ public class GradleBuildAssert {
* Validate that this generated gradle build validates against its request.
*/
public GradleBuildAssert validateProjectRequest(ProjectRequest request) {
return hasArtifactId(request.getArtifactId()).hasVersion(request.getVersion())
.hasBootVersion(request.getBootVersion())
return hasVersion(request.getVersion()).hasBootVersion(request.getBootVersion())
.hasJavaVersion(request.getJavaVersion());
}

6
initializr-generator/src/test/resources/project/gradle/bom-ordering-build.gradle.gen
View File

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

6
initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen
View File

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

6
initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen
View File

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

6
initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen
View File

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -17,11 +17,7 @@ apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'war'
war {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -16,11 +16,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -17,11 +17,7 @@ apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'war'
war {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -20,11 +20,7 @@ apply plugin: 'eclipse'
apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
jar {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {

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

@ -21,11 +21,7 @@ apply plugin: 'spring-boot'
apply plugin: 'io.spring.dependency-management'
apply plugin: 'war'
war {
baseName = 'demo'
version = '0.0.1-SNAPSHOT'
}
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.8
repositories {