Merge pull request #1151 from abelsromero/issue-1150-set-java-11-as-minimal-support

Set Java11 as minimal version

Author: robertpanzer

.github/workflows/continuous-integration.yaml

@@ -18,18 +18,12 @@ jobs:
       max-parallel: 4
       matrix:
         java:
-          - '8'
           - '11'
           - '17'
           - '19'
         os:
           - ubuntu-latest
           - macos-latest
-        exclude:
-        - os: macos-latest
-          java: '8'
-        - os: macos-latest
-          java: '19'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -49,11 +43,12 @@ jobs:
     runs-on: windows-latest
     strategy:
       fail-fast: false
-      max-parallel: 2
+      max-parallel: 3
       matrix:
         java:
           - '11'
           - '17'
+          - '19'
     steps:
       - uses: actions/checkout@v3
         with:

CHANGELOG.adoc

@@ -27,6 +27,7 @@ Improvement::
 * Replace use of deprecated 'numbered' attribute by 'sectnums' (#1123) (@abelsromero)
 * Expose `source` and `source_lines` use of deprecated 'numbered' in Document interface (#1145) (@abelsromero)
 * Accept 'null' as valid input (same as empty string) for load and convert String methods (#1148) (@abelsromero)
+* Set Java 11 as the minimal version (#1151) (@abelsromero)
 
 Bug Fixes::
 

asciidoctorj-core/build.gradle

@@ -127,12 +127,7 @@ task pollutedTest(type: Test) {
   forkEvery = 10
   minHeapSize = '128m'
   maxHeapSize = '1024m'
-  if (JavaVersion.current().isJava8Compatible()) {
-    jvmArgs '-XX:-UseGCOverheadLimit'
-  }
-  else {
-    jvmArgs '-XX:MaxPermSize=256m', '-XX:-UseGCOverheadLimit'
-  }
+  jvmArgs '-XX:-UseGCOverheadLimit'
 
   environment 'GEM_PATH', '/some/path'
   environment 'GEM_HOME', '/some/other/path'

asciidoctorj-springboot-integration-test/build.gradle

@@ -11,8 +11,3 @@ dependencies {
 }
 
 test.dependsOn(':asciidoctorj-springboot-integration-test:springboot-app:assemble')
-
-tasks.withType(JavaCompile).configureEach { task ->
-    task.options.release = 17
-}
-

asciidoctorj-springboot-integration-test/springboot-app/build.gradle

@@ -1,6 +1,8 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import org.springframework.boot.gradle.plugin.SpringBootPlugin
+
 plugins {
-	id 'org.springframework.boot' version '3.0.0'
-	id 'io.spring.dependency-management' version '1.1.0'
+	id 'org.springframework.boot' version '3.0.4'
 	id 'java'
 }
 
@@ -13,14 +15,26 @@ repositories {
 
 dependencies {
 	implementation project(':asciidoctorj')
+
+	implementation platform(SpringBootPlugin.BOM_COORDINATES)
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
-tasks.withType(JavaCompile).configureEach { task ->
-	task.options.release = 17
+java {
+	toolchain {
+		languageVersion.set(JavaLanguageVersion.of(getToolchainVersion()))
+	}
+}
+
+def getToolchainVersion() {
+	if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
+		if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
+			return 19
+	}
+	return 17
 }
 
 bootJar {

build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
 import java.time.Duration
 
 /*
@@ -113,21 +115,13 @@ subprojects {
 
   plugins.withType(JavaPlugin) {
     project.tasks.withType(JavaCompile) { task ->
-      if (JavaVersion.current().isJava11Compatible()) {
-        task.options.release = 8
-      }
       if (project.hasProperty("showDeprecation")) {
         options.compilerArgs << "-Xlint:deprecation"
       }
       if (project.hasProperty("showUnchecked")) {
         options.compilerArgs << "-Xlint:unchecked"
       }
     }
-    project.tasks.withType(GroovyCompile) { task ->
-      if (JavaVersion.current().isJava11Compatible()) {
-        task.options.release = 8
-      }
-    }
   }
 
   repositories {
@@ -168,9 +162,6 @@ subprojects {
     forkEvery = 10
     minHeapSize = '128m'
     maxHeapSize = '1024m'
-    if (JavaVersion.current().isJava8Compatible()) {
-      jvmArgs '-XX:-UseGCOverheadLimit'
-    }
 
     testLogging {
       // events 'passed', 'failed', 'skipped', 'standard_out', 'standard_error'
@@ -199,9 +190,8 @@ configure(subprojects.findAll { !it.isDistribution() }) {
 
 
   javadoc {
-    // Oracle JDK8 likes to fail the build over spoiled HTML
+    // Oracle JDK11+ likes to fail the build over spoiled HTML
     options.addStringOption('Xdoclint:none', '-quiet')
-    options.source('8')
   }
 }
 
@@ -210,6 +200,20 @@ configure(subprojects.findAll { !it.name.endsWith('-distribution') && ! it.name.
   java {
     withJavadocJar()
     withSourcesJar()
+    toolchain {
+      languageVersion.set(JavaLanguageVersion.of(getToolchainVersion()))
+    }
   }
 
 }
+
+// Windows workaround to fix invalid toolchain detection
+def getToolchainVersion() {
+  if (DefaultNativePlatform.getCurrentOperatingSystem().isWindows()) {
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19))
+      return 19
+    if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17))
+      return 17
+  }
+  return 11
+}

docs/modules/ROOT/pages/logs-handling.adoc

@@ -1,5 +1,5 @@
 = Logs Handling API
-:uri-javadocs-logmanager: https://docs.oracle.com/javase/8/docs/api/java/util/logging/LogManager.html
+:uri-javadocs-logmanager: https://docs.oracle.com/en/java/javase/11/docs/api/java.logging/java/util/logging/LogManager.html
 
 [NOTE]
 This API is inspired by Java Logging API (JUL).

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists