Skip to content

Commit 04d2d1d

Browse files
jhoellerjhoeller
committed
Consistently use double quotes (even if no interpolation needed)
Includes upgrade to Hibernate ORM 5.3.5, EclipseLink 2.7.3, Selenium HtmlUnit Driver 2.32.1, Jetty 9.4.12 RC2.
1 parent dc55da0 commit 04d2d1d

File tree

9 files changed

+237
-238
lines changed

9 files changed

+237
-238
lines changed

‎build.gradle

+148-149
Large diffs are not rendered by default.

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include "spring-framework-bom"
2525
include "buildSrc"
2626
rootProject.children.find{ it.name == "buildSrc" }.name = "spring-build-src"
2727

28-
rootProject.name = 'spring'
28+
rootProject.name = "spring"
2929
rootProject.children.each {project ->
3030
project.buildFileName = "${project.name}.gradle"
3131
}

‎spring-aop/spring-aop.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = "Spring AOP"
22

33
dependencies {
44
compile(project(":spring-beans"))
5-
compile(project(':spring-core'))
5+
compile(project(":spring-core"))
66
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
77
optional("org.apache.commons:commons-pool2:2.6.0")
88
optional("com.jamonapi:jamon:2.81")

‎spring-beans/spring-beans.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description = "Spring Beans"
33
apply plugin: "groovy"
44

55
dependencies {
6-
compile(project(':spring-core'))
6+
compile(project(":spring-core"))
77
optional("javax.inject:javax.inject:1")
88
optional("org.yaml:snakeyaml:1.21")
99
optional("org.codehaus.groovy:groovy-xml:${groovyVersion}")
@@ -26,6 +26,6 @@ compileGroovy {
2626
// This module also builds Kotlin code and the compileKotlin task naturally depends on
2727
// compileJava. We need to redefine dependencies to break task cycles.
2828
def deps = compileGroovy.taskDependencies.immutableValues + compileGroovy.taskDependencies.mutableValues
29-
compileGroovy.dependsOn = deps - 'compileJava'
29+
compileGroovy.dependsOn = deps - "compileJava"
3030
compileKotlin.dependsOn(compileGroovy)
3131
compileKotlin.classpath += files(compileGroovy.destinationDir)

‎spring-context/spring-context.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: "groovy"
55
dependencies {
66
compile(project(":spring-aop"))
77
compile(project(":spring-beans"))
8-
compile(project(':spring-core'))
8+
compile(project(":spring-core"))
99
compile(project(":spring-expression"))
1010
optional(project(":spring-instrument"))
1111
optional("javax.annotation:javax.annotation-api:1.3.2")

‎spring-orm/spring-orm.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies {
88
optional(project(":spring-aop"))
99
optional(project(":spring-context"))
1010
optional(project(":spring-web"))
11-
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.2")
12-
optional("org.hibernate:hibernate-core:5.3.4.Final")
11+
optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.3")
12+
optional("org.hibernate:hibernate-core:5.3.5.Final")
1313
optional("javax.servlet:javax.servlet-api:3.1.0")
1414
testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
1515
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")

‎spring-oxm/spring-oxm.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ dependencies {
1010
castor "org.codehaus.castor:castor-anttasks:1.4.1"
1111
jibx "org.jibx:jibx-bind:1.3.1"
1212
jibx "org.apache.bcel:bcel:6.0"
13-
xjc 'javax.xml.bind:jaxb-api:2.3.0'
14-
xjc 'com.sun.xml.bind:jaxb-core:2.3.0.1'
15-
xjc 'com.sun.xml.bind:jaxb-impl:2.3.0.1'
16-
xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11' // 2.3.0 breaks with "xjc failed"
17-
xjc 'com.sun.activation:javax.activation:1.2.0'
13+
xjc "javax.xml.bind:jaxb-api:2.3.0"
14+
xjc "com.sun.xml.bind:jaxb-core:2.3.0.1"
15+
xjc "com.sun.xml.bind:jaxb-impl:2.3.0.1"
16+
xjc "com.sun.xml.bind:jaxb-xjc:2.2.11" // 2.3.0 breaks with "xjc failed"
17+
xjc "com.sun.activation:javax.activation:1.2.0"
1818
}
1919

2020
ext.genSourcesDir = "${buildDir}/generated-sources"
@@ -101,19 +101,19 @@ dependencies {
101101
optional("javax.xml.bind:jaxb-api:2.3.0")
102102
optional("javax.activation:activation:1.1.1")
103103
optional("org.codehaus.castor:castor-xml:1.4.1") {
104-
exclude group: 'stax', module: 'stax-api'
104+
exclude group: "stax", module: "stax-api"
105105
exclude group: "org.springframework", module: "spring-context"
106106
exclude group: "commons-logging", module: "commons-logging"
107107
}
108108
optional("com.thoughtworks.xstream:xstream:1.4.10") {
109-
exclude group: 'xpp3', module: 'xpp3_min'
110-
exclude group: 'xmlpull', module: 'xmlpull'
109+
exclude group: "xpp3", module: "xpp3_min"
110+
exclude group: "xmlpull", module: "xmlpull"
111111
}
112112
optional("org.jibx:jibx-run:1.3.1")
113113
testCompile(project(":spring-context"))
114114
testCompile("org.ogce:xpp3:1.1.6")
115115
testCompile("org.codehaus.jettison:jettison:1.3.8") {
116-
exclude group: 'stax', module: 'stax-api'
116+
exclude group: "stax", module: "stax-api"
117117
}
118118
testCompile(files(genCastor.classesDir).builtBy(genCastor))
119119
testCompile(files(genJaxb.classesDir).builtBy(genJaxb))

‎spring-test/spring-test.gradle

+71-71
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description = 'Spring TestContext Framework'
1+
description = "Spring TestContext Framework"
22

33
dependencyManagement {
44
imports {
@@ -9,121 +9,121 @@ dependencyManagement {
99
}
1010

1111
dependencies {
12-
compile(project(':spring-core'))
13-
optional(project(':spring-aop'))
14-
optional(project(':spring-beans'))
15-
optional(project(':spring-context'))
16-
optional(project(':spring-jdbc'))
17-
optional(project(':spring-orm'))
18-
optional(project(':spring-tx'))
19-
optional(project(':spring-web'))
20-
optional(project(':spring-webflux'))
21-
optional(project(':spring-webmvc'))
22-
optional(project(':spring-websocket'))
23-
optional('javax.activation:activation:1.1.1')
24-
optional('javax.el:javax.el-api:3.0.1-b04')
25-
optional('javax.inject:javax.inject:1')
26-
optional('javax.servlet:javax.servlet-api:4.0.1')
27-
optional('javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02')
28-
optional('javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1')
29-
optional('javax.xml.bind:jaxb-api:2.3.0')
30-
optional('javax.websocket:javax.websocket-api:1.1')
31-
optional('junit:junit:4.12')
32-
optional('org.junit.jupiter:junit-jupiter-api')
33-
optional('org.testng:testng:6.14.3')
12+
compile(project(":spring-core"))
13+
optional(project(":spring-aop"))
14+
optional(project(":spring-beans"))
15+
optional(project(":spring-context"))
16+
optional(project(":spring-jdbc"))
17+
optional(project(":spring-orm"))
18+
optional(project(":spring-tx"))
19+
optional(project(":spring-web"))
20+
optional(project(":spring-webflux"))
21+
optional(project(":spring-webmvc"))
22+
optional(project(":spring-websocket"))
23+
optional("javax.activation:activation:1.1.1")
24+
optional("javax.el:javax.el-api:3.0.1-b04")
25+
optional("javax.inject:javax.inject:1")
26+
optional("javax.servlet:javax.servlet-api:4.0.1")
27+
optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
28+
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
29+
optional("javax.xml.bind:jaxb-api:2.3.0")
30+
optional("javax.websocket:javax.websocket-api:1.1")
31+
optional("junit:junit:4.12")
32+
optional("org.junit.jupiter:junit-jupiter-api")
33+
optional("org.testng:testng:6.14.3")
3434
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
3535
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
36-
optional('org.hamcrest:hamcrest-core:1.3')
37-
optional('org.apache.taglibs:taglibs-standard-jstlel:1.2.5') {
38-
exclude group: 'org.apache.taglibs', module: 'taglibs-standard-spec'
36+
optional("org.hamcrest:hamcrest-core:1.3")
37+
optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
38+
exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
3939
}
40-
optional('net.sourceforge.htmlunit:htmlunit:2.32') {
41-
exclude group: 'commons-logging', module: 'commons-logging'
40+
optional("net.sourceforge.htmlunit:htmlunit:2.32") {
41+
exclude group: "commons-logging", module: "commons-logging"
4242
}
43-
optional('org.seleniumhq.selenium:htmlunit-driver:2.32.0') {
44-
exclude group: 'commons-logging', module: 'commons-logging'
43+
optional("org.seleniumhq.selenium:htmlunit-driver:2.32.1") {
44+
exclude group: "commons-logging", module: "commons-logging"
4545
}
46-
optional('org.seleniumhq.selenium:selenium-java:3.14.0') {
47-
exclude group: 'commons-logging', module: 'commons-logging'
48-
exclude group: 'io.netty', module: 'netty'
46+
optional("org.seleniumhq.selenium:selenium-java:3.14.0") {
47+
exclude group: "commons-logging", module: "commons-logging"
48+
exclude group: "io.netty", module: "netty"
4949
}
50-
optional('org.xmlunit:xmlunit-matchers:2.6.0')
51-
optional('org.skyscreamer:jsonassert:1.5.0')
52-
optional('com.jayway.jsonpath:json-path:2.4.0')
50+
optional("org.xmlunit:xmlunit-matchers:2.6.0")
51+
optional("org.skyscreamer:jsonassert:1.5.0")
52+
optional("com.jayway.jsonpath:json-path:2.4.0")
5353
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
5454
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
55-
optional('io.projectreactor:reactor-test')
56-
testCompile(project(':spring-context-support'))
57-
testCompile(project(':spring-oxm'))
58-
testCompile('javax.annotation:javax.annotation-api:1.3.2')
59-
testCompile('javax.cache:cache-api:1.1.0')
60-
testCompile('javax.ejb:javax.ejb-api:3.2')
61-
testCompile('javax.interceptor:javax.interceptor-api:1.2.2')
62-
testCompile('javax.mail:javax.mail-api:1.6.1')
63-
testCompile('org.hibernate:hibernate-core:5.2.17.Final')
64-
testCompile('org.hibernate:hibernate-validator:6.0.12.Final')
55+
optional("io.projectreactor:reactor-test")
56+
testCompile(project(":spring-context-support"))
57+
testCompile(project(":spring-oxm"))
58+
testCompile("javax.annotation:javax.annotation-api:1.3.2")
59+
testCompile("javax.cache:cache-api:1.1.0")
60+
testCompile("javax.ejb:javax.ejb-api:3.2")
61+
testCompile("javax.interceptor:javax.interceptor-api:1.2.2")
62+
testCompile("javax.mail:javax.mail-api:1.6.1")
63+
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
64+
testCompile("org.hibernate:hibernate-validator:6.0.12.Final")
6565
// Enable use of the JUnit Platform Runner
66-
testCompile('org.junit.platform:junit-platform-runner')
67-
testCompile('org.junit.jupiter:junit-jupiter-params')
66+
testCompile("org.junit.platform:junit-platform-runner")
67+
testCompile("org.junit.jupiter:junit-jupiter-params")
6868
testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
69-
testCompile('com.thoughtworks.xstream:xstream:1.4.10')
70-
testCompile('com.rometools:rome:1.11.0')
69+
testCompile("com.thoughtworks.xstream:xstream:1.4.10")
70+
testCompile("com.rometools:rome:1.11.0")
7171
testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
7272
testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
7373
testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)
7474
testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
75-
testCompile('org.apache.httpcomponents:httpclient:4.5.6') {
76-
exclude group: 'commons-logging', module: 'commons-logging'
75+
testCompile("org.apache.httpcomponents:httpclient:4.5.6") {
76+
exclude group: "commons-logging", module: "commons-logging"
7777
}
78-
testCompile('io.projectreactor.netty:reactor-netty')
79-
testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
78+
testCompile("io.projectreactor.netty:reactor-netty")
79+
testCompile("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1")
8080
// Pull in the latest JUnit 5 Launcher API and the Vintage engine as well
8181
// so that we can run JUnit 4 tests in IntelliJ IDEA.
82-
testRuntime('org.junit.jupiter:junit-jupiter-engine')
83-
testRuntime('org.junit.platform:junit-platform-launcher')
84-
testRuntime('org.junit.vintage:junit-vintage-engine')
85-
testRuntime('org.glassfish:javax.el:3.0.1-b08')
86-
testRuntime('com.sun.xml.bind:jaxb-core:2.3.0.1')
87-
testRuntime('com.sun.xml.bind:jaxb-impl:2.3.0.1')
82+
testRuntime("org.junit.jupiter:junit-jupiter-engine")
83+
testRuntime("org.junit.platform:junit-platform-launcher")
84+
testRuntime("org.junit.vintage:junit-vintage-engine")
85+
testRuntime("org.glassfish:javax.el:3.0.1-b08")
86+
testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
87+
testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
8888
}
8989

9090
task testNG(type: Test) {
91-
description = 'Runs TestNG tests.'
91+
description = "Runs TestNG tests."
9292
useTestNG()
9393
scanForTestClasses = false
94-
include(['**/testng/**/*Tests.class', '**/testng/**/*Test.class'])
94+
include(["**/testng/**/*Tests.class", "**/testng/**/*Test.class"])
9595
// Show STD_OUT & STD_ERR of the test JVM(s) on the console:
9696
// testLogging.showStandardStreams = true
9797
// forkEvery 1
9898
reports.junitXml.destination = file("$buildDir/test-results")
9999
}
100100

101101
task testJUnitJupiter(type: Test) {
102-
description = 'Runs JUnit Jupiter tests.'
102+
description = "Runs JUnit Jupiter tests."
103103
useJUnitPlatform {
104-
includeEngines 'junit-jupiter'
105-
excludeTags 'failing-test-case'
104+
includeEngines "junit-jupiter"
105+
excludeTags "failing-test-case"
106106
}
107107
filter {
108-
includeTestsMatching 'org.springframework.test.context.junit.jupiter.*'
108+
includeTestsMatching "org.springframework.test.context.junit.jupiter.*"
109109
}
110110
reports.junitXml.destination = file("$buildDir/test-results")
111111
// Java Util Logging for the JUnit Platform.
112-
// systemProperty('java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager')
112+
// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
113113
}
114114

115115
test {
116-
description = 'Runs JUnit 4 tests.'
116+
description = "Runs JUnit 4 tests."
117117
dependsOn testJUnitJupiter, testNG
118118
useJUnit()
119119
scanForTestClasses = false
120-
include(['**/*Tests.class', '**/*Test.class'])
121-
exclude(['**/testng/**/*.*', '**/jupiter/**/*.*'])
120+
include(["**/*Tests.class", "**/*Test.class"])
121+
exclude(["**/testng/**/*.*", "**/jupiter/**/*.*"])
122122
reports.junitXml.destination = file("$buildDir/test-results")
123123
}
124124

125125
task aggregateTestReports(type: TestReport) {
126-
description = 'Aggregates JUnit and TestNG test reports.'
126+
description = "Aggregates JUnit and TestNG test reports."
127127
destinationDir = test.reports.html.destination
128128
reportOn test, testJUnitJupiter, testNG
129129
}

‎spring-webmvc/spring-webmvc.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
compile(project(":spring-aop"))
1313
compile(project(":spring-beans"))
1414
compile(project(":spring-context"))
15-
compile(project(':spring-core'))
15+
compile(project(":spring-core"))
1616
compile(project(":spring-expression"))
1717
compile(project(":spring-web"))
1818
optional(project(":spring-context-support")) // for FreeMarker support
@@ -21,7 +21,7 @@ dependencies {
2121
optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
2222
optional("javax.el:javax.el-api:3.0.1-b04")
2323
optional("javax.xml.bind:jaxb-api:2.3.0")
24-
optional('org.webjars:webjars-locator-core:0.35')
24+
optional("org.webjars:webjars-locator-core:0.35")
2525
optional("com.rometools:rome:1.11.0")
2626
optional("com.github.librepdf:openpdf:1.2.0")
2727
optional("org.apache.poi:poi-ooxml:3.17")

0 commit comments

Comments
 (0)