Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-13419 Support building javadoc with JDK 11.0.3+

This commit is contained in:
Guillaume Smet 2019-05-29 19:43:36 +02:00
parent 9251720f69
commit 8a199f9e88
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
documentation/documentation.gradle
View File

@ -129,6 +129,18 @@ task aggregateJavadocs(type: Javadoc) {
'https://javaee.github.io/javaee-spec/javadocs/' 'https://javaee.github.io/javaee-spec/javadocs/'
] ]
//Workaround to get the JVM version while ignoring the Gradle Enums for versions,
//as they never support upcoming JVM versions (doesn't have a isJava12Compatible() yet )
if ( JavaVersion.current().isJava11Compatible() ) {
//The need to set `--source 8` applies to all JVMs after 11, and also to 11
// but after excluding the first two builds; see also specific comments on
// https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762
// For now, let's be compatible with JDK 11.0.3+. We can improve on it if people
// complain they cannot build with JDK 11.0.0, 11.0.1 and 11.0.2.
System.out.println("Forcing Javadoc in Java 8 compatible mode");
options.addStringOption('source', '8')
}
if ( JavaVersion.current().isJava8Compatible() ) { if ( JavaVersion.current().isJava8Compatible() ) {
options.addStringOption( 'Xdoclint:none', '-quiet' ) options.addStringOption( 'Xdoclint:none', '-quiet' )
} }

15
gradle/published-java-module.gradle
View File

@ -101,14 +101,13 @@ javadoc {
//Workaround to get the JVM version while ignoring the Gradle Enums for versions, //Workaround to get the JVM version while ignoring the Gradle Enums for versions,
//as they never support upcoming JVM versions (doesn't have a isJava12Compatible() yet ) //as they never support upcoming JVM versions (doesn't have a isJava12Compatible() yet )
if ( JavaVersion.current().isJava11Compatible() ) { if ( JavaVersion.current().isJava11Compatible() ) {
int majorJVMVersionInt = Integer.valueOf(JavaVersion.current().toString()); //The need to set `--source 8` applies to all JVMs after 11, and also to 11
if (majorJVMVersionInt >= 12) { // but after excluding the first two builds; see also specific comments on
//The need to set `--source 8` applies to all JVMs after 11, and also to 11 // https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762
//but after excluding the first two builds; see also specific comments on // For now, let's be compatible with JDK 11.0.3+. We can improve on it if people
// https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762 // complain they cannot build with JDK 11.0.0, 11.0.1 and 11.0.2.
System.out.println("Forcing Javadoc in Java 8 compatible mode"); System.out.println("Forcing Javadoc in Java 8 compatible mode");
options.addStringOption('-source', '8') options.addStringOption('source', '8')
}
} }
if ( JavaVersion.current().isJava8Compatible() ) { if ( JavaVersion.current().isJava8Compatible() ) {