upgrade gradle-tomcat-plugin from 1.0 to 2.5 (NOK)
This commit is contained in:
@@ -38,7 +38,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'org.gradle.api.plugins:gradle-tomcat-plugin:1.0',
|
classpath 'com.bmuschko:gradle-tomcat-plugin:2.5',
|
||||||
'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0',
|
'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0',
|
||||||
'org.zeroturnaround:gradle-jrebel-plugin:1.1.2',
|
'org.zeroturnaround:gradle-jrebel-plugin:1.1.2',
|
||||||
'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' // also change springDataJpaVersion below
|
'org.springframework.boot:spring-boot-gradle-plugin:2.1.3.RELEASE' // also change springDataJpaVersion below
|
||||||
@@ -55,7 +55,7 @@ apply plugin: 'war'
|
|||||||
apply plugin: 'org.springframework.boot'
|
apply plugin: 'org.springframework.boot'
|
||||||
apply plugin: 'eclipse'
|
apply plugin: 'eclipse'
|
||||||
apply plugin: 'idea'
|
apply plugin: 'idea'
|
||||||
apply plugin: 'tomcat'
|
apply plugin: 'com.bmuschko.tomcat'
|
||||||
apply plugin: 'project-report'
|
apply plugin: 'project-report'
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
apply plugin: 'openjpa'
|
apply plugin: 'openjpa'
|
||||||
@@ -367,12 +367,11 @@ configurations {
|
|||||||
integrationTestRuntime.extendsFrom testRuntime
|
integrationTestRuntime.extendsFrom testRuntime
|
||||||
}
|
}
|
||||||
|
|
||||||
task integrationTest(type:Test){
|
task integrationTest(type:Test) {
|
||||||
description = "Run integration tests (located in src/integrationTest/java). Starts tomcat in daemon mode before executing the tests."
|
description = "Run integration tests (located in src/integrationTest/java). Starts tomcat in daemon mode before executing the tests."
|
||||||
it.dependsOn war
|
it.dependsOn war
|
||||||
doFirst {
|
doFirst {
|
||||||
tomcatRunWar.daemon = true
|
tomcatRunWar.daemon = true
|
||||||
tomcatRunWar.execute()
|
|
||||||
}
|
}
|
||||||
testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
|
testClassesDirs = project.sourceSets.integrationTest.output.classesDirs
|
||||||
classpath = project.sourceSets.integrationTest.runtimeClasspath
|
classpath = project.sourceSets.integrationTest.runtimeClasspath
|
||||||
|
|||||||
Reference in New Issue
Block a user