Skip to content

Commit

Permalink
Consistently use double quotes (even if no interpolation needed)
Browse files Browse the repository at this point in the history
Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
  • Loading branch information
jhoeller committed Aug 16, 2018
1 parent dc55da0 commit 04d2d1d
Show file tree
Hide file tree
Showing 9 changed files with 237 additions and 238 deletions.
297 changes: 148 additions & 149 deletions build.gradle

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ include "spring-framework-bom"
include "buildSrc"
rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"

rootProject.name = 'spring'
rootProject.name = "spring"
rootProject.children.each {project ->
project.buildFileName = "${project.name}.gradle"
}
2 changes: 1 addition & 1 deletion spring-aop/spring-aop.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ description = "Spring AOP"

dependencies {
compile(project(":spring-beans"))
compile(project(':spring-core'))
compile(project(":spring-core"))
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.apache.commons:commons-pool2:2.6.0")
optional("com.jamonapi:jamon:2.81")
Expand Down
4 changes: 2 additions & 2 deletions spring-beans/spring-beans.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description = "Spring Beans"
apply plugin: "groovy"

dependencies {
compile(project(':spring-core'))
compile(project(":spring-core"))
optional("javax.inject:javax.inject:1")
optional("org.yaml:snakeyaml:1.21")
optional("org.codehaus.groovy:groovy-xml:${groovyVersion}")
Expand All @@ -26,6 +26,6 @@ compileGroovy {
// This module also builds Kotlin code and the compileKotlin task naturally depends on
// compileJava. We need to redefine dependencies to break task cycles.
def deps = compileGroovy.taskDependencies.immutableValues + compileGroovy.taskDependencies.mutableValues
compileGroovy.dependsOn = deps - 'compileJava'
compileGroovy.dependsOn = deps - "compileJava"
compileKotlin.dependsOn(compileGroovy)
compileKotlin.classpath += files(compileGroovy.destinationDir)
2 changes: 1 addition & 1 deletion spring-context/spring-context.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apply plugin: "groovy"
dependencies {
compile(project(":spring-aop"))
compile(project(":spring-beans"))
compile(project(':spring-core'))
compile(project(":spring-core"))
compile(project(":spring-expression"))
optional(project(":spring-instrument"))
optional("javax.annotation:javax.annotation-api:1.3.2")
Expand Down
4 changes: 2 additions & 2 deletions spring-orm/spring-orm.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ dependencies {
optional(project(":spring-aop"))
optional(project(":spring-context"))
optional(project(":spring-web"))
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.2")
optional("org.hibernate:hibernate-core:5.3.4.Final")
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.3")
optional("org.hibernate:hibernate-core:5.3.5.Final")
optional("javax.servlet:javax.servlet-api:3.1.0")
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
Expand Down
18 changes: 9 additions & 9 deletions spring-oxm/spring-oxm.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ dependencies {
castor "org.codehaus.castor:castor-anttasks:1.4.1"
jibx "org.jibx:jibx-bind:1.3.1"
jibx "org.apache.bcel:bcel:6.0"
xjc 'javax.xml.bind:jaxb-api:2.3.0'
xjc 'com.sun.xml.bind:jaxb-core:2.3.0.1'
xjc 'com.sun.xml.bind:jaxb-impl:2.3.0.1'
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' // 2.3.0 breaks with "xjc failed"
xjc 'com.sun.activation:javax.activation:1.2.0'
xjc "javax.xml.bind:jaxb-api:2.3.0"
xjc "com.sun.xml.bind:jaxb-core:2.3.0.1"
xjc "com.sun.xml.bind:jaxb-impl:2.3.0.1"
xjc "com.sun.xml.bind:jaxb-xjc:2.2.11" // 2.3.0 breaks with "xjc failed"
xjc "com.sun.activation:javax.activation:1.2.0"
}

ext.genSourcesDir = "${buildDir}/generated-sources"
Expand Down Expand Up @@ -101,19 +101,19 @@ dependencies {
optional("javax.xml.bind:jaxb-api:2.3.0")
optional("javax.activation:activation:1.1.1")
optional("org.codehaus.castor:castor-xml:1.4.1") {
exclude group: 'stax', module: 'stax-api'
exclude group: "stax", module: "stax-api"
exclude group: "org.springframework", module: "spring-context"
exclude group: "commons-logging", module: "commons-logging"
}
optional("com.thoughtworks.xstream:xstream:1.4.10") {
exclude group: 'xpp3', module: 'xpp3_min'
exclude group: 'xmlpull', module: 'xmlpull'
exclude group: "xpp3", module: "xpp3_min"
exclude group: "xmlpull", module: "xmlpull"
}
optional("org.jibx:jibx-run:1.3.1")
testCompile(project(":spring-context"))
testCompile("org.ogce:xpp3:1.1.6")
testCompile("org.codehaus.jettison:jettison:1.3.8") {
exclude group: 'stax', module: 'stax-api'
exclude group: "stax", module: "stax-api"
}
testCompile(files(genCastor.classesDir).builtBy(genCastor))
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
Expand Down
142 changes: 71 additions & 71 deletions spring-test/spring-test.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
description = 'Spring TestContext Framework'
description = "Spring TestContext Framework"

dependencyManagement {
imports {
Expand All @@ -9,121 +9,121 @@ 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
reports.junitXml.destination = file("$buildDir/test-results")
}

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
}
Expand Down
4 changes: 2 additions & 2 deletions spring-webmvc/spring-webmvc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
compile(project(":spring-aop"))
compile(project(":spring-beans"))
compile(project(":spring-context"))
compile(project(':spring-core'))
compile(project(":spring-core"))
compile(project(":spring-expression"))
compile(project(":spring-web"))
optional(project(":spring-context-support")) // for FreeMarker support
Expand All @@ -21,7 +21,7 @@ dependencies {
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
optional("javax.el:javax.el-api:3.0.1-b04")
optional("javax.xml.bind:jaxb-api:2.3.0")
optional('org.webjars:webjars-locator-core:0.35')
optional("org.webjars:webjars-locator-core:0.35")
optional("com.rometools:rome:1.11.0")
optional("com.github.librepdf:openpdf:1.2.0")
optional("org.apache.poi:poi-ooxml:3.17")
Expand Down

0 comments on commit 04d2d1d

Please sign in to comment.