Skip to content

Commit ed74410

Browse files
committed
Java 11 fixes
1 parent b1407f2 commit ed74410

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ plugins {
2323
}
2424

2525
ext {
26+
javaApi = "https://docs.oracle.com/javase/8/docs/api/"
27+
if (JavaVersion.current() >= JavaVersion.VERSION_11) {
28+
javaApi = "https://docs.oracle.com/en/java/javase/11/docs/api"
29+
}
2630
javadocLinks = [
27-
"https://docs.oracle.com/javase/8/docs/api/",
28-
"https://docs.spring.io/spring/docs/${springFrameworkVersion}/javadoc-api/"
31+
javaApi,
32+
"https://docs.spring.io/spring-framework/docs/${springFrameworkVersion}/javadoc-api/"
2933
] as String[]
3034
}
3135

@@ -199,7 +203,7 @@ configure(staticAnalysisProjects) {
199203
apply plugin: "jacoco"
200204

201205
checkstyle {
202-
configFile = file("${project.rootDir}/src/checkstyle/checkstyle.xml")
206+
configDirectory = rootProject.file("src/checkstyle")
203207
toolVersion = "${checkstyleVersion}"
204208
showViolations = true
205209
}

src/checkstyle/checkstyle.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
<!-- Suppressions -->
2323
<module name="SuppressionFilter">
24-
<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
24+
<property name="file" value="${config_loc}/checkstyle-suppressions.xml"/>
2525
</module>
2626

2727
<!-- License Header -->
2828
<module name="Header">
29-
<property name="headerFile" value="src/checkstyle/license.header"/>
29+
<property name="headerFile" value="${config_loc}/license.header"/>
3030
<property name="ignoreLines" value="2, 8"/>
3131
</module>
3232

0 commit comments

Comments
 (0)