Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consistently use double quotes (even if no interpolation needed)

Browse Source 
Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
This commit is contained in:
Juergen Hoeller
2018-08-16 15:32:44 +02:00
parent dc55da0988
commit 04d2d1da0d
9 changed files with 237 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
spring-test/spring-test.gradle
View File

@@ -1,4 +1,4 @@
description = 'Spring TestContext Framework'
description = "Spring TestContext Framework"
dependencyManagement {
imports {
@@ -9,89 +9,89 @@ dependencyManagement {
}
dependencies {
compile(project(':spring-core'))
optional(project(':spring-aop'))
optional(project(':spring-beans'))
optional(project(':spring-context'))
optional(project(':spring-jdbc'))
optional(project(':spring-orm'))
optional(project(':spring-tx'))
optional(project(':spring-web'))
optional(project(':spring-webflux'))
optional(project(':spring-webmvc'))
optional(project(':spring-websocket'))
optional('javax.activation:activation:1.1.1')
optional('javax.el:javax.el-api:3.0.1-b04')
optional('javax.inject:javax.inject:1')
optional('javax.servlet:javax.servlet-api:4.0.1')
optional('javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02')
optional('javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1')
optional('javax.xml.bind:jaxb-api:2.3.0')
optional('javax.websocket:javax.websocket-api:1.1')
optional('junit:junit:4.12')
optional('org.junit.jupiter:junit-jupiter-api')
optional('org.testng:testng:6.14.3')
compile(project(":spring-core"))
optional(project(":spring-aop"))
optional(project(":spring-beans"))
optional(project(":spring-context"))
optional(project(":spring-jdbc"))
optional(project(":spring-orm"))
optional(project(":spring-tx"))
optional(project(":spring-web"))
optional(project(":spring-webflux"))
optional(project(":spring-webmvc"))
optional(project(":spring-websocket"))
optional("javax.activation:activation:1.1.1")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.inject:javax.inject:1")
optional("javax.servlet:javax.servlet-api:4.0.1")
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.websocket:javax.websocket-api:1.1")
optional("junit:junit:4.12")
optional("org.junit.jupiter:junit-jupiter-api")
optional("org.testng:testng:6.14.3")
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional('org.hamcrest:hamcrest-core:1.3')
optional('org.apache.taglibs:taglibs-standard-jstlel:1.2.5') {
exclude group: 'org.apache.taglibs', module: 'taglibs-standard-spec'
optional("org.hamcrest:hamcrest-core:1.3")
optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
}
optional('net.sourceforge.htmlunit:htmlunit:2.32') {
exclude group: 'commons-logging', module: 'commons-logging'
optional("net.sourceforge.htmlunit:htmlunit:2.32") {
exclude group: "commons-logging", module: "commons-logging"
}
optional('org.seleniumhq.selenium:htmlunit-driver:2.32.0') {
exclude group: 'commons-logging', module: 'commons-logging'
optional("org.seleniumhq.selenium:htmlunit-driver:2.32.1") {
exclude group: "commons-logging", module: "commons-logging"
}
optional('org.seleniumhq.selenium:selenium-java:3.14.0') {
exclude group: 'commons-logging', module: 'commons-logging'
exclude group: 'io.netty', module: 'netty'
optional("org.seleniumhq.selenium:selenium-java:3.14.0") {
exclude group: "commons-logging", module: "commons-logging"
exclude group: "io.netty", module: "netty"
}
optional('org.xmlunit:xmlunit-matchers:2.6.0')
optional('org.skyscreamer:jsonassert:1.5.0')
optional('com.jayway.jsonpath:json-path:2.4.0')
optional("org.xmlunit:xmlunit-matchers:2.6.0")
optional("org.skyscreamer:jsonassert:1.5.0")
optional("com.jayway.jsonpath:json-path:2.4.0")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
optional('io.projectreactor:reactor-test')
testCompile(project(':spring-context-support'))
testCompile(project(':spring-oxm'))
testCompile('javax.annotation:javax.annotation-api:1.3.2')
testCompile('javax.cache:cache-api:1.1.0')
testCompile('javax.ejb:javax.ejb-api:3.2')
testCompile('javax.interceptor:javax.interceptor-api:1.2.2')
testCompile('javax.mail:javax.mail-api:1.6.1')
testCompile('org.hibernate:hibernate-core:5.2.17.Final')
testCompile('org.hibernate:hibernate-validator:6.0.12.Final')
optional("io.projectreactor:reactor-test")
testCompile(project(":spring-context-support"))
testCompile(project(":spring-oxm"))
testCompile("javax.annotation:javax.annotation-api:1.3.2")
testCompile("javax.cache:cache-api:1.1.0")
testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
// Enable use of the JUnit Platform Runner
testCompile('org.junit.platform:junit-platform-runner')
testCompile('org.junit.jupiter:junit-jupiter-params')
testCompile("org.junit.platform:junit-platform-runner")
testCompile("org.junit.jupiter:junit-jupiter-params")
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
testCompile('com.thoughtworks.xstream:xstream:1.4.10')
testCompile('com.rometools:rome:1.11.0')
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
testCompile("com.rometools:rome:1.11.0")
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
testCompile('org.apache.httpcomponents:httpclient:4.5.6') {
exclude group: 'commons-logging', module: 'commons-logging'
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
exclude group: "commons-logging", module: "commons-logging"
}
testCompile('io.projectreactor.netty:reactor-netty')
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
testCompile("io.projectreactor.netty:reactor-netty")
testCompile("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1")
// Pull in the latest JUnit 5 Launcher API and the Vintage engine as well
// so that we can run JUnit 4 tests in IntelliJ IDEA.
testRuntime('org.junit.jupiter:junit-jupiter-engine')
testRuntime('org.junit.platform:junit-platform-launcher')
testRuntime('org.junit.vintage:junit-vintage-engine')
testRuntime('org.glassfish:javax.el:3.0.1-b08')
testRuntime('com.sun.xml.bind:jaxb-core:2.3.0.1')
testRuntime('com.sun.xml.bind:jaxb-impl:2.3.0.1')
testRuntime("org.junit.jupiter:junit-jupiter-engine")
testRuntime("org.junit.platform:junit-platform-launcher")
testRuntime("org.junit.vintage:junit-vintage-engine")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
}
task testNG(type: Test) {
description = 'Runs TestNG tests.'
description = "Runs TestNG tests."
useTestNG()
scanForTestClasses = false
include(['**/testng/**/*Tests.class', '**/testng/**/*Test.class'])
include(["**/testng/**/*Tests.class", "**/testng/**/*Test.class"])
// Show STD_OUT & STD_ERR of the test JVM(s) on the console:
// testLogging.showStandardStreams = true
// forkEvery 1
@@ -99,31 +99,31 @@ task testNG(type: Test) {
}
task testJUnitJupiter(type: Test) {
description = 'Runs JUnit Jupiter tests.'
description = "Runs JUnit Jupiter tests."
useJUnitPlatform {
includeEngines 'junit-jupiter'
excludeTags 'failing-test-case'
includeEngines "junit-jupiter"
excludeTags "failing-test-case"
}
filter {
includeTestsMatching 'org.springframework.test.context.junit.jupiter.*'
includeTestsMatching "org.springframework.test.context.junit.jupiter.*"
}
reports.junitXml.destination = file("$buildDir/test-results")
// Java Util Logging for the JUnit Platform.
// systemProperty('java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager')
// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
}
test {
description = 'Runs JUnit 4 tests.'
description = "Runs JUnit 4 tests."
dependsOn testJUnitJupiter, testNG
useJUnit()
scanForTestClasses = false
include(['**/*Tests.class', '**/*Test.class'])
exclude(['**/testng/**/*.*', '**/jupiter/**/*.*'])
include(["**/*Tests.class", "**/*Test.class"])
exclude(["**/testng/**/*.*", "**/jupiter/**/*.*"])
reports.junitXml.destination = file("$buildDir/test-results")
}
task aggregateTestReports(type: TestReport) {
description = 'Aggregates JUnit and TestNG test reports.'
description = "Aggregates JUnit and TestNG test reports."
destinationDir = test.reports.html.destination
reportOn test, testJUnitJupiter, testNG
}