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

HHH-13415 Clean up the places where we fix fix javadoc generation for JDK11

This commit is contained in:
Yoann Rodière 2019-05-24 10:50:02 +02:00 committed by Guillaume Smet
parent a7006fa226
commit 00c697780e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
documentation/documentation.gradle
View File

@ -129,16 +129,14 @@ 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() ) { if ( JavaVersion.current().isJava11Compatible() ) {
//The need to set `--source 8` applies to all JVMs after 11, and also to 11 //The need to set `--source 1.8` applies to all JVMs after 11, and also to 11
// but after excluding the first two builds; see also specific comments on // but after excluding the first two builds; see also specific comments on
// https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762 // 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 // 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. // 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.source = project.baselineJavaVersion
} }
if ( JavaVersion.current().isJava8Compatible() ) { if ( JavaVersion.current().isJava8Compatible() ) {

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

@ -98,16 +98,15 @@ javadoc {
'http://docs.jboss.org/cdi/api/2.0/', 'http://docs.jboss.org/cdi/api/2.0/',
'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() ) { if ( JavaVersion.current().isJava11Compatible() ) {
//The need to set `--source 8` applies to all JVMs after 11, and also to 11 //The need to set `--source 1.8` applies to all JVMs after 11, and also to 11
// but after excluding the first two builds; see also specific comments on // but after excluding the first two builds; see also specific comments on
// https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762 // 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 // 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. // 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.source = project.baselineJavaVersion
} }
if ( JavaVersion.current().isJava8Compatible() ) { if ( JavaVersion.current().isJava8Compatible() ) {