From 14a8292cc1cf7570a14427b349f058e2aefd3968 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 16 Nov 2025 12:15:46 +0100
Subject: [PATCH 1/2] remove java9 src dir for scratchpad

---
 poi-scratchpad/build.gradle                   | 29 +++----------------
 .../src/main/{java9 => java}/module-info.java |  0
 .../src/test/{java9 => java}/module-info.java |  0
 3 files changed, 4 insertions(+), 25 deletions(-)
 rename poi-scratchpad/src/main/{java9 => java}/module-info.java (100%)
 rename poi-scratchpad/src/test/{java9 => java}/module-info.java (100%)

diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
index fd37a9922f2..b3047189068 100644
--- a/poi-scratchpad/build.gradle
+++ b/poi-scratchpad/build.gradle
@@ -22,15 +22,6 @@ configurations {
     javadocs
 }
 
-sourceSets {
-    main {
-        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
-    }
-    test {
-        output.dir(TEST9_OUT, builtBy: 'compileTest9')
-    }
-}
-
 dependencies {
     api project(':poi')
     api project(path:':poi', configuration: 'archives')
@@ -52,38 +43,26 @@ final Pattern MODULE_REGEX = ~'\\.jar$'
 final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
 final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
 
-tasks.register('compileJava9', JavaCompile) {
-    dependsOn 'compileJava', ':poi:jar'
+compileJava {
+    dependsOn ':poi:jar'
 
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
-    }
     sourceCompatibility = 11
     targetCompatibility = 11
-    destinationDirectory = file(JAVA9_OUT + VERSIONS9)
-    source = file(JAVA9_SRC)
-    classpath = files()
     options.compilerArgs = [
             '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
             '--module-path', files(MAIN_MODULE_PATH).asPath
     ]
 }
 
-tasks.register('compileTest9', JavaCompile) {
-    dependsOn 'compileTestJava', ':poi:jar'
+compileTestJava {
+    dependsOn ':poi:jar'
 
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
-    }
     sourceCompatibility = 11
     targetCompatibility = 11
-    destinationDirectory = file(TEST9_OUT + VERSIONS9)
-    source = file(TEST9_SRC)
     options.compilerArgs = [
             '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
             '--module-path', files(TEST_MODULE_PATH).asPath
     ]
-    classpath = files()
 }
 
 
diff --git a/poi-scratchpad/src/main/java9/module-info.java b/poi-scratchpad/src/main/java/module-info.java
similarity index 100%
rename from poi-scratchpad/src/main/java9/module-info.java
rename to poi-scratchpad/src/main/java/module-info.java
diff --git a/poi-scratchpad/src/test/java9/module-info.java b/poi-scratchpad/src/test/java/module-info.java
similarity index 100%
rename from poi-scratchpad/src/test/java9/module-info.java
rename to poi-scratchpad/src/test/java/module-info.java

From 60c0c7003d8ba09990d72d8e1a1c2f394d040d5f Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Sun, 16 Nov 2025 12:23:30 +0100
Subject: [PATCH 2/2] Update build.gradle

---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 56f24d9f6c8..68ee7866ab4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -860,8 +860,6 @@ var srcDep = [
     ':poi-ooxml-lite-agent:compileJava9',
     ':poi-ooxml:compileJava9',
     ':poi-ooxml:compileTest9',
-    ':poi-scratchpad:compileJava9',
-    ':poi-scratchpad:compileTest9',
     ':poi-excelant:compileJava9',
     ':poi-excelant:compileTest9',
     ':poi-examples:compileJava9',