git-svn-id: https://svn.apache.org/repos/asf/poi/tags/REL_5_2_3@1904113 13f79535-47bb-0310-9956-ffa450edef68

2026-02-27 20:40:08 +08:00 · 2022-09-17 01:30:18 +00:00
1799 changed files with 15117 additions and 67959 deletions
--- a/.asf.yaml
+++ b/.asf.yaml
@ -1,7 +1,7 @@
-# https://github.com/apache/infrastructure-asfyaml/blob/main/README.md
+# https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features

 github:
-  description: "Mirror of Apache POI gitbox. The Java API for Microsoft Documents."
+  description: "Mirror of Apache POI subversion. The Java API for Microsoft Documents."
  homepage: https://poi.apache.org/
  labels:
    - poi
@ -14,35 +14,10 @@ github:
    - powerpoint
    - visio
  
-  dependabot_alerts:  true
-  dependabot_updates: false
-
  features:
    # Enable wiki for documentation
    wiki: false
    # Enable issue management
-    issues: true
+    issues: false
    # Enable projects for project management boards
    projects: false
-    # Enable github discussions
-    discussions: true
-
-  enabled_merge_buttons:
-    squash:  true
-    merge:   false
-    rebase:  true
-
-  protected_branches:
-    trunk: {}
-    5.5.x: {}
-    asf-site: {}
-
-notifications:
-  commits:              commits@poi.apache.org
-  issues:               dev@poi.apache.org
-  pullrequests:         dev@poi.apache.org
-  discussions:          dev@poi.apache.org
-  jobs:                 dev@poi.apache.org
-
-publish:
-  whoami: asf-site
--- a/.github/workflows/test-gradle.yml
+++ b/.github/workflows/test-gradle.yml
@ -5,9 +5,9 @@ name: Java CI with Gradle

 on:
  push:
-    branches: [ trunk, 5.5.x ]
+    branches: [ trunk ]
  pull_request:
-    branches: [ trunk, 5.5.x ]
+    branches: [ trunk ]

 permissions: {}

@ -17,15 +17,18 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v3

    - name: Set up JDK
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v3
      with:
        distribution: 'temurin'
        java-version: '11'
        cache: 'gradle'

+    - name: Verify Gradle wrapper
+      uses: gradle/wrapper-validation-action@v1
+
    - name: Grant execute permission for gradlew
      run: chmod +x gradlew

--- a/.gitignore
+++ b/.gitignore
@ -37,6 +37,3 @@ TEST-org.apache.poi*.xml
 /*/build/
 dist
 lib/
-
-# Compiled module-info class-files
-/poi*/src/*/java9/*.class
--- a/84
+++ b/84
@ -2545,12 +2545,14 @@ bpjAhwE2YmGQ7oB+3V798HtAmceRNf8AY0GWrZswJlg7xUn+WJNwQ9uIHI1fxYHx
 2Nr+AmDDs6ZOEI5zhwxioePw/Cg=
 =9lKb
 -----END PGP PUBLIC KEY BLOCK-----
-pub   rsa2048 2018-05-02 [SC] [expires: 2026-05-11]
-      6BA4DA8B1C88A49428A29C3D0C69C1EF41181E13
-uid           [ unknown] PJ Fanning (http://www.apache.org/) <fanningpj@apache.org>
-uid           [ unknown] PJ Fanning (GitHub noreply address) <pjfanning@users.noreply.github.com>
-uid           [ unknown] PJ Fanning <fanningpj@yahoo.com>
-sub   rsa2048 2018-05-02 [E] [expires: 2026-05-11]
+pub   rsa2048 2018-05-02 [SC] [expires: 2024-05-25]
+      6BA4 DA8B 1C88 A494 28A2  9C3D 0C69 C1EF 4118 1E13
+uid           [ultimate] PJ Fanning <fanningpj@yahoo.com>
+sig 3        0C69C1EF41181E13 2022-04-06  PJ Fanning <fanningpj@yahoo.com>
+uid           [ultimate] PJ Fanning (http://www.apache.org/) <fanningpj@apache.org>
+sig 3        0C69C1EF41181E13 2022-04-06  PJ Fanning <fanningpj@yahoo.com>
+sub   rsa2048 2018-05-02 [E] [expires: 2024-05-25]
+sig          0C69C1EF41181E13 2022-04-06  PJ Fanning <fanningpj@yahoo.com>

 -----BEGIN PGP PUBLIC KEY BLOCK-----

@ -2559,45 +2561,37 @@ ARFmtFPnwYwLTdz3ECqWWsC3RkI62079DweNasXV8nBz9sUt6mQqSMx3W/s6389/
 k9iywPLvhHH7rpp05js8zwJoA8Fr1YwPtBjyhrxl58LQ5ihd/1f2ud2tnwQw1dI2
 8fuTS3QaKP4Zdx2diD5rYhkAecWaFRwxn1L7Tye5dfD1uPElPCHGKqfaeQXtl01u
 TOwYB1p9tKPHvfni1qgD3QLWUJ2oyBGSA9IgEF5rm8LtR6vADKQwORjg99a7HE2h
-lDBZi/tmu23fgWSioiy084fB5GqmApK/681DABEBAAG0SFBKIEZhbm5pbmcgKEdp
-dEh1YiBub3JlcGx5IGFkZHJlc3MpIDxwamZhbm5pbmdAdXNlcnMubm9yZXBseS5n
-aXRodWIuY29tPokBVwQTAQgAQQIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX
-gBYhBGuk2osciKSUKKKcPQxpwe9BGB4TBQJmJYbdBQkPGNgHAAoJEAxpwe9BGB4T
-5Z4H/3sDqi2QozHbsUy2dm+xS105bpmiNn3aDYzEyjOBggypDWpG5fmlD6ya3Yfd
-H172auahZ1SK6t7Q7u97QdtrvMKTVBBq+DahkHnvw4nsPwBI00aTy616of1+CirZ
-lDPo912aLrWlouizuy6qeJE0EfB0PGXtuZP3E0yZHqgmIOBrQw5fJQtrka5WWK3C
-AqO2Z1hZLh9ftheJtKSYX1gZnPEAWs3ZBG2tCk4+qAjB8y5kRvrJFpC36FkisYlg
-YTtAOSMHED/3YFsDsXFvLmrSkNBImjdAnRW59TD5XUgEMDZ9Dylz3/b4/gtNi2SX
-9WSYWC60/3Jgxh4u3cTUnUtW2yC0IFBKIEZhbm5pbmcgPGZhbm5pbmdwakB5YWhv
-by5jb20+iQFUBBMBCAA+AhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEa6Ta
-ixyIpJQoopw9DGnB70EYHhMFAmYlhuUFCQ8Y2AcACgkQDGnB70EYHhOecwgApleV
-9IOazPAk8pF0WfkslRWNrGHzaGoqO+WVhMS4doxR8bjqkrHwuI4c8Z2vCCMnKqb1
-LF7djz9GXFGklvoyV7rQYrDx15bYWjtassvM4KExcnoPGxx9Kb7f0j0WSZwtwMUl
-XWvsrS0+BkbRz+PIpGtDJhlI++aRoZdWCz5j5st5HzmacC0GVuYGvRPj8uMW2LN5
-5HvGzlzqWIQ7l68KQPz7g5KIFKUrCPyzZS0m8Nj+gRWhF3+u3/1SY2hoCzobSMJj
-PNhEovdpi8h5qbUOpHn2OM7l8/nioRaJwAmcMTnmlh1lqeyxIFYnFIBT24o3aEtN
-N2d1xg/moXvzNTq7yrQ6UEogRmFubmluZyAoaHR0cDovL3d3dy5hcGFjaGUub3Jn
-LykgPGZhbm5pbmdwakBhcGFjaGUub3JnPokBVAQTAQgAPgIbAwULCQgHAgYVCgkI
-CwIEFgIDAQIeAQIXgBYhBGuk2osciKSUKKKcPQxpwe9BGB4TBQJmJYblBQkPGNgH
-AAoJEAxpwe9BGB4TgwMIAJj3aQYKSxt9iyIP5nFhIWAFSPZcZ0gRB6jYMuANVoJE
-yelbhIziN2dXLOjHWpia2x9p7krxY6ZLtogkL4MjfVpCaaXwsaYOq6LeuPN27/Pt
-9rRcDz7j5lA9u9MShc6O8lwNbVReCWR08H0oiEdS09xwZY3aiZniptRBeK+mcsNc
-Zw7kNmPHC79WaI6Rb/qnPLHJDD0l8vrVSShgmEeVJJoC/YjuVzKoiy2BmjSOpOLF
-d88NlquWbvLO6j2tzboUs+93Kc4MwG57hwRIqS7wfsENkecSRj23KQN0UOpxgwz7
-b0+ii9F9jsddEqqpXspcM8zaacf+FpIwO6rk7v1U8LG5AQ0EWulz1gEIAORuS4e+
-Ek+d+0gBMlnigNJ2HoQalKFaERf5K/iQZY4E6Z2ahJ4UFIj7ri3isWgOleP+REJJ
-PfeSrWQ5XgdklDlHHyv4O5iMkEFWQHttiaTuvdomDncQrNRPTaIOe9iQgfQzDw6m
-qsb7ZWd5ICA8Krd97BwNHjq/CZ9+WrU6GDc6ImissLVVGGdkEGO7qZTqNUCeH4Zn
-m/00mNMI4OH8xkwA2vzV5o3J5116zIuv29XQDtcSM+9NQ/HdsjKIA0OpDyWE7Ek/
-SO+/CvkylwaOcmkuf33ADNjpF4BsBxn7L9XI1WJDtRaMkpbqMsymIxi35VUOGD+m
-s+72CcUStfYj4NEAEQEAAYkBPAQYAQgAJgIbDBYhBGuk2osciKSUKKKcPQxpwe9B
-GB4TBQJmJYcPBQkPGNg5AAoJEAxpwe9BGB4TTswH/3RmARIBV2LV72Sqk3rBcKLG
-mY808npRuL6tQDVnrFPl9J8Q1/zItINYUc+2p8rHPW/N/5vyun4oVF9mT+Swqmuy
-FkciQ8vCTdPlocGsGmb8eIKSvkzyRb3B8RkiXq2btDQBCVqVWbB6fh3FSI8L5442
-r/IAQOKyd5wDGP2vDt1wGQ+0aV60gO2lWXOMi6U7dvt/+9vFaMciNdeZt7llNFIF
-OzQuaMAqRP8viuuA29GAsy59x92LWEhm6RRSyU6rMGqfhbHQEs6FZ0x6zuBq8Ru7
-T9wf/cc6uGGG6BqnjxFbWL/g9XJeU8gDxQ+ElJbYDXHT255g8kb92mHbJziPbxM=
-=WUaV
+lDBZi/tmu23fgWSioiy084fB5GqmApK/681DABEBAAG0OlBKIEZhbm5pbmcgKGh0
+dHA6Ly93d3cuYXBhY2hlLm9yZy8pIDxmYW5uaW5ncGpAYXBhY2hlLm9yZz6JAVQE
+EwEIAD4CGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AWIQRrpNqLHIiklCiinD0M
+acHvQRgeEwUCYk2YRAUJC2h2bgAKCRAMacHvQRgeE7nTB/4tZq9/gQcpCKgPVKI8
+MKtY/NWOc9nRr5LrNjY/qFU2Z2gMoUQT1fIBm6gjd9iI92QgLMeekuR2fXBBOx3y
+JbiklXfQVGytEOochkemylwtaCZTHB61KWkemDfS+YeG3qBKwFa5B+zJvp7LqYdQ
+GrNFFgtHwkhNiviDN7JFxsMGM2IpopgvNYB72B35q3YnrDsgDNlD3eraKU25sMx7
+2vNHABrdHzd1ZnKDA1hSV6any5Ifw4NJsPaM0RrmwuwoWkL7WHPftbqkM0zy6RIe
+O+2tlKsJ6cKfOCYL9fbS7/UmkVVcrSLpJCCwmdsra3/57uha7TofDvl+R32CWzrv
+yWfXtCBQSiBGYW5uaW5nIDxmYW5uaW5ncGpAeWFob28uY29tPokBVAQTAQgAPgIb
+AwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgBYhBGuk2osciKSUKKKcPQxpwe9BGB4T
+BQJiTZhKBQkLaHZuAAoJEAxpwe9BGB4T58UH/RBEOnA9TDTKTi7T4y+R1/q2SUp+
+tMzv91jhmlaDvNnA2lGVFNGj1tdy1O7xoCEEw9diKCVqVwHecuBQCaLI70r1W4Qw
+qixjKJwDDnPoMKfhjuvHEHRZV0Pg+uZ50DxkFNn+bPPlXABGelliAPTvetK3ELPJ
+EIRzVJkFsS0McHwXJgmIPAz8ZVlwd1/Xu21MIKOkPzgXML7uq4PN++L+mM4RmpGU
+phOetyxLO1xf6ZixCoUnA7Ayi0hAKUAhu9acuc8SoDacfKm1EQ26SHUhOTNm0YCH
+PPfucHJbUgqSUOYjkEftOtT0ZqVGWS7tR3iEIJu90MJ6SJRovag7khCsYY65AQ0E
+Wulz1gEIAORuS4e+Ek+d+0gBMlnigNJ2HoQalKFaERf5K/iQZY4E6Z2ahJ4UFIj7
+ri3isWgOleP+REJJPfeSrWQ5XgdklDlHHyv4O5iMkEFWQHttiaTuvdomDncQrNRP
+TaIOe9iQgfQzDw6mqsb7ZWd5ICA8Krd97BwNHjq/CZ9+WrU6GDc6ImissLVVGGdk
+EGO7qZTqNUCeH4Znm/00mNMI4OH8xkwA2vzV5o3J5116zIuv29XQDtcSM+9NQ/Hd
+sjKIA0OpDyWE7Ek/SO+/CvkylwaOcmkuf33ADNjpF4BsBxn7L9XI1WJDtRaMkpbq
+MsymIxi35VUOGD+ms+72CcUStfYj4NEAEQEAAYkBPAQYAQgAJgIbDBYhBGuk2osc
+iKSUKKKcPQxpwe9BGB4TBQJiTZhrBQkLaHaVAAoJEAxpwe9BGB4TfjUH/24Q/H5u
+vXlb/Dpx4eFcyLhRVgREoMwwAlzM5GKInHO1W7SHeD7iVR8H1XQVHTgUBNBQ1bUd
+f2R2fyNAbSgCP9VooN6Q/+uTjRsm5gRD7KY5NHxjTC/SZMwKNy/haXQk/qSjDLUy
+cD/2fQovuSLgoqZrTvyvz9e4JhFPk0i1it7I6KWnyyLGOItKc3Cv4p/vkD1ldYKN
+XBhAxmErC9KHQK8pNi8y5z+F1JuZV74i3FRWa+3L2730qIDfR9K3jGIqOow59iqZ
+c8cQLjcGU9lL4dzHh5Hcph8OC5U2aZaJOuMpCndD6XXPvq5/3QQU5rMqP//6tuVi
+aAMwT8RaYPiJJPI=
+=2Ips
 -----END PGP PUBLIC KEY BLOCK-----
 pub   2048R/1556F3A4 2016-10-04
 uid                  Greg Woolsey <gwoolsey@apache.org>
--- a/README.rst
+++ b/README.rst
@ -1,4 +1,6 @@
-# Apache POI™
+
+Apache POI
+======================

 A Java library for reading and writing Microsoft Office binary and OOXML file formats.

@ -33,45 +35,36 @@ And lower-level, supporting components:
 | Components named H??F are for reading or writing OLE2 binary formats.
 | Components named X??F are for reading or writing OpenOffice XML (OOXML) formats.

-# Getting started
+Getting started
+------------------

 Website: https://poi.apache.org/

-[Mailing lists](https://poi.apache.org/mailinglists.html):
+`Mailing lists`_:

-* [Developers](https://lists.apache.org/list.html?dev@poi.apache.org)
-* [Users](https://lists.apache.org/list.html?user@poi.apache.org) Including Announcements 
-* [General](https://lists.apache.org/list.html?general@poi.apache.org)
+* `Developers`_
+* `Users`_
+* `General`_ (release announcements)

-## Bug trackers
+Bug tracker:

-* [Bugzilla](https://bz.apache.org/bugzilla/buglist.cgi?product=POI)
-* [GitHub](https://github.com/apache/poi/issues)
+* `Bugzilla`_
+* `GitHub pull requests`_

-## Source code
+Source code:

-* https://github.com/apache/poi
+* Official `Apache Subversion repo`_ at apache.org
+* `ViewVC repo browser`_ at apache.org
+* `GitHub git mirror`_ at github.com

-Requires Java 11 or later. `trunk` branch is used for 6.0.0 development. POI 4 and 5 releases require Java 8 or later.
+Requires Java 1.8 or later.

+Contributing
+------------------

-## Jars
+* Download and install svn or git, Java JDK 1.8+, and Apache Ant 1.8+ or Gradle

-A good resource for finding the published jars and forming build tool dependency definitions is https://mvnrepository.com/artifact/org.apache.poi.
-
-* poi - main jar, including shared interfaces
-* poi-scratchpad - extra classes to support legacy MS file formats (`H**F`)
-* poi-ooxml - support for newer OOXML file formats (`X**F`)
-* poi-ooxml-lite - generated classes based on MS XSDs used by poi-ooxml (only includes the most commonly used classes)
-* poi-ooxml-full - generated classes based on MS XSDs (can be used instead of poi-ooxml-lite if you need support for less commonly used features)
-* poi-excelant - tools for working with Excel files in Apache Ant scripts
-* poi-examples
-
-# Contributing
-
-* Download and install git, Java JDK 11+, and Apache Ant 1.8+ or Gradle
-
-* Check out the code from git
+* Check out the code from svn or git

 * Import the project into Eclipse or your favorite IDE

@ -89,12 +82,25 @@ A good resource for finding the published jars and forming build tool dependency
  * Scratchpad (Binary formats): poi-scratchpad/src/main/java/org/apache/poi/
  * Examples: poi-examples/src/main/java/org/apache/poi/

-* More info: [How To Build page](https://poi.apache.org/devel/)
+* More info: `How To Build page`_  at apache.org

-# Building jar files
+Building jar files
+------------------

 To build the jar files for poi, poi-ooxml, poi-ooxml-lite, poi-ooxml-full and poi-examples::

    ./gradlew jar

    gradlew jar
+
+.. _Mailing lists: https://poi.apache.org/mailinglists.html
+.. _Developers: https://lists.apache.org/list.html?dev@poi.apache.org
+.. _Users: https://lists.apache.org/list.html?user@poi.apache.org
+.. _General: https://lists.apache.org/list.html?general@poi.apache.org
+.. _Bugzilla: https://bz.apache.org/bugzilla/buglist.cgi?product=POI
+.. _GitHub pull requests: https://github.com/apache/poi/pulls
+
+.. _Apache Subversion repo: https://svn.apache.org/repos/asf/poi/trunk
+.. _ViewVC repo browser: https://svn.apache.org/viewvc/poi/trunk
+.. _GitHub git mirror: https://github.com/apache/poi
+.. _How To Build page: http://poi.apache.org/devel/
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,9 +1,4 @@
 # Security

 If you suspect you have found a security vulnerability in Apache POI code, please read https://www.apache.org/security/
-for how to report the issue. Please do not report the details publicly until the report is reviewed.
-
-## Secure Processing
-
-We strongly discourage users of Apache POI from using the lib to parse documents from untrusted sources. For more details,
-please read https://poi.apache.org/security.html.
+for how to report the issue. Please do not report the details publicly until the report is reviewed.
--- a/build.gradle
+++ b/build.gradle
@ -24,33 +24,55 @@ import javax.xml.xpath.XPathFactory

 buildscript {
    repositories {
-        maven { url = 'https://plugins.gradle.org/m2/' }
+        maven { url 'https://plugins.gradle.org/m2/' }
        mavenCentral()
    }
+
+    dependencies {
+        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
+    }
 }

 plugins {
    id 'base'
-    id 'com.dorongold.task-tree' version '4.0.1'
-    id 'org.nosphere.apache.rat' version '0.8.1'
+    id 'com.dorongold.task-tree' version '2.1.0'
+    id 'org.nosphere.apache.rat' version '0.7.1'
    id 'distribution'
-
-    // 6.2.0+ requires JDK 11
-    // this is the version of the Gradle plugin, it usually includes a
-    // different version of spotbugs itself
-    // Latest spotbugs: https://github.com/spotbugs/spotbugs
-    // Latest gradle plugin: https://plugins.gradle.org/plugin/com.github.spotbugs
-    id 'com.github.spotbugs' version '6.4.8'
-
-    id 'de.thetaphi.forbiddenapis' version '3.10'
-    id 'org.sonarqube' version '7.2.2.6593'
-    id 'org.cyclonedx.bom' version '2.4.1'
-    id 'com.adarshr.test-logger' version '4.0.0'
+    id "com.github.spotbugs" version '5.0.12'
+    id 'de.thetaphi.forbiddenapis' version '3.3'
+    id 'com.github.jk1.dependency-license-report' version '2.0'
+    id 'org.cyclonedx.bom' version '1.7.1'
 }

 repositories {
    mavenCentral()
-    // maven { url 'https://repository.apache.org/content/repositories/staging' }
+    //maven { url 'https://repository.apache.org/content/repositories/staging' }
+}
+
+import com.github.jk1.license.render.*
+import com.github.jk1.license.importer.*
+
+licenseReport {
+
+    // Select projects to examine for dependencies.
+    // Defaults to current project and all its subprojects
+    projects = [project] + project.subprojects
+
+    // Adjust the configurations to fetch dependencies, e.g. for Android projects. Default is 'runtimeClasspath'
+    configurations = ['runtimeClasspath']
+    // Use 'ALL' to dynamically resolve all configurations:
+    // configurations = ALL
+
+    // Don't include artifacts of project's own group into the report
+    excludeOwnGroup = true
+
+    // Don't exclude bom dependencies.
+    // If set to true, then all boms will be excluded from the report
+    excludeBoms = false
+
+    // Set custom report renderer, implementing ReportRenderer.
+    // Yes, you can write your own to support any format necessary.
+    renderers = [new XmlReportRenderer('third-party-libs.xml', 'Back-End Libraries')]
 }

 // Only add the plugin for Sonar if enabled
@ -59,8 +81,7 @@ if (project.hasProperty('enableSonar')) {
    apply plugin: 'org.sonarqube'
 }

-boolean isCIBuild = false
-String dateSuffix = new Date().format('yyyyMMdd')
+boolean isCIBuild = false;

 // For help converting an Ant build to a Gradle build, see
 // https://docs.gradle.org/current/userguide/ant.html
@ -74,8 +95,8 @@ configurations {
 }

 dependencies {
-    antLibs("org.junit.jupiter:junit-jupiter:5.13.4")
-    antLibs("org.apache.ant:ant-junitlauncher:1.10.15")
+    antLibs("org.junit.jupiter:junit-jupiter:5.9.0")
+    antLibs("org.apache.ant:ant-junitlauncher:1.10.12")
 }

 ant.taskdef(name: "junit",
@ -84,9 +105,20 @@ ant.taskdef(name: "junit",


 wrapper {
-    gradleVersion = '8.14.3'
+    gradleVersion = '7.5'
 }

+task adjustWrapperPropertiesFile {
+    doLast {
+        ant.replaceregexp(match:'^#.*', replace:'', flags:'g', byline:true) {
+            fileset(dir: project.projectDir, includes: 'gradle/wrapper/gradle-wrapper.properties')
+        }
+        new File(project.projectDir, 'gradle/wrapper/gradle-wrapper.properties').with { it.text = it.readLines().findAll { it }.sort().join('\n') }
+        ant.fixcrlf(file: 'gradle/wrapper/gradle-wrapper.properties', eol: 'lf')
+    }
+}
+wrapper.finalizedBy adjustWrapperPropertiesFile
+
 group = 'org.apache.poi'

 /**
@ -96,7 +128,7 @@ allprojects {
 //    apply plugin: 'eclipse'
    apply plugin: 'idea'

-    version = '6.0.0-SNAPSHOT'
+    version = '5.2.3'
 }

 /**
@ -110,94 +142,71 @@ subprojects {
    apply plugin: 'signing'
    apply plugin: 'de.thetaphi.forbiddenapis'
    apply plugin: 'com.github.spotbugs'
-    apply plugin: 'org.cyclonedx.bom'
-    apply plugin: 'com.adarshr.test-logger'

    ext {
-        bouncyCastleVersion = '1.83'
-        commonsCodecVersion = '1.21.0'
-        commonsCompressVersion = '1.28.0'
-        commonsIoVersion = '2.21.0'
+        bouncyCastleVersion = '1.70'
+        commonsCodecVersion = '1.15'
+        commonsCompressVersion = '1.21'
+        commonsIoVersion = '2.11.0'
        commonsMathVersion = '3.6.1'
-        junitVersion = '5.13.4'
-        log4jVersion = '2.25.3'
-        mockitoVersion = '5.21.0'
-        hamcrestVersion = '3.0'
-        xmlbeansVersion = '5.3.0'
-        batikVersion = '1.19'
-        graphics2dVersion = '3.0.5'
-        pdfboxVersion = '3.0.6'
-        saxonVersion = '12.9'
-        xmlSecVersion = '3.0.6'
+        junitVersion = '5.9.0'
+        log4jVersion = '2.18.0'
+        mockitoVersion = '4.8.0'
+        hamcrestVersion = '2.2'
+        xmlbeansVersion = '5.1.1'
+        batikVersion = '1.14'
+        graphics2dVersion = '0.40'
+        pdfboxVersion = '2.0.26'
+        saxonVersion = '11.4'
        apiGuardianVersion = '1.1.2'

-        jdkVersion = (project.properties['jdkVersion'] ?: '11') as int
+        jdkVersion = (project.properties['jdkVersion'] ?: '8') as int
        // see https://github.com/gradle/gradle/blob/master/subprojects/jvm-services/src/main/java/org/gradle/internal/jvm/inspection/JvmVendor.java
        jdkVendor = (project.properties['jdkVendor'] ?: '') as String

        JAVA9_SRC = 'src/main/java9'
-        JAVA9_OUT = layout.buildDirectory.dir('classes/java9/main/').get().asFile.absolutePath
+        JAVA9_OUT = "${buildDir}/classes/java9/main/"
        TEST9_SRC = 'src/test/java9'
-        TEST9_OUT = layout.buildDirectory.dir('classes/java9/test/').get().asFile.absolutePath
-        VERSIONS9 = '/META-INF/versions/9'
+        TEST9_OUT = "${buildDir}/classes/java9/test/"
+        VERSIONS9 = 'META-INF/versions/9'

        NO_SCRATCHPAD = (findProperty("scratchpad.ignore") == "true")
        SAXON_TEST = (findProperty("saxon.test") == "true")
    }

    configurations {
-        configureEach {
+        all {
            resolutionStrategy {
                force "commons-io:commons-io:${commonsIoVersion}"
-                force 'org.slf4j:slf4j-api:2.0.17'
-                force 'com.fasterxml.woodstox:woodstox-core:7.1.1'
+                force 'org.slf4j:slf4j-api:1.7.36'
+                force 'com.fasterxml.woodstox:woodstox-core:6.3.1'
            }
        }
    }

-    tasks.withType(JavaCompile).configureEach {
+    tasks.withType(JavaCompile) {
        options.encoding = 'UTF-8'
-        options.compilerArgs += '-Xlint:unchecked'
+        options.compilerArgs << '-Xlint:unchecked'
        options.deprecation = true
        options.incremental = true
    }
-    tasks.withType(Test).configureEach {
-        systemProperty "file.encoding", "UTF-8"
-    }
-    tasks.withType(Javadoc).configureEach {
-        options.encoding = 'UTF-8'
-    }
-    tasks.withType(AbstractArchiveTask).configureEach {
-        preserveFileTimestamps = false
-        reproducibleFileOrder = true
-    }

    repositories {
        mavenCentral()
-        // maven { url 'https://repository.apache.org/content/repositories/staging' }
+        //maven { url 'https://repository.apache.org/content/repositories/staging' }
    }

    dependencies {
-        api platform("org.apache.logging.log4j:log4j-bom:${log4jVersion}")
-        api 'org.apache.logging.log4j:log4j-api'
-        testImplementation platform("org.junit:junit-bom:${junitVersion}")
-        testImplementation 'org.junit.jupiter:junit-jupiter'
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+        testImplementation "org.junit.jupiter:junit-jupiter:${junitVersion}"
        testImplementation "org.mockito:mockito-core:${mockitoVersion}"
        testImplementation "org.hamcrest:hamcrest:${hamcrestVersion}"
-        testImplementation 'org.apache.logging.log4j:log4j-core'
-
-        if (SAXON_TEST) {
-            testRuntimeOnly("net.sf.saxon:Saxon-HE:${saxonVersion}") {
-                exclude group: 'xml-apis', module: 'xml-apis'
-            }
-        }
+        testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
    }

    java {
        toolchain {
-            languageVersion = JavaLanguageVersion.of(jdkVersion)
-            if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
+            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
        }
        withJavadocJar()
        withSourcesJar()
@ -207,7 +216,7 @@ subprojects {
        failOnError = true
        maxMemory = "1024M"
        javadocTool = javaToolchains.javadocToolFor {
-            languageVersion = JavaLanguageVersion.of(jdkVersion)
+            languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
        }

        doFirst {
@ -215,90 +224,30 @@ subprojects {
                addBooleanOption('html5', true)
                addBooleanOption('Xdoclint:all,-missing', true)
                links 'https://poi.apache.org/apidocs/dev/'
-                if (jdkVersion >= 23) links 'https://docs.oracle.com/en/java/javase/23/docs/api/' else links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
+                links 'https://docs.oracle.com/javase/8/docs/api/'
                links 'https://xmlbeans.apache.org/docs/5.0.0/'
-                links 'https://www.javadocs.dev/org.apache.commons/commons-compress/1.28.0/'
+                links 'https://commons.apache.org/proper/commons-compress/apidocs/'
                use = true
                splitIndex = true
-                source = "11"
+                source = "1.8"
            }
        }
    }

    // helper-target to get a directory with all third-party libraries
    // this is used for mass-regression-testing
-    tasks.register('getDeps', Copy) {
+    task getDeps(type: Copy) {
        from sourceSets.main.runtimeClasspath
        into 'build/runtime/'
    }

-    tasks.withType(Jar).configureEach {
-        duplicatesStrategy = DuplicatesStrategy.FAIL
-        destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}")
+    tasks.withType(Jar) {
+        duplicatesStrategy = 'fail'
+        destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")

        doLast {
-            // make sure we do not have distribution jar-files with different versions
-            // in the build-dir as those lead to strange errors about "duplicate modules"
-            // when building java9 JPMS class files ("java9")
-            ant.delete(failOnError: true, verbose: true) {
-                fileset(dir: "../build/dist/maven/${base.archivesName.get()}", erroronmissingdir: false) {
-                    include(name: '*.jar')
-                    exclude(name: "*${version}.jar")
-                    exclude(name: "*${version}-sources.jar")
-
-                    include(name: '*.jar.asc')
-                    exclude(name: "*${version}.jar.asc")
-                    exclude(name: "*${version}-sources.jar.asc")
-
-                    include(name: '*.jar.sha256')
-                    exclude(name: "*${version}.jar.sha256")
-                    exclude(name: "*${version}-sources.jar.sha256")
-
-                    include(name: '*.jar.sha512')
-                    exclude(name: "*${version}.jar.sha512")
-                    exclude(name: "*${version}-sources.jar.sha512")
-
-                    include(name: '*.pom')
-                    exclude(name: "*${version}.pom")
-
-                    include(name: '*.pom.asc')
-                    exclude(name: "*${version}.pom.asc")
-                }
-            }
-            // use failOnError=false for -javadoc and -tests as not all modules create this directory
-            ant.delete(failOnError: false, verbose: true) {
-                fileset(dir: "../build/dist/maven/${base.archivesName.get()}-javadoc", erroronmissingdir: false) {
-                    include(name: '*-javadoc.jar')
-                    exclude(name: "*${version}-javadoc.jar")
-
-                    include(name: '*-javadoc.jar.asc')
-                    exclude(name: "*${version}-javadoc.jar.asc")
-
-                    include(name: '*-javadoc.jar.sha256')
-                    exclude(name: "*${version}-javadoc.jar.sha256")
-
-                    include(name: '*-javadoc.jar.sha512')
-                    exclude(name: "*${version}-javadoc.jar.sha512")
-                }
-            }
-            ant.delete(failOnError: false, verbose: true) {
-                fileset(dir: "../build/dist/maven/${base.archivesName.get()}-tests", erroronmissingdir: false) {
-                    include(name: '*-tests.jar')
-                    exclude(name: "*${version}-tests.jar")
-
-                    include(name: '*-tests.jar.asc')
-                    exclude(name: "*${version}-tests.jar.asc")
-
-                    include(name: '*-tests.jar.sha256')
-                    exclude(name: "*${version}-tests.jar.sha256")
-
-                    include(name: '*-tests.jar.sha512')
-                    exclude(name: "*${version}-tests.jar.sha512")
-                }
-            }
-
-            ant.checksum(file: it.archiveFile.get().asFile, algorithm: 'SHA-256', fileext: '.sha256', format: 'MD5SUM')
-            ant.checksum(file: it.archiveFile.get().asFile, algorithm: 'SHA-512', fileext: '.sha512', format: 'MD5SUM')
+            ant.checksum(file: it.archivePath, algorithm: 'SHA-256', fileext: '.sha256', format: 'MD5SUM')
+            ant.checksum(file: it.archivePath, algorithm: 'SHA-512', fileext: '.sha512', format: 'MD5SUM')
        }
    }

@ -326,19 +275,15 @@ subprojects {
    javadocJar {
        // if javadocs and binaries are in the same directory, JPMS complaints about duplicated modules
        // in the module-path
-        destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}-javadoc")
+        destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-javadoc")
    }

    sourcesJar {
-        destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}")
+        destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
        exclude 'META-INF/services/**'
    }

    test {
-        // use US locale for tests
-        systemProperty "user.language", "en"
-        systemProperty "user.country", "US"
-
        // make XML test-results available for Jenkins CI
        useJUnitPlatform()
        reports {
@ -346,8 +291,8 @@ subprojects {
        }

        javaLauncher = javaToolchains.launcherFor {
-            languageVersion = JavaLanguageVersion.of(jdkVersion)
-            if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
+            languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+            if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
        }

        // Exclude some tests that are not actually tests or do not run cleanly on purpose
@ -362,11 +307,11 @@ subprojects {

        // set heap size for the test JVM(s)
        minHeapSize = "128m"
-        maxHeapSize = "2g"
+        maxHeapSize = "1G"


        // Specifying the local via system properties did not work, so we set them this way
-        jvmArgs += [
+        jvmArgs << [
            '-Djava.awt.headless=true',
            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
            "-Dversion.id=${project.version}",
@ -375,18 +320,18 @@ subprojects {
        ]

        // detect if running on Jenkins/CI
-        isCIBuild |= Boolean.valueOf(System.getenv("CI_BUILD"))
+        isCIBuild |= Boolean.valueOf(System.getenv("CI_BUILD"));

        if (isCIBuild) {
-            System.out.println("Run with reduced parallelism for CI build")
+            System.out.println("Run with reduced parallelism for CI build");

            jvmArgs += [
                // Strictly serial
-                '-Djunit.jupiter.execution.parallel.enabled=false',
+                // '-Djunit.jupiter.execution.parallel.enabled=false',

                // OR parallel on 2 threads
-                //'-Djunit.jupiter.execution.parallel.config.strategy=fixed',
-                //'-Djunit.jupiter.execution.parallel.config.fixed.parallelism=2'
+                '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+                '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=2'
            ]
            maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
        } else {
@ -421,25 +366,27 @@ subprojects {
        systemProperties['java.locale.providers'] = 'JRE,CLDR'

        doFirst {
-            // some options were removed in JDK 18
-            if (jdkVersion < 18) {
+            if (jdkVersion > 8) {
+                // some options were removed in JDK 18
+                if (jdkVersion < 18) {
+                    jvmArgs += [
+                        '--illegal-access=warn',
+                    ]
+                }
+
                jvmArgs += [
-                    '--illegal-access=warn',
+                    // see https://github.com/java9-modularity/gradle-modules-plugin/issues/97
+                    // opposed to the recommendation there, it doesn't work to add ... to the dependencies
+                    // testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.7.1'
+                    // gradles gradle-worker.jar is still not a JPMS module and thus runs as unnamed module
+                    '--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=org.apache.poi.poi',
+                    '--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED',
+                    '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                    '-Dsun.reflect.debugModuleAccessChecks=true',
+                    '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
                ]
            }
-
-            jvmArgs += [
-                // see https://github.com/java9-modularity/gradle-modules-plugin/issues/97
-                // opposed to the recommendation there, it doesn't work to add ... to the dependencies
-                // testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.2'
-                // gradles gradle-worker.jar is still not a JPMS module and thus runs as unnamed module
-                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=org.apache.poi.poi',
-                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED',
-                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
-
-                '-Dsun.reflect.debugModuleAccessChecks=true',
-                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
-            ]
        }

        jacoco {
@ -452,7 +399,7 @@ subprojects {
    }

    jacoco {
-        toolVersion = '0.8.13'
+        toolVersion = '0.8.8'
    }

    jacocoTestReport {
@ -469,9 +416,9 @@ subprojects {
        // https://docs.sonarqube.org/display/SONARQUBE52/Analyzing+with+SonarQube+Scanner+for+Gradle
        // for documentation of properties.
        //
-        // Some additional properties are currently set in the Jenkins-DSL, see jenkins/create_jobs.groovy
+        // Some additional properties are currently set in the Jenkins-DSL, see jenksin/create_jobs.groovy
        //
-        sonar {
+        sonarqube {
            properties {
                // as we currently use build/<module>/ as project-basedir, we need to tell Sonar to use
                // the root-folder as "basedir" for the projects
@ -498,20 +445,29 @@ subprojects {
    }

    forbiddenApisTest {
-        // forbiddenapis:3.8 bundled signatures max supported version is 23
-        targetCompatibility = (JavaVersion.VERSION_23.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_23)
+        // forbiddenapis bundled signatures max supported version is 17
+        // also see https://github.com/policeman-tools/forbidden-apis/issues/191
+        targetCompatibility = (JavaVersion.VERSION_17.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_17)
    }

    forbiddenApisMain {
        signaturesFiles += files('../src/resources/devtools/forbidden-signatures-prod.txt')
-        targetCompatibility = (JavaVersion.VERSION_23.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_23)
+        targetCompatibility = (JavaVersion.VERSION_17.isCompatibleWith(JavaVersion.current()) ? JavaVersion.current() : JavaVersion.VERSION_17)
    }

+    task jenkins
+    jenkins.dependsOn build
+    jenkins.dependsOn check
+    jenkins.dependsOn javadoc
+    jenkins.dependsOn jacocoTestReport
+    jenkins.dependsOn rat
+    jenkins.dependsOn getDeps
+
    publishing {
        publications {
            POI(MavenPublication) {
-                groupId = 'org.apache.poi'
-                artifactId = base.archivesName.get()
+                groupId 'org.apache.poi'
+                artifactId project.archivesBaseName

                from components.java

@ -592,9 +548,9 @@ subprojects {
        }
    }

-    generatePomFileForPOIPublication.destination = "../build/dist/maven/${base.archivesName.get()}/${base.archivesName.get()}-${project.version}.pom"
+    generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"

-    tasks.withType(GenerateModuleMetadata).configureEach {
+    tasks.withType(GenerateModuleMetadata) {
        enabled = false
    }

@ -611,7 +567,6 @@ subprojects {
    spotbugs {
        ignoreFailures = true
        showStackTraces = false
-        maxHeapSize = '2g'
    }

    build {
@ -622,14 +577,14 @@ subprojects {
 }

 // initial try to provide a combined JavaDoc, grouping is still missing here, though!
-tasks.register('allJavaDoc', Javadoc) {
-    var prj = [project(':poi'), project(':poi-excelant'), project(':poi-ooxml'), project(':poi-scratchpad')]
+task allJavaDoc(type: Javadoc) {
+    var prj = [ project(':poi'), project(':poi-excelant'), project(':poi-ooxml'), project(':poi-scratchpad') ]
    source prj.collect { it.sourceSets.main.allJava }

    // for possible settings see https://docs.gradle.org/current/dsl/org.gradle.api.tasks.javadoc.Javadoc.html
    classpath = files(subprojects.collect { it.sourceSets.main.compileClasspath })
-    destinationDir = layout.buildDirectory.dir('docs/javadoc').get().asFile
-    maxMemory = "2048M"
+    destinationDir = file("${buildDir}/docs/javadoc")
+    maxMemory="2048M"

    // for possible options see https://docs.gradle.org/current/javadoc/org/gradle/external/javadoc/StandardJavadocDocletOptions.html
    options.use = true
@ -644,7 +599,7 @@ tasks.register('allJavaDoc', Javadoc) {
    options.group('SS - Common Spreadsheet Format', 'org.apache.poi.ss*')
    options.group('HSSF - Horrible Spreadsheet Format', 'org.apache.poi.hssf*')
    options.group('XSSF - Open Office XML Spreadsheet Format', 'org.apache.poi.xssf*')
-    options.group('SL - Common Slideshow Format', 'org.apache.poi.sl*')
+    options.group('SL - Common Slideshow Format',  'org.apache.poi.sl*')
    options.group('HSLF - Horrible Slideshow Format', 'org.apache.poi.hslf*', 'org.apache.poi.hwmf*', 'org.apache.poi.hemf*')
    options.group('XSLF - Open Office XML Slideshow Format', 'org.apache.poi.xslf*')
    options.group('HWPF - Horrible Word Processor Format', 'org.apache.poi.hwpf*')
@ -660,6 +615,9 @@ tasks.register('allJavaDoc', Javadoc) {
 //  options.group('Examples', 'org.apache.poi.examples*')
 }

+
+task jenkins(dependsOn: ['replaceVersion', subprojects.build, 'binDistZip','binDistTar','srcDistZip','srcDistTar']) {}
+
 clean {
    delete "${rootDir}/build/dist"
 }
@ -705,9 +663,7 @@ rat {
        "osgi/README.md",
        "src/resources/ooxml-lite-report.*",
        // ignore svn conflict artifacts
-        "**/module-info.*",
-        "poi-examples/src/main/groovy/settings.gradle",
-        "poi-examples/src/main/groovy/.gradle/**"
+        "**/module-info.*"
    ]

    /*
@ -721,24 +677,6 @@ rat {
    verbose.set(true)
 }

-task jenkins(dependsOn: [
-            'replaceVersion',
-            subprojects.build,
-            subprojects.check,
-            subprojects.javadoc,
-            subprojects.jacocoTestReport,
-            subprojects.getDeps,
-            'srcDistZip',
-            'srcDistTar',
-            rat
-]) {}
-
-task jenkinsLite(dependsOn: [
-            'replaceVersion',
-            subprojects.build,
-            subprojects.test
-]) {}
-
 /*task downloadJarsToLibs() {
    def f = new File("$projectDir/../lib/ooxml/xmlbeans-5.0.0.jar")
    if (!f.exists()) {
@ -750,14 +688,14 @@ task jenkinsLite(dependsOn: [

 //compileJava.dependsOn 'downloadJarsToLibs'

-tasks.register('replaceVersion') {
+task replaceVersion() {
    outputs.upToDateWhen { false }

    var version = subprojects[0].version
    var tokens = [
-            ['osgi', 'pom.xml', '(packaging>\\n\\s*<version>)[0-9.]+(?:-SNAPSHOT|-RC\\d+)?', "\\1${version}"],
-            ['osgi', 'pom.xml', '(<poi.version>)[0-9.]+(?:-SNAPSHOT|-RC\\d+)?', "\\1${version}"]
-            // [ '.', 'build.gradle', ' version = \'[0-9.]+(?:-SNAPSHOT)?\'', " version = '${version}'" ]
+        [ 'osgi', 'pom.xml', '(packaging>\\n\\s*<version>)[0-9.]+(?:-SNAPSHOT|-RC\\d+)?', "\\1${version}" ],
+        [ 'osgi', 'pom.xml', '(<poi.version>)[0-9.]+(?:-SNAPSHOT|-RC\\d+)?', "\\1${version}" ]
+        // [ '.', 'build.gradle', ' version = \'[0-9.]+(?:-SNAPSHOT)?\'', " version = '${version}'" ]
    ]

    doLast {
@ -781,13 +719,54 @@ task zipJavadocs(type: Zip, dependsOn: allJavaDoc) {
    archiveExtension = 'jar'
 }

-tasks.withType(Tar).configureEach {
+tasks.withType(Tar) {
    compression = Compression.GZIP
    archiveExtension = 'tgz'
 }

 distributions {
+    var version = subprojects[0].version
+    var date = new Date().format('yyyyMMdd')
+
+    var poiDep = project(':poi').configurations.getAt('compileClasspath')
+    var ooxmlImp = project(':poi-ooxml').configurations.getAt('compileClasspath')
+
+    bin {
+        distributionBaseName = "poi-bin-${version}-${date}"
+        contents {
+            from('build/dist/maven') {
+                include "**/*${version}.jar"
+                exclude "**/*lite-agent*.jar"
+                exclude "**/*integration*.jar"
+            }
+
+            from('build/dist') { include 'poi-javadoc*.jar'}
+            from('legal') { exclude 'HEADER' }
+            from(poiDep) { include "**/*.jar" }
+            from(ooxmlImp) { include "**/*.jar" }
+
+            includeEmptyDirs = false
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+            eachFile {
+                String root = "poi-bin-${version}/"
+                if (name.startsWith('poi')) {
+                    path = root + name
+                } else if (poiDep.contains(file)) {
+                    path = root + 'lib/' + name
+                } else if (name =~ /^(batik|bc|fontbox|graphics|pdfbox|xml-apis|xmlgraphics|xmlsec)/) {
+                    path = root + 'auxiliary/' + name
+                } else if (ooxmlImp.contains(file)) {
+                    path = root + 'ooxml-lib/' + name
+                } else {
+                    path = root + name
+                }
+            }
+        }
+    }
+
    src {
+        distributionBaseName = "poi-src-${version}-${date}"
        contents {
            from('.') {
                exclude '*/build/**'
@ -833,14 +812,14 @@ distributions {
                exclude '**/*-saved.xls'
            }
            from('legal') { exclude 'HEADER' }
-
-            includeEmptyDirs = false
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
        }
    }
 }

-tasks.register('soLinkCheck') {
+binDistZip.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar'
+binDistTar.dependsOn 'zipJavadocs', ':poi-ooxml-lite:jar'
+
+task soLinkCheck() {
    doLast {
        def path = ant.path {
            fileset(dir: '.', includes: '**/*.java') {
@ -861,30 +840,28 @@ tasks.register('soLinkCheck') {
 }

 var srcDep = [
-    ':poi:compileJava9',
-    ':poi:compileTest9',
-    ':poi-ooxml-full:compileJava9',
-    ':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',
-    ':poi-integration:compileTest9',
-    ':poi-ooxml-lite:compileJava9',
+    ':poi:cacheJava9',
+    ':poi:cacheTest9',
+    ':poi-ooxml-full:cacheJava9',
+    ':poi-ooxml-lite-agent:cacheJava9',
+    ':poi-ooxml:cacheJava9',
+    ':poi-ooxml:cacheTest9',
+    ':poi-scratchpad:cacheJava9',
+    ':poi-scratchpad:cacheTest9',
+    ':poi-excelant:cacheJava9',
+    ':poi-excelant:cacheTest9',
+    ':poi-examples:cacheJava9',
+    ':poi-integration:cacheTest9',
+    ':poi-ooxml-lite:cacheJava9',
    ':poi-ooxml-lite:generateModuleInfo'
 ]

-srcDistTar.setArchiveFileName("apache-poi-src-${subprojects[0].version}-${dateSuffix}.tgz")
-srcDistZip.setArchiveFileName("apache-poi-src-${subprojects[0].version}-${dateSuffix}.zip")
 srcDistTar.dependsOn srcDep
 srcDistZip.dependsOn srcDep
 soLinkCheck.dependsOn srcDep
 rat.dependsOn soLinkCheck

-tasks.register('fixDistDir') {
+task fixDistDir {
    doLast {
        ant.mkdir(dir: 'build/dist')
        ant.move(todir: 'build/dist') {
@ -893,5 +870,26 @@ tasks.register('fixDistDir') {
    }
 }

+binDistZip.finalizedBy fixDistDir
+binDistTar.finalizedBy fixDistDir
 srcDistZip.finalizedBy fixDistDir
 srcDistTar.finalizedBy fixDistDir
+
+cyclonedxBom {
+    // includeConfigs is the list of configuration names to include when generating the BOM (leave empty to include every configuration)
+    includeConfigs = ["runtimeClasspath"]
+    // skipConfigs is a list of configuration names to exclude when generating the BOM
+    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
+    // Specified the type of project being built. Defaults to 'library'
+    projectType = "library"
+    // Specified the version of the CycloneDX specification to use. Defaults to 1.4.
+    schemaVersion = "1.4"
+    // Boms destination directory (defaults to build/reports)
+    destination = file("build/reports")
+    // The file name for the generated BOMs (before the file format suffix). Defaults to 'bom'
+    outputName = "pom-${project.version}.bom"
+    // The file format generated, can be xml, json or all for generating both
+    outputFormat = "xml"
+    // Exclude BOM Serial Number
+    includeBomSerialNumber = true
+}
--- a/build.xml
+++ b/build.xml
--- a/doap_POI.rdf
+++ b/doap_POI.rdf
@ -35,62 +35,6 @@
    <programming-language>Java</programming-language>
    <category rdf:resource="https://projects.apache.org/category/content" />
    <category rdf:resource="https://projects.apache.org/category/library" />
-    <release>
-      <Version>
-        <name>Apache POI 5.5.1</name>
-        <created>2025-11-30</created>
-        <revision>5.5.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.5.0</name>
-        <created>2025-11-15</created>
-        <revision>5.5.0</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.4.1</name>
-        <created>2025-04-06</created>
-        <revision>5.4.1</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.4.0</name>
-        <created>2025-01-08</created>
-        <revision>5.4.0</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.3.0</name>
-        <created>2024-07-02</created>
-        <revision>5.3.0</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.2.5</name>
-        <created>2023-11-25</created>
-        <revision>5.2.5</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.2.4</name>
-        <created>2023-09-28</created>
-        <revision>5.2.4</revision>
-      </Version>
-    </release>
-    <release>
-      <Version>
-        <name>Apache POI 5.2.3</name>
-        <created>2022-09-16</created>
-        <revision>5.2.3</revision>
-      </Version>
-    </release>
    <release>
      <Version>
        <name>Apache POI 5.2.2</name>
@ -267,10 +211,10 @@
      </Version>
    </release>
    <repository>
-      <GitRepository>
-        <location rdf:resource="https://github.com/apache/poi.git"/>
-        <browse rdf:resource="https://github.com/apache/poi/"/>
-      </GitRepository>
+      <SVNRepository>
+        <location rdf:resource="https://svn.apache.org/repos/asf/poi/"/>
+        <browse rdf:resource="https://svn.apache.org/viewvc/poi/"/>
+      </SVNRepository>
    </repository>
   <maintainer>
      <foaf:Person>
--- a/file-leak-detector.exclude
+++ b/file-leak-detector.exclude
@ -51,13 +51,6 @@ org.apache.openjpa.lib.util.J2DoPrivHelper$7.run
 serp.bytecode.BCClass.read
 serp.util.Strings.toClass

-# Logging
-java.util.logging.Logger.findSystemResourceBundle
-java.util.logging.LogManager.readPrimordialConfiguration
-org.slf4j.LoggerFactory.getLogger
-org.apache.log4j.FileAppender.setFile
-org.apache.logging.log4j.core.config.ConfigurationSource.getConfigurationSource
-
 # Java
 sun.util.resources.LocaleData.getBundle
 sun.util.LocaleServiceProviderPool.<init>
@ -70,14 +63,16 @@ sun.font.SunFontManager.loadFonts
 sun.font.FontManagerFactory.getInstance
 sun.font.TrueTypeFont.open
 sun.reflect.misc.MethodUtil.<clinit>
+java.util.logging.Logger.findSystemResourceBundle
+java.util.logging.LogManager.readPrimordialConfiguration
 java.text.BreakIterator.getBundle
 sun.java2d.SunGraphicsEnvironment.<init>
 org.kohsuke.file_leak_detector.AgentMain.runHttpServer
+org.apache.log4j.FileAppender.setFile
+org.apache.logging.log4j.core.config.ConfigurationSource.getConfigurationSource
 sun.launcher.LauncherHelper.validateMainClass
 sun.util.locale.provider.RuleBasedBreakIterator$1.run
 java.util.ServiceLoader$LazyIterator.hasNextService
-java.util.ServiceLoader$LazyClassPathLookupIterator.nextProviderClass
-java.lang.ClassLoader.loadClass

 # other third party libs
 net.bytebuddy.dynamic.ClassFileLocator$ForClassLoader.locate
--- a/gradle.properties
+++ b/gradle.properties
@ -1,11 +1,11 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Less than 2G definitely slows things down. Increased to 3G due to OOM issues on ci-builds.apache.org.
-# -XX:+HeapDumpOnOutOfMemoryError
-org.gradle.jvmargs=-Xmx3G -Dfile.encoding=UTF-8
+# Less than 2G definitely slows things down. -XX:+HeapDumpOnOutOfMemoryError
+org.gradle.jvmargs=-Xmx2G -Dfile.encoding=UTF-8

 # Activating will be much faster, but break the build of 'poi-ooxml-lite'
-org.gradle.caching=true
+# @todo: look into poi-ooxml-lite task generateModuleInfo and enforce running whatever is needed before
+org.gradle.caching=false

 # Modularise your project and enable parallel build
 org.gradle.parallel=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,7 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/41
+++ b/41
@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
 #
@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@ -82,11 +80,13 @@ do
    esac
 done

-# This is normally unused
-# shellcheck disable=SC2034
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@ -114,7 +114,7 @@ case "$( uname )" in                #(
  NONSTOP* )        nonstop=true ;;
 esac

-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


 # Determine the Java command to use to start the JVM.
@ -133,29 +133,22 @@ location of your Java installation."
    fi
 else
    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi

 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@ -200,20 +193,16 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
        -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
        "$@"

 # Stop when "xargs" is not available.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -1,94 +1,91 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@ -1,20 +1,3 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
 // This script is used as input to the Jenkins Job DSL plugin to create all the build-jobs that
 // Apache POI uses on the public Jenkins instance at https://ci-builds.apache.org/job/POI/
 //
@ -31,31 +14,45 @@ def xercesUrl = 'https://repo1.maven.org/maven2/xerces/xercesImpl/2.6.1/xercesIm
 def xercesLib = './xercesImpl-2.6.1.jar'

 def poijobs = [
-        [ name: 'POI-DSL-1.8',
-          jdk: '1.8',
-          trigger: 'H */12 * * *',
-          jenkinsLite: true,
-          disabled: true  // JDK 8 is no longer supported by POI 6
+        [ name: 'POI-DSL-1.8', trigger: 'H */12 * * *'
        ],
-        [ name: 'POI-DSL-1.8-branch-5.5.x',
-          jdk: '1.8',
-          branch: '5.5.x',
-          trigger: 'H */12 * * *',
-          jenkinsLite: true,
+        [ name: 'POI-DSL-OpenJDK', jdk: 'OpenJDK 1.8', trigger: 'H */12 * * *',
+          // only a limited set of nodes still have OpenJDK 8 (on Ubuntu) installed
+          slaves: 'ubuntu',
+          skipcigame: true
        ],
+//        [ name: 'POI-DSL-1.10', jdk: '1.10', trigger: triggerSundays, skipcigame: true,
+//          // let's save some CPU cycles here, 10 had EOL in September 2018
+//          disabled: true
+//        ],
        [ name: 'POI-DSL-1.11', jdk: '1.11', trigger: triggerSundays, skipcigame: true
        ],
+//        [ name: 'POI-DSL-1.12', jdk: '1.12', trigger: triggerSundays, skipcigame: true,
+//          // let's save some CPU cycles here, 12 is not a LTS and JDK 13 is GA as of 17 September 2019
+//          disabled: true
+//        ],
+//        [ name: 'POI-DSL-1.13', jdk: '1.13', trigger: triggerSundays, skipcigame: true,
+//          // let's save some CPU cycles here, 13 is not a LTS and JDK 14 is GA as of 17 March 2020
+//          disabled: true
+//        ],
+//        [ name: 'POI-DSL-1.14', jdk: '1.14', trigger: triggerSundays, skipcigame: true,
+//          // let's save some CPU cycles here, 14 is not a LTS and JDK 15 is GA as of 15 September 2020
+//          disabled: true
+//        ],
+        [ name: 'POI-DSL-1.15', jdk: '1.15', trigger: triggerSundays, skipcigame: true,
+          // let's save some CPU cycles here, 15 is not a LTS and JDK 16 is GA
+          disabled: true
+        ],
+        [ name: 'POI-DSL-1.16', jdk: '1.16', trigger: 'H */12 * * *', skipcigame: true,
+          // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
+          disabled: true
+        ],
        [ name: 'POI-DSL-1.17', jdk: '1.17', trigger: 'H */12 * * *', skipcigame: true
        ],
-        [ name: 'POI-DSL-1.21', jdk: '1.21', trigger: 'H */12 * * *', skipcigame: true
+        [ name: 'POI-DSL-1.18', jdk: '1.18', trigger: triggerSundays, skipcigame: true
        ],
-        [ name: 'POI-DSL-1.24', jdk: '1.24', trigger: triggerSundays, skipcigame: true,
-        ],
-        [ name: 'POI-DSL-1.25', jdk: '1.25', trigger: triggerSundays, skipcigame: true, skipSpotbugs: true,
-          // use Ant for building until Gradle supports JDK 25
-          // see https://docs.gradle.org/current/userguide/compatibility.html
-          // and https://github.com/gradle/gradle/issues/31625
-          useAnt: true
+        // Use Ant build for as Gradle 7.5 does not support Java 19 yet (change to gradle: true when we have Gradle support)
+        [ name: 'POI-DSL-1.19', jdk: '1.19', trigger: triggerSundays, skipcigame: true, useAnt: true
        ],
        // Use Ant-build for now as selecting IBM JDK via toolchain does not work (yet)
        [ name: 'POI-DSL-IBM-JDK', jdk: 'IBMJDK', trigger: triggerSundays, skipcigame: true, useAnt: true
@ -66,11 +63,17 @@ def poijobs = [
          // the property triggers using Xerces as XML Parser and previously showed some exception that can occur
          properties: ["-Dadditionaljar=${xercesLib}"]
        ],
+//        [ name: 'POI-DSL-Maven', trigger: 'H */4 * * *', maven: true,
+//		  // not needed any more now that we use Gradle for SonarQube
+//		  disabled: true
+//        ],
        [ name: 'POI-DSL-regenerate-javadoc', trigger: triggerSundays, javadoc: true
        ],
        // it was impossible to make this run stable in Gradle, thus disabling this for now
        [ name: 'POI-DSL-API-Check', trigger: '@daily', apicheck: true, disabled: true, useAnt: true
        ],
+//        [ name: 'POI-DSL-Gradle', trigger: triggerSundays, email: 'centic@apache.org'
+//        ],
        [ name: 'POI-DSL-no-scratchpad', trigger: triggerSundays, noScratchpad: true
        ],
        [ name: 'POI-DSL-saxon-test', trigger: triggerSundays, saxonTest: true
@ -80,32 +83,34 @@ def poijobs = [
 //		  // replaced by Gradle-based build now
 //		  disabled: true
 //        ],
-        [ name: 'POI-DSL-SonarQube-Gradle', jdk: '1.17', trigger: 'H 7 * * *', sonar: true, skipcigame: true
+        [ name: 'POI-DSL-SonarQube-Gradle', jdk: '1.11', trigger: 'H 7 * * *', sonar: true, skipcigame: true
        ],
-        [ name: 'POI-DSL-Windows-1.8',
-          trigger: 'H */12 * * *',
-          windows: true,
-          slaves: 'Windows',
-          jenkinsLite: true,
-          disabled: true  // JDK 8 is no longer supported by POI 6
+        [ name: 'POI-DSL-Windows-1.8', trigger: 'H */12 * * *', windows: true, slaves: 'Windows'
        ],
-        [ name: 'POI-DSL-Windows-1.11', jdk: '1.11', trigger: triggerSundays, windows: true, slaves: 'Windows',
-          jenkinsLite: true
+//        [ name: 'POI-DSL-Windows-1.12', jdk: '1.12', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true,
+//          // let's save some CPU cycles here, 12 is not a LTS and JDK 13 is GA now
+//          disabled: true
+//        ],
+//        [ name: 'POI-DSL-Windows-1.14', jdk: '1.14', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true,
+//		  // let's only verify the latest two JDKs
+//		  disabled: true
+//        ],
+        [ name: 'POI-DSL-Windows-1.15', jdk: '1.15', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true,
+          // let's save some CPU cycles here, 14 is not a LTS and JDK 15 is GA as of 15 September 2020
+          disabled: true
+        ],
+        [ name: 'POI-DSL-Windows-1.16', jdk: '1.16', trigger: 'H */12 * * *', windows: true, slaves: 'Windows', skipcigame: true,
+          // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
+          disabled: true
        ],
        [ name: 'POI-DSL-Windows-1.17', jdk: '1.17', trigger: 'H */12 * * *', windows: true, slaves: 'Windows', skipcigame: true
        ],
-        [ name: 'POI-DSL-Windows-1.21', jdk: '1.21', trigger: 'H */12 * * *', windows: true, slaves: 'Windows', skipcigame: true
+        [ name: 'POI-DSL-Windows-1.18', jdk: '1.18', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true
        ],
-        [ name: 'POI-DSL-Windows-1.24', jdk: '1.24', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true,
-        ],
-        [ name: 'POI-DSL-Windows-1.25', jdk: '1.25', trigger: triggerSundays, windows: true, slaves: 'Windows', skipcigame: true,
-          skipSpotbugs: true,
-          // use Ant for building until Gradle supports JDK 24
-          // see https://docs.gradle.org/current/userguide/compatibility.html
-          // and https://github.com/gradle/gradle/issues/31625
-          useAnt: true
-        ],
-        [ name: 'POI-DSL-Github-PullRequests', trigger: '', skipcigame: true, disabled: true
+        [ name: 'POI-DSL-Github-PullRequests', trigger: '', githubpr: true, skipcigame: true,
+          // ensure the file which is needed from the separate documentation module does exist
+          // as we are checking out from git, we do not have the reference checked out here
+          addShell: 'mkdir -p src/documentation\ntouch src/documentation/RELEASE-NOTES.txt'
        ],
 ]

@ -114,25 +119,23 @@ def xmlbeansjobs = [
        ],
        [ name: 'POI-XMLBeans-DSL-1.11', jdk: '1.11', trigger: triggerSundays, skipcigame: true,
        ],
-        [ name: 'POI-XMLBeans-DSL-1.17', jdk: '1.17', trigger: 'H */12 * * *', skipcigame: true,
-        ],
-        [ name: 'POI-XMLBeans-DSL-1.21', jdk: '1.21', trigger: 'H */12 * * *', skipcigame: true,
-        ],
-        [ name: 'POI-XMLBeans-DSL-1.24', jdk: '1.24', trigger: triggerSundays, skipcigame: true,
+        [ name: 'POI-XMLBeans-DSL-1.16', jdk: '1.16', trigger: triggerSundays, skipcigame: true,
+          // let's save some CPU cycles here, 16 is not a LTS and JDK 17 is GA
          disabled: true
        ],
-        [ name: 'POI-XMLBeans-DSL-1.25', jdk: '1.25', trigger: triggerSundays, skipcigame: true,
+        [ name: 'POI-XMLBeans-DSL-1.17', jdk: '1.17', trigger: triggerSundays, skipcigame: true,
        ],
-        [ name: 'POI-XMLBeans-DSL-Sonar', jdk: '1.17', trigger: triggerSundays, skipcigame: true,
+        [ name: 'POI-XMLBeans-DSL-1.18', jdk: '1.18', trigger: triggerSundays, skipcigame: true,
+        ],
+        [ name: 'POI-XMLBeans-DSL-Sonar', jdk: '1.11', trigger: triggerSundays, skipcigame: true,
          sonar: true
        ]
 ]

-def gitBase = 'https://github.com/apache/poi.git'
-def xmlbeansGitBase = 'https://github.com/apache/xmlbeans.git'
+def svnBase = 'https://svn.apache.org/repos/asf/poi/trunk'
+def xmlbeansSvnBase = 'https://svn.apache.org/repos/asf/xmlbeans/trunk'

-def defaultJdk = '1.11'
-def defaultBranch = 'trunk'
+def defaultJdk = '1.8'
 def defaultTrigger = 'H/15 * * * *'     // check SCM every 60/15 = 4 minutes
 def defaultEmail = 'dev@poi.apache.org'
 def defaultAnt = 'ant_1.10_latest'
@ -142,14 +145,19 @@ def defaultMaven = 'maven_3_latest'
 def defaultSlaves = '(ubuntu)&&!beam&&!cloud-slave&&!H29'

 def jdkMapping = [
-        '1.8': [ jenkinsJdk: 'jdk_1.8_latest', jdkVersion: 8, jdkVendor: '' ],
-        '1.11': [ jenkinsJdk: 'jdk_11_latest', jdkVersion: 11, jdkVendor: '' ],
+        '1.8': [ jenkinsJdk: 'jdk_1.8_latest', jdkVersion: 8, jdkVendor: 'oracle' ],
+        '1.10': [ jenkinsJdk: 'jdk_10_latest', jdkVersion: 10, jdkVendor: 'oracle' ],
+        '1.11': [ jenkinsJdk: 'jdk_11_latest', jdkVersion: 11, jdkVendor: 'oracle' ],
+        '1.12': [ jenkinsJdk: 'jdk_12_latest', jdkVersion: 12, jdkVendor: '' ],
+        '1.13': [ jenkinsJdk: 'jdk_13_latest', jdkVersion: 13, jdkVendor: '' ],
+        '1.14': [ jenkinsJdk: 'jdk_14_latest', jdkVersion: 14, jdkVendor: '' ],
+        '1.15': [ jenkinsJdk: 'jdk_15_latest', jdkVersion: 15, jdkVendor: '' ],
+        '1.16': [ jenkinsJdk: 'jdk_16_latest', jdkVersion: 16, jdkVendor: '' ],
        '1.17': [ jenkinsJdk: 'jdk_17_latest', jdkVersion: 17, jdkVendor: '' ],
-        '1.21': [ jenkinsJdk: 'jdk_21_latest', jdkVersion: 21, jdkVendor: '' ],
-        '1.24': [ jenkinsJdk: 'jdk_24_latest', jdkVersion: 24, jdkVendor: '' ],
-        '1.25': [ jenkinsJdk: 'jdk_25_latest', jdkVersion: 25, jdkVendor: '' ],
-        // one of the few IBM JDKs that is still supported on ci-builds.apache.org
-        'IBMJDK': [ jenkinsJdk: 'ibm_semeru_21.0.2_13', jdkVersion: 21, jdkVendor: 'ibm' ]
+        '1.18': [ jenkinsJdk: 'jdk_18_latest', jdkVersion: 18, jdkVendor: '' ],
+        '1.19': [ jenkinsJdk: 'jdk_19_latest', jdkVersion: 19, jdkVendor: '' ],
+        'OpenJDK 1.8': [ jenkinsJdk: 'adoptopenjdk_hotspot_8u282', jdkVersion: 8, jdkVendor: 'adoptopenjdk' ],
+        'IBMJDK': [ jenkinsJdk: 'ibmjdk_1.8.0_261', jdkVersion: 8, jdkVendor: 'ibm' ]
 ]

 static def shellEx(def context, String cmd, def poijob) {
@ -167,7 +175,7 @@ Apache POI - the Java API for Microsoft Documents
 </p>
 <p>
 <b>This is an automatically generated Job Config, do not edit it here!
-Instead change the Jenkins Job DSL at <a href="https://github.com/apache/poi/blob/trunk/jenkins/">https://github.com/apache/poi/blob/trunk/jenkins/</a>,
+Instead change the Jenkins Job DSL at <a href="https://svn.apache.org/repos/asf/poi/trunk/jenkins">https://svn.apache.org/repos/asf/poi/trunk/jenkins</a>,
 see <a href="https://github.com/jenkinsci/job-dsl-plugin/wiki">https://github.com/jenkinsci/job-dsl-plugin/wiki</a>
 for more details about the DSL.</b>
 </p>'''
@ -186,9 +194,9 @@ def apicheckDesc = '''

 def sonarDesc = '''
 <p>
-<b><a href="lastSuccessfulBuild/spotbugs/" target="_blank">Spotbugs report of latest build</a></b> -
+<b><a href="lastSuccessfulBuild/findbugsResult/" target="_blank">Findbugs report of latest build</a></b> -
 <b><a href="https://sonarcloud.io/dashboard?id=poi-parent" target="_blank">Sonar reports</a></b> -
-<b><a href="lastSuccessfulBuild/jacoco/" target="_blank">Coverage of latest build</a></b>
+<b><a href="lastSuccessfulBuild/artifact/build/coverage/index.html" target="_blank">Coverage of latest build</a></b>
 </p>
 '''

@ -197,9 +205,10 @@ def shellCmdsUnix =
 rm -rf examples excelant integrationtest main ooxml ooxml-schema scratchpad build.javacheck.xml

 # show which files are currently modified in the working copy
-git status || true
+svn status || true
 # make sure no changed module-class-files or ooxml-lite-report-files are lingering on
-git reset --hard || true
+svn revert poi*/src/*/java9/module-info.* || true
+svn revert src/resources/ooxml-lite-report.* || true

 # print out information about which exact version of java we are using
 echo Java-Home: $JAVA_HOME
@ -232,9 +241,9 @@ exit 0'''
 def shellCmdsWin =
        '''@echo off
 :: show which files are currently modified in the working copy
-git status
+svn status
 :: make sure no changed module-class-files are lingering on
-git reset --hard
+svn revert poi*\\src\\*\\java9\\module-info.*

 :: print out information about which exact version of java we are using
 echo Java-Home: %JAVA_HOME%
@ -252,7 +261,6 @@ poijobs.each { poijob ->
    def email = poijob.email ?: defaultEmail
    def slaves = poijob.slaves ?: defaultSlaves + (poijob.slaveAdd ?: '')
    def antRT = poijob.windows ? defaultAntWindows : defaultAnt
-    def checkoutBranch = poijob.branch ?: defaultBranch

    job('POI/' + poijob.name) {
        if (poijob.disabled) {
@ -268,6 +276,11 @@ poijobs.each { poijob ->
        environmentVariables {
            env('LANG', 'en_US.UTF-8')
            env('CI_BUILD', 'TRUE')
+            if(jdkKey == '1.10') {
+                // when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task
+                // on JDK 11 and newer there is no such module any more, so do not add it here
+                env('ANT_OPTS', '--add-modules=java.xml.bind --add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED')
+            }
            env('FORREST_HOME', poijob.windows ? 'f:\\jenkins\\tools\\forrest\\latest' : '/home/jenkins/tools/forrest/latest')
        }

@ -297,17 +310,50 @@ poijobs.each { poijob ->
        }
        jdk(jdkMapping.get(jdkKey).jenkinsJdk)
        scm {
-            git {
-                remote {
-                    url(gitBase)
+            if (poijob.githubpr) {
+                git {
+                    remote {
+                        github('apache/poi')
+                        refspec('+refs/pull/*:refs/remotes/origin/pr/*')
+                    }
+                    branch('${sha1}')
+                }
+            } else {
+                svn(svnBase) { svnNode ->
+                    svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') /
+                            url << 'https://svn.apache.org/viewcvs.cgi/?root=Apache-SVN'
                }
-                branch("*/${checkoutBranch}")
            }
        }
        checkoutRetryCount(3)

-        triggers {
-            scm(trigger)
+        if (poijob.githubpr) {
+            throttleConcurrentBuilds {
+                maxPerNode(1)
+                maxTotal(1)
+            }
+            parameters {
+                /* plugin not available:
+                gitParam('sha1') {
+                    description('Pull request')
+                    type('BRANCH')
+                }*/
+                stringParam('sha1', 'origin/pr/9/head', 'Provide a branch-spec, e.g. origin/pr/9/head')
+            }
+            triggers {
+                pullRequestBuildTrigger()
+                /*githubPullRequest {
+                    admins(['centic9', 'poi-benchmark', 'tballison', 'gagravarr', 'onealj', 'pjfanning', 'Alain-Bearez'])
+                    userWhitelist(['centic9', 'poi-benchmark', 'tballison', 'gagravarr', 'onealj', 'pjfanning', 'Alain-Bearez'])
+                    orgWhitelist(['apache'])
+                    cron('H/5 * * * *')
+                    triggerPhrase('OK to test')
+                }*/
+            }
+        } else {
+            triggers {
+                scm(trigger)
+            }
        }

        def shellcmds = (poijob.windows ? shellCmdsWin : shellCmdsUnix).replace('POIJOBSHELL', poijob.shell ?: '')
@ -339,7 +385,7 @@ poijobs.each { poijob ->

                gradle {
                    switches('-PenableSonar')
-                    switches('-Dsonar.token=${POI_SONAR_TOKEN}')
+                    switches('-Dsonar.login=${POI_SONAR_TOKEN}')
                    switches('-Dsonar.organization=apache')
                    switches('-Dsonar.projectKey=poi-parent')
                    switches('-Dsonar.host.url=https://sonarcloud.io')
@ -350,26 +396,26 @@ poijobs.each { poijob ->
                    tasks('clean')
                    tasks('check')
                    tasks('jacocoTestReport')
-                    tasks('sonar')
+                    tasks('sonarqube')
                    useWrapper(true)
                }
            }
            publishers {
-                // in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
-                archiveArtifacts('build/dist/*.tar.gz,*/build/reports/**,poi-integration/build/test-results/**,*/build/libs/*.jar')
-                archiveJunit('*/build/test-results/**/TEST-*.xml') {
-                    testDataPublishers {
-                        publishTestStabilityData()
-                    }
-                }
-                jacocoCodeCoverage {
-                    classPattern('*/build/classes')
-                    execPattern('*/build/*.exec,*/build/jacoco/*.exec')
-                    sourcePattern('*/src/main/java')
-                    exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class')
-                }
+				// in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
+				archiveArtifacts('build/dist/*.tar.gz,*/build/reports/**,poi-integration/build/test-results/**,*/build/libs/*.jar')
+				archiveJunit('*/build/test-results/**/TEST-*.xml') {
+					testDataPublishers {
+						publishTestStabilityData()
+					}
+				}
+				jacocoCodeCoverage {
+					classPattern('*/build/classes')
+					execPattern('*/build/*.exec,*/build/jacoco/*.exec')
+					sourcePattern('*/src/main/java')
+					exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class')
+				}

-                if (!poijob.skipcigame) {
+				if (!poijob.skipcigame) {
                    configure { project ->
                        project / publishers << 'hudson.plugins.cigame.GamePublisher' {}
                    }
@ -390,11 +436,7 @@ poijobs.each { poijob ->
                    }

                    gradle {
-                        if (poijob.jenkinsLite) {
-                            tasks('clean jenkinsLite')
-                        } else {
-                            tasks('clean jenkins')
-                        }
+                        tasks('clean jenkins')
                        useWrapper(true)
                        if (poijob.noScratchpad) {
                            switches('-Pscratchpad.ignore=true')
@ -411,51 +453,44 @@ poijobs.each { poijob ->
                } else {
                    ant {
                        targets(['clean', 'jenkins'] + (poijob.properties ?: []))
-                        prop('coverage.enabled', !poijob.skipSpotbugs)
+                        prop('coverage.enabled', true)
                        // Properties did not work, so I had to use targets instead
                        //properties(poijob.properties ?: '')
                        antInstallation(antRT)
                    }
-                    if(!poijob.skipSourceBuild) {
-                        ant {
-                            targets(['run'] + (poijob.properties ?: []))
-                            buildFile('poi-integration/build.xml')
-                            // Properties did not work, so I had to use targets instead
-                            //properties(poijob.properties ?: '')
-                            antInstallation(antRT)
-                        }
+                    ant {
+                        targets(['run'] + (poijob.properties ?: []))
+                        buildFile('poi-integration/build.xml')
+                        // Properties did not work, so I had to use targets instead
+                        //properties(poijob.properties ?: '')
+                        antInstallation(antRT)
                    }
                }
            }
            publishers {
-                if (!poijob.skipSpotbugs) {
-                    recordIssues {
-                        tools {
-                            spotBugs {
-                                pattern('*/build/reports/spotbugs/*.xml')
-                                reportEncoding('UTF-8')
-                            }
+                recordIssues {
+                    tools {
+                        spotBugs {
+                            pattern('*/build/reports/spotbugs/*.xml')
+                            reportEncoding('UTF-8')
                        }
                    }
                }
                // in archive, junit and jacoco publishers, matches beneath build/*/build/... are for Gradle-build results
-                archiveArtifacts('build/dist/*.zip,build/dist/*.tgz,build/dist/maven/*/*.jar,build/dist/maven/*/*.pom,build/dist/maven/*/*.asc,build/dist/maven/*/*.sha256,build/dist/maven/*/*.sha512,build/coverage/**,*/build/reports/*.bom.*,build/hs_err*.log')
-                /* this plugin is currently missing on the Apache Jenkins instance
+                archiveArtifacts('build/dist/*.zip,build/dist/*.tgz,build/dist/maven/*/*.jar,build/coverage/**,build/hs_err*.log')
                warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
                    resolveRelativePaths()
-                } */
+                }
                archiveJunit('*/build/test-results/**/TEST-*.xml') {
                    testDataPublishers {
                        publishTestStabilityData()
                    }
                }
-                if (!poijob.skipSpotbugs) {
-                    jacocoCodeCoverage {
-                        classPattern('*/build/classes')
-                        execPattern('*/build/*.exec,*/build/jacoco/*.exec')
-                        sourcePattern('*/src/main/java')
-                        exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class')
-                    }
+                jacocoCodeCoverage {
+                    classPattern('*/build/classes')
+                    execPattern('*/build/*.exec,*/build/jacoco/*.exec')
+                    sourcePattern('*/src/main/java')
+                    exclusionPattern('com/microsoft/**,org/openxmlformats/**,org/etsi/**,org/w3/**,schemaorg*/**,schemasMicrosoft*/**,org/apache/poi/hdf/model/hdftypes/definitions/*.class,org/apache/poi/hwpf/model/types/*.class,org/apache/poi/hssf/usermodel/DummyGraphics2d.class,org/apache/poi/sl/draw/binding/*.class')
                }

                if (!poijob.skipcigame) {
@ -467,6 +502,15 @@ poijobs.each { poijob ->
            }
        }

+
+        if (poijob.githubpr) {
+            configure {
+                it / 'properties' << 'com.cloudbees.jenkins.plugins.git.vmerge.JobPropertyImpl'(plugin: 'git-validated-merge') {
+                    credentialsId('ASF_Cloudbees_Jenkins_ci-builds')
+                    postBuildPushFailureHandler(class: 'com.cloudbees.jenkins.plugins.git.vmerge.pbph.PushFailureIsFailure')
+                }
+            }
+        }
    }
 }

@ -490,8 +534,11 @@ xmlbeansjobs.each { xjob ->
        label(slaves)
        environmentVariables {
            env('LANG', 'en_US.UTF-8')
-            if (jdkKey == '1.11' || jdkKey == '1.17' || jdkKey == '1.21'
-                    || jdkKey == '1.23' || jdkKey == '1.24' || jdkKey == '1.25') {
+            if(jdkKey == '1.10') {
+                // when using JDK 9/10 for running Ant, we need to provide more modules for the forbidden-api-checks task
+                // on JDK 11 and newer there is no such module any more, so do not add it here
+                env('ANT_OPTS', '--add-modules=java.xml.bind --add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED')
+            } else if (jdkKey == '1.11' || jdkKey == '1.12' || jdkKey == '1.13' || jdkKey == '1.14' || jdkKey == '1.15' || jdkKey == '1.16' || jdkKey == '1.17' || jdkKey == '1.18' || jdkKey == '1.19') {
                env('ANT_OPTS', '--add-opens=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED')
            }
            // will be needed for forbidden-apis-check: env('ANT_HOME', xjob.windows ? 'f:\\jenkins\\tools\\ant\\latest' : '/usr/share/ant')
@ -514,11 +561,9 @@ xmlbeansjobs.each { xjob ->
        }
        jdk(jdkMapping.get(jdkKey).jenkinsJdk)
        scm {
-            git {
-                remote {
-                    url(xmlbeansGitBase)
-                }
-                branch('*/trunk')
+            svn(xmlbeansSvnBase) { svnNode ->
+                svnNode / browser(class: 'hudson.scm.browsers.ViewSVN') /
+                        url << 'https://svn.apache.org/viewcvs.cgi/?root=Apache-SVN'
            }
        }
        checkoutRetryCount(3)
@ -539,7 +584,7 @@ xmlbeansjobs.each { xjob ->
            gradle {
                if (xjob.sonar) {
                    switches('-PenableSonar')
-                    switches('-Dsonar.token=${POI_SONAR_TOKEN}')
+                    switches('-Dsonar.login=${POI_SONAR_TOKEN}')
                    switches('-Dsonar.organization=apache')
                    switches('-Dsonar.projectKey=apache_xmlbeans')
                    switches('-Dsonar.host.url=https://sonarcloud.io')
@ -552,18 +597,17 @@ xmlbeansjobs.each { xjob ->
                tasks('jenkins')
                tasks('jacocoTestReport')
                if (xjob.sonar) {
-                    tasks('sonar')
+                    tasks('sonarqube')
                }
                useWrapper(true)
            }
        }
        publishers {
-            archiveArtifacts('build/libs/xmlbeans*.jar,build/distributions/*,build/reports/*.bom.*,build/hs_err*.log')
+            archiveArtifacts('build/libs/xmlbeans*.jar,build/distributions/*,build/hs_err*.log')

-            /* this plugin is currently missing on the Apache Jenkins instance
            warnings(['Java Compiler (javac)', 'JavaDoc Tool'], null) {
                resolveRelativePaths()
-            } */
+            }
            archiveJunit('build/test-results/test/TEST-*.xml') {
                testDataPublishers {
                    publishTestStabilityData()
@ -611,56 +655,60 @@ Unfortunately we often see builds break because of changes/new machines...''')
    }
    axes {
        jdk(
-                'jdk_8_latest',
+                'jdk_1.8_latest',
+                'jdk_10_latest',
                'jdk_11_latest',
+                /* don't look for JDKs that are out of support
+                'jdk_12_latest',
+                'jdk_13_latest',
+                'jdk_14_latest',
+                'jdk_15_latest',
+                'jdk_16_latest',*/
                'jdk_17_latest',
-                'jdk_21_latest',
-                'jdk_23_latest',
-                'jdk_24_latest',
-                'jdk_25_latest',
-                'jdk_26_latest',
-                'ibm_semeru_21.0.2_13'
+                'jdk_18_latest',
+                'jdk_19_latest',
+                'adoptopenjdk_hotspot_8u282',
+                'ibmjdk_1.8.0_261'
        )
-        // Note H50 is reserved according to its node-description
-        label('Nodes','builds22','builds23','builds24','builds25','builds26','builds27','builds28','builds29','builds30','builds31','builds32','builds33','builds34','builds35','builds36','builds37','builds38','builds39','builds40','builds50','builds56','builds57','builds58','builds59','builds60',
-                'jenkins-win-azr-1','jenkins-win-azr-2','jenkins-win-azr-3','jenkins-win-azr-4','jenkins-win-azr-5','jenkins-win-azr-6','jenkins-win-azr-7','jenkins-win-azr-8','jenkins-win-azr-10','jenkins-win-azr-11','jenkins-win-azr-12')
+        // Note H50 is reserved according to it's node-descripion
+        label('Nodes','H22','H23','H24','H25','H26','H27','H28','H29','H30','H31','H32','H33','H34','H35','H36','H37','H38','H39','H40','H41','H42','H43','H44','H48','lucene1','lucene2','master')
    }
    steps {
        conditionalSteps {
            condition {
-                fileExists('/usr', BaseDir.WORKSPACE)
-            }
-            runner('DontRun')
-            steps {
-                shell(
-                        '''which git || true
+				fileExists('/usr', BaseDir.WORKSPACE)
+			}
+			runner('DontRun')
+			steps {
+				shell(
+						'''which svn || true
 which javac
 javac -version
 echo '<?xml version="1.0"?><project name="POI Build" default="test"><target name="test"><echo>Using Ant: ${ant.version} from ${ant.home}</echo></target></project>' > build.xml
 ''')
-                ant {
-                    antInstallation(defaultAnt)
-                }
+				ant {
+					antInstallation(defaultAnt)
+				}

-                shell(
-                        '''which mvn || true
+				shell(
+						'''which mvn || true
 mvn -version || true
 echo '<project><modelVersion>4.0.0</modelVersion><groupId>org.apache.poi</groupId><artifactId>build-tst</artifactId><version>1.0.0</version></project>' > pom.xml
 ''')
-                maven {
-                    goals('package')
-                    mavenInstallation(defaultMaven)
-                }
-            }
+				maven {
+					goals('package')
+					mavenInstallation(defaultMaven)
+				}
+			}
        }
        conditionalSteps {
            condition {
-                fileExists('c:\\windows', BaseDir.WORKSPACE)
-            }
-            runner('DontRun')
-            steps {
-                batchFile(
-                        '''@echo off
+				fileExists('c:\\windows', BaseDir.WORKSPACE)
+			}
+			runner('DontRun')
+			steps {
+				batchFile(
+							'''@echo off
 echo .
 where javac.exe
 echo .
@ -668,10 +716,71 @@ javac -version
 echo .
 echo ^<?xml version=^"1.0^"?^>^<project name=^"POI Build^" default=^"test^"^>^<target name=^"test^"^>^<echo^>Using Ant: ${ant.version} from ${ant.home}, ant detected Java ${ant.java.version} (may be different than actual Java sometimes...), using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}^</echo^>^</target^>^</project^> > build.xml
 ''')
-                ant {
-                    antInstallation(defaultAntWindows)
-                }
-            }
+				ant {
+					antInstallation(defaultAntWindows)
+				}
+			}
        }
    }
 }
+
+/* I tried to put the view into a sub-folder/sub-view, but failed, there are multiple related
+ plugins so this is all a bit confusing :(, see also https://issues.apache.org/jira/browse/INFRA-14002
+dashboardView("P/POI-new") {
+    columns {
+        status()
+        weather()
+        configureProject()
+        buildButton()
+        cronTrigger()
+        lastBuildConsole()
+        name()
+        lastSuccess()
+        lastFailure()
+        lastDuration()
+        //lastSuccessDescription()
+        jacoco()
+    }
+    description("<table>\n" +
+            "  <tr>\n" +
+            "    <td><img src=\"https://poi.apache.org/images/project-header.png\" /></td>\n" +
+            "    <td>  \n" +
+            "      <p>Apache POI - the Java API for Microsoft Documents</p>\n" +
+            "      <p><b>Most of the POI Jobs are automatically generated by Jenkins Job DSL\n" +
+            "        at <a href=\"https://svn.apache.org/repos/asf/poi/trunk/jenkins\">https://svn.apache.org/repos/asf/poi/trunk/jenkins</a>,<br/>\n" +
+            "        see <a href=\"https://github.com/jenkinsci/job-dsl-plugin/wiki\">https://github.com/jenkinsci/job-dsl-plugin/wiki</a>\n" +
+            "        for more details about the DSL.</b>\n" +
+            "      </p>\n" +
+            "      <p>\n" +
+            "      <b><a href=\"job/POI-DSL-1.8/lastSuccessfulBuild/findbugsResult/\" target=\"_blank\">Findbugs report of latest build</a></b> -\n" +
+            "      <b><a href=\"https://sonarcloud.io/dashboard?id=poi-parent\" target=\"_blank\">Sonar reports</a></b> -\n" +
+            "      <b><a href=\"job/POI-DSL-1.8/lastSuccessfulBuild/artifact/build/coverage/index.html\" target=\"_blank\">Coverage of latest build</a></b>\n" +
+            "      </p>\n" +
+            "    </td>\n" +
+            "  </tr>\n" +
+            "</table>")
+    filterBuildQueue(false)
+    filterExecutors(false)
+
+    // Job selection
+    jobs {*/
+//regex(/.*POI.*/)
+/*}
+
+// Layout
+topPortlets {
+    jenkinsJobsList {
+        displayName('POI jobs')
+    }
+}
+leftPortlets {
+    testStatisticsChart()
+}
+rightPortlets {
+    testTrendChart()
+}
+bottomPortlets {
+    testStatisticsGrid()
+    buildStatistics()
+}
+}*/
--- a/legal/LICENSE
+++ b/legal/LICENSE
@ -222,16 +222,74 @@ Office Open XML schemas (poi-ooxml-full-*.jar)
    Furthermore, both Microsoft and Adobe have granted patent licenses
    to this work [3,4,5].

-    [1] https://www.ecma-international.org/publications/standards/Ecma-376.htm
-    [2] https://www.ecma-international.org/memento/Ecmabylaws.htm
-    [3] https://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
-    [4] https://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+    [1] http://www.ecma-international.org/publications/standards/Ecma-376.htm
+    [2] http://www.ecma-international.org/memento/Ecmabylaws.htm
+    [3] http://www.microsoft.com/openspecifications/en/us/programs/osp/default.aspx
+    [4] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
        Patent%20statements%20ok/ECMA-376%20Edition%202%20Microsoft%20Patent%20Declaration.pdf
-    [5] https://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
+    [5] http://www.ecma-international.org/publications/files/ECMA-ST/Ecma%20PATENT/
        Patent%20statements%20ok/ECMA-376%20Adobe%20Patent%20Declaration.pdf


-org.apache.poi.util.ReplacingInputStream is based on code from
+Bouncy Castle library (bcprov-*.jar, bcpg-*.jar, bcpkix-*.jar)
+
+    Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
+    (https://www.bouncycastle.org)
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+
+CurvesAPI / Curve API
+
+    BSD License
+
+    Copyright (c) 2000-2015 www.hamcrest.org
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+    Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer. Redistributions in
+    binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or other
+    materials provided with the distribution. Neither the name of Hamcrest nor
+    the names of its contributors may be used to endorse or promote products
+    derived from this software without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Log4j 2 library (log4j-api-*.jar)
+
+    Apache License Version 2.0
+
+
 inbot-utils (https://github.com/Inbot/inbot-utils)

 	The MIT License (MIT)
@ -254,15 +312,4 @@ inbot-utils (https://github.com/Inbot/inbot-utils)
 	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-	SOFTWARE.
-
-ExceptionUtils is derived from `scala.util.control.NonFatal` in scala-library
-which was released under the Apache 2.0 license.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
-
-The POI Source Release bundles the Gradle Wrapper. (https://docs.gradle.org/current/userguide/gradle_wrapper.html)
-This is released under the Apache License, v2.0.
-Copyright © 2015-2021 the original authors.
-
-The wrapper.gradle file was developed by the Apache Kafka project and is released under the Apache License, v2.0.
+	SOFTWARE.
--- a/legal/NOTICE
+++ b/legal/NOTICE
@ -1,5 +1,5 @@
 Apache POI
-Copyright 2003-2026 The Apache Software Foundation
+Copyright 2003-2022 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
@ -24,13 +24,3 @@ This product contains parts of the eID Applet project
 Copyright (c) 2009-2018
 FedICT (federal ICT department of Belgium), e-Contract.be BVBA (https://www.e-contract.be),
 Bart Hanssens from FedICT
-
-ExceptionUtils is derived from `scala.util.control.NonFatal` in scala-library
-which was released under the Apache 2.0 license.
-
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
-
-Scala includes software developed at
-LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
--- a/lib.stored/adapter-base-1.12.0.jar
+++ b/lib.stored/adapter-base-1.12.0.jar
--- a/lib.stored/adapter-javahl-1.12.0.jar
+++ b/lib.stored/adapter-javahl-1.12.0.jar
--- a/lib.stored/adapter-svnkit-1.12.0.jar
+++ b/lib.stored/adapter-svnkit-1.12.0.jar
--- a/lib.stored/svnant-1.3.1.jar
+++ b/lib.stored/svnant-1.3.1.jar
--- a/osgi/README.md
+++ b/osgi/README.md
@ -21,15 +21,15 @@ The bundle embeds all the jars from lib/main:
 Required to render WMF/EMF images. The OSGi bundle is provided by ServiceMix and available in Maven Central: https://mvnrepository.com/artifact/org.apache.servicemix.bundles/org.apache.servicemix.bundles.batik/1.14_1
 2. Saxon
 Required if using as the XSLT and XQuery Processor engine in XML Beans.
-Available in Maven Central: https://mvnrepository.com/artifact/net.sf.saxon/Saxon-HE/12.3
+Available in Maven Central (but version might be too old): https://mvnrepository.com/artifact/net.sf.saxon/saxon/8.9.0.4-osgi
 3. Apache XML Security for Java, Bouncy Castle and XML Commons Resolver 
 These are required to sign or validate signed Office documents. The OSGi bundles are available in Maven Central:

-    - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/3.0.6
+    - Apache XML Security for Java: https://mvnrepository.com/artifact/org.apache.santuario/xmlsec/3.0.0 (use v2.3.0 with POI v5.2.2)
    
    - XML Commons Resolver: https://mvnrepository.com/artifact/xml-resolver/xml-resolver/1.2-osgi
    
-    - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk18on/1.82, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on/1.82
+    - Bouncy Castle: https://mvnrepository.com/artifact/org.bouncycastle/bcprov-ext-jdk15on/1.70, https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk15on/1.70
 4. PDFBox and PDFBox Graphics2D  
 Required to render to PDF documents.
 The required jars can be downloaded from:
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@ -24,13 +24,13 @@
    <groupId>org.apache.poi</groupId>
    <artifactId>poi-bundle</artifactId>
    <packaging>bundle</packaging>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>5.2.3</version>

    <name>Apache POI OSGi bundle</name>
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <poi.version>6.0.0-SNAPSHOT</poi.version>
-        <pax.exam.version>4.14.0</pax.exam.version>
+        <poi.version>5.2.3</poi.version>
+        <pax.exam.version>4.12.0</pax.exam.version>
    </properties>

    <build>
@ -39,8 +39,8 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>3.8.0</version>
                <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                </configuration>
            </plugin>
            <plugin>
@ -176,7 +176,7 @@
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <scope>test</scope>
-            <version>4.13.2</version>
+            <version>4.13.1</version>
        </dependency>

        <!-- Pax Exam -->
@ -231,7 +231,7 @@
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
-            <version>2.25.3</version>
+            <version>2.18.0</version>
            <scope>test</scope>
        </dependency>
    </dependencies>
--- a/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java
+++ b/osgi/src/test/java/org/apache/poi/osgi/OSGiExtractorsIT.java
@ -57,7 +57,7 @@ public class OSGiExtractorsIT extends BaseOSGiTestCase {
        box.setText("Hello, World!");
        box.setAnchor(new Rectangle(36, 15, 648, 65));

-        UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get();
+        UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream();
        ppt.write(out);
        return out.toByteArray();
    }
@ -66,7 +66,7 @@ public class OSGiExtractorsIT extends BaseOSGiTestCase {
        Sheet s = wb.createSheet("OSGi");
        s.createRow(0).createCell(0).setCellValue("Hello, World!");

-        UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get();
+        UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream();
        wb.write(out);
        return out.toByteArray();

--- a/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java
+++ b/osgi/src/test/java/org/apache/poi/osgi/OSGiSlideShowIT.java
@ -75,7 +75,7 @@ public class OSGiSlideShowIT extends BaseOSGiTestCase {
        }
        box2.setAnchor(new Rectangle(36, 80, 648, 400));

-        try (UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
+        try (UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
            ppt.write(baos);
            try (InputStream bais = baos.toInputStream()) {
                ppt = SlideShowFactory.create(bais);
--- a/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java
+++ b/osgi/src/test/java/org/apache/poi/osgi/OSGiSpreadsheetIT.java
@ -48,7 +48,7 @@ public class OSGiSpreadsheetIT extends BaseOSGiTestCase {
        s.createRow(0).createCell(0).setCellValue("With OSGi");
        s.createRow(1).createCell(0).setCellFormula("SUM(A1:B3)");

-        try (UnsynchronizedByteArrayOutputStream baos = UnsynchronizedByteArrayOutputStream.builder().get()) {
+        try (UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream()) {
            wb.write(baos);
            try (InputStream bais = baos.toInputStream()) {
                wb = WorkbookFactory.create(bais);
--- a/poi-examples/build.gradle
+++ b/poi-examples/build.gradle
@ -19,7 +19,9 @@ import java.util.regex.Pattern

 sourceSets {
    main {
-        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
+        if (jdkVersion > 8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
    }
 }

@ -35,39 +37,63 @@ dependencies {
        implementation project(path: ':poi-scratchpad', configuration: 'archives')
    }

+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+
    testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) {
        if (NO_SCRATCHPAD) {
            exclude group: 'org.apache.poi', module: 'poi-scratchpad'
        }
    }
    testImplementation project(path: ':poi', configuration: 'tests')
+
+    if (SAXON_TEST) {
+         testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
+    }
 }

 final String MODULE_NAME = 'org.apache.poi.examples'
 final Pattern MODULE_REGEX = ~'\\.jar$'
 final List MODULE_COMPILE_PATH = sourceSets.main.compileClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()

-tasks.register('compileJava9', JavaCompile) {
+task compileJava9(type: JavaCompile) {
    dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
    }
-    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(MODULE_COMPILE_PATH).asPath
+        '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
+        '--module-path', files(MODULE_COMPILE_PATH).asPath
    ]
+
+
+    onlyIf {
+        jdkVersion > 8
+    }
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
 }

 jar {
-    dependsOn compileJava9
+    dependsOn cacheJava9

-    destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}")
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (jdkVersion == 8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }

    manifest {
        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -87,22 +113,3 @@ sourcesJar {
        from("$projectDir/../legal/NOTICE")
    }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). Defaults to 'bom'
-    outputName = "poi-examples-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
--- a/poi-examples/src/main/groovy/SpreadSheetDemo.groovy
+++ b/poi-examples/src/main/groovy/SpreadSheetDemo.groovy
@ -36,7 +36,7 @@ WorkbookFactory.create(f,null,true).withCloseable { workbook ->

      def sheet = workbook.getSheetAt(sheetNum)
      sheet.each { row ->
-         def nonEmptyCells = row.grep { c -> c.getCellType() != CellType.BLANK }
+         def nonEmptyCells = row.grep { c -> c.getCellType() != Cell.CELL_TYPE_BLANK }
         println " Row ${row.getRowNum()} has ${nonEmptyCells.size()} non-empty cells:"
         nonEmptyCells.each { c ->
            def cRef = [c] as CellReference
@ -52,7 +52,7 @@ WorkbookFactory.create(f,null,true).withCloseable { workbook ->
   ns1.createRow(1).createCell(0).setCellValue("TODO - Populate with data")

   Sheet ns2 = workbook.createSheet("Generated 2")
-   exportHeader(ns2, headerStyle, "This is a demo sheet",
+   exportHeader(ns2, headerStyle, "This is a demo sheet", 
                ["ID","Title","Date","Author","Num"] as String[])
   ns2.createRow(2).createCell(0).setCellValue(1)
   ns2.createRow(3).createCell(0).setCellValue(4)
--- a/poi-examples/src/main/groovy/build.gradle
+++ b/poi-examples/src/main/groovy/build.gradle
@ -21,11 +21,10 @@ apply plugin: 'groovy'
 repositories {
    mavenCentral()
 }
-
 dependencies {
-    implementation 'org.codehaus.groovy:groovy-all:2.4.21'
-    implementation 'org.apache.poi:poi:5.3.0'
-    implementation 'org.apache.poi:poi-ooxml:5.3.0'
+    compile 'org.codehaus.groovy:groovy-all:2.4.13'
+    compile 'org.apache.poi:poi:5.0.0'
+    compile 'org.apache.poi:poi-ooxml:5.0.0'
 }

 // Our files are in the current directory
@ -34,11 +33,11 @@ sourceSets {
 }

 // Run out read demo by default
-tasks.withType(JavaExec).configureEach {
-    classpath = sourceSets.main.runtimeClasspath
+tasks.withType(JavaExec) {
+   classpath = sourceSets.main.runtimeClasspath
 }
-tasks.register('runScript', JavaExec) {
-    mainClass = "SpreadSheetDemo"
-    args = ["../../../../test-data/spreadsheet/Simple.xls"]
+task runScript(type: JavaExec) {
+    main = "SpreadSheetDemo"
+    args = ["../../../test-data/spreadsheet/Simple.xls"]
 }
 defaultTasks 'runScript'
--- a/poi-examples/src/main/groovy/settings.gradle
+++ b/poi-examples/src/main/groovy/settings.gradle
@ -1 +0,0 @@
-// empty file required to have a standalone build
--- a/poi-examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
@ -21,7 +21,7 @@ package org.apache.poi.examples.crypt;

 import java.io.File;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
 import java.util.Optional;
 import java.util.function.Predicate;
@ -72,7 +72,7 @@ public final class OOXMLPasswordsTry {
            };

            // Try each password in turn, reporting progress
-            try (Stream<String> lines = Files.lines(Path.of(words))) {
+            try (Stream<String> lines = Files.lines(Paths.get(words))) {
                Optional<String> found = lines.filter(counter).filter(w -> isValid(d, w)).findFirst();
                System.out.println(found.map(s -> "Password found: " + s).orElse("Error - No password matched"));
            }
--- a/poi-examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
@ -174,8 +174,8 @@ public final class CopyCompare {

                for (int i=0; i<path.length(); i++) {
                    String subDir = path.getComponent(i);
-                    if (de.hasEntryCaseInsensitive(subDir)) {
-                        de = (DirectoryEntry)de.getEntryCaseInsensitive(subDir);
+                    if (de.hasEntry(subDir)) {
+                        de = (DirectoryEntry)de.getEntry(subDir);
                    } else {
                        de = de.createDirectory(subDir);
                        if (i == path.length()-1) {
--- a/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
@ -158,7 +158,7 @@ public final class WriteAuthorAndTitle {

                for (int i=0; i<path.length(); i++) {
                    String subDir = path.getComponent(i);
-                    de = (de.hasEntryCaseInsensitive(subDir)) ? (DirectoryEntry)de.getEntryCaseInsensitive(subDir) : de.createDirectory(subDir);
+                    de = (de.hasEntry(subDir)) ? (DirectoryEntry)de.getEntry(subDir) : de.createDirectory(subDir);
                }

                de.createDocument(event.getName(), is);
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/eventusermodel/XLS2CSVmra.java
@ -253,10 +253,6 @@ public class XLS2CSVmra implements HSSFListener {

            // Format
            thisStr = formatListener.formatNumberDateCell(numrec);
-            if (thisStr.contains(",")) {
-                thisStr = '"' + thisStr + '"';
-            }
-
            break;
        case RKRecord.sid:
            RKRecord rkrec = (RKRecord) record;
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/AddDimensionedImage.java
@ -16,21 +16,15 @@
 ==================================================================== */


-package org.apache.poi.ss.usermodel;
+package org.apache.poi.examples.hssf.usermodel;
+
+import org.apache.poi.util.Removal;

 /**
- * The CellPropertyCategory enum represents the different categories of cell properties.
- * Each category is used to classify and organize the cell properties based on their characteristics.
- *
- * @since 5.4.0
+ * Placeholder Class - this is now handled in the Common SS example
+ * @deprecated in 5.1.0 - use {@link org.apache.poi.examples.ss.AddDimensionedImage}
 */
-public enum CellPropertyCategory {
-
-    SHORT,
-    COLOR,
-    INT,
-    BOOL,
-    BORDER_TYPE,
-    OTHER
-
-}
+@Removal(version="6.0.0")
+@Deprecated
+public class AddDimensionedImage extends org.apache.poi.examples.ss.AddDimensionedImage {
+}
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EventExample.java
@ -75,7 +75,7 @@ public class EventExample implements HSSFListener {
                System.out.println("Cell found with value " + numrec.getValue()
                        + " at row " + numrec.getRow() + " and column " + numrec.getColumn());
                break;
-                // SSTRecords store an array of unique strings used in Excel.
+                // SSTRecords store a array of unique strings used in Excel.
            case SSTRecord.sid:
                sstrec = (SSTRecord) record;
                for (int k = 0; k < sstrec.getNumUniqueStrings(); k++)
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/InCellLists.java
@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
@ -31,7 +32,6 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.logging.PoiLogManager;

 /**
 * This class contains code that demonstrates how to insert plain, numbered
@ -50,7 +50,7 @@ import org.apache.poi.logging.PoiLogManager;
 */
@SuppressWarnings({"java:S106","java:S4823"})
 public class InCellLists {
-    private static final Logger LOG = PoiLogManager.getLogger(InCellLists.class);
+    private static final Logger LOG = LogManager.getLogger(InCellLists.class);


    // This character looks like a solid, black, loser case letter 'o'
@ -190,7 +190,7 @@ public class InCellLists {
        String formatString = InCellLists.BULLET_CHARACTER + " @";
        int formatIndex = format.getFormat(formatString);

-        // Construct an HSSFCellStyle and set its data format to use the
+        // Construct an HSSFCellStyle and set it's data formt to use the
        // object created above.
        HSSFCellStyle bulletStyle = workbook.createCellStyle();
        bulletStyle.setDataFormat((short)formatIndex);
@ -248,8 +248,8 @@ public class InCellLists {
                                   int increment) {
        StringBuilder buffer = new StringBuilder();
        int itemNumber = startingValue;
-        // Note that again, an HSSFCellStyle object is required and that
-        // its wrap text property should be set to 'true'
+        // Note that again, an HSSFCellStye object is required and that
+        // it's wrap text property should be set to 'true'
        HSSFCellStyle wrapStyle = workbook.createCellStyle();
        wrapStyle.setWrapText(true);
        // Note that the basic method is identical to the listInCell() method
@ -282,7 +282,7 @@ public class InCellLists {
                                   HSSFCell cell) {
        StringBuilder buffer = new StringBuilder();
        // Note that again, an HSSFCellStye object is required and that
-        // its wrap text property should be set to 'true'
+        // it's wrap text property should be set to 'true'
        HSSFCellStyle wrapStyle = workbook.createCellStyle();
        wrapStyle.setWrapText(true);
        // Note that the basic method is identical to the listInCell() method
@ -318,7 +318,7 @@ public class InCellLists {
                                     HSSFCell cell) {
        StringBuilder buffer = new StringBuilder();
        // Note that again, an HSSFCellStye object is required and that
-        // its wrap text property should be set to 'true'
+        // it's wrap text property should be set to 'true'
        HSSFCellStyle wrapStyle = workbook.createCellStyle();
        wrapStyle.setWrapText(true);
        // Step through the ArrayList of MultilLevelListItem instances.
@ -381,7 +381,7 @@ public class InCellLists {
        StringBuilder buffer = new StringBuilder();
        int highLevelItemNumber = highLevelStartingValue;
        // Note that again, an HSSFCellStye object is required and that
-        // its wrap text property should be set to 'true'
+        // it's wrap text property should be set to 'true'
        HSSFCellStyle wrapStyle = workbook.createCellStyle();
        wrapStyle.setWrapText(true);
        // Step through the ArrayList of MultilLevelListItem instances.
@ -436,7 +436,7 @@ public class InCellLists {
                                             HSSFCell cell) {
        StringBuilder buffer = new StringBuilder();
        // Note that again, an HSSFCellStye object is required and that
-        // its wrap text property should be set to 'true'
+        // it's wrap text property should be set to 'true'
        HSSFCellStyle wrapStyle = workbook.createCellStyle();
        wrapStyle.setWrapText(true);
        // Step through the ArrayList of MultilLevelListItem instances.
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawing.java
@ -192,7 +192,7 @@ public final class OfficeDrawing {
    private static int loadPicture( String path, HSSFWorkbook wb ) throws IOException {
        int pictureIndex;
        try (FileInputStream fis = new FileInputStream(path);
-             UnsynchronizedByteArrayOutputStream bos = UnsynchronizedByteArrayOutputStream.builder().get()) {
+             UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream()) {
            IOUtils.copy(fis, bos);
            pictureIndex = wb.addPicture(bos.toByteArray(), Workbook.PICTURE_TYPE_PNG);
        }
--- a/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Outlines.java
@ -22,12 +22,12 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;

+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.logging.PoiLogManager;

 /**
 * Creates outlines.
@ -35,7 +35,7 @@ import org.apache.poi.logging.PoiLogManager;
 public class Outlines implements Closeable {
    public static void main(String[] args)
    throws IOException, IllegalAccessException, InvocationTargetException, NoSuchMethodException {
-        Logger LOGGER = PoiLogManager.getLogger(Outlines.class);
+        Logger LOGGER = LogManager.getLogger(Outlines.class);
        for (int i=1; i<=13; i++) {
            try (Outlines o = new Outlines()) {
                String log = (String) Outlines.class.getDeclaredMethod("test" + i).invoke(o);
--- a/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
@ -59,7 +59,7 @@ public final class Word2Forrest
    {
      Paragraph p = r.getParagraph (x);
      String text = p.text ();
-      if (text.trim().isEmpty())
+      if (text.trim ().length () == 0)
      {
        continue;
      }
--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
@ -135,7 +135,7 @@ import java.util.Locale;
 * <p>
 * Note that the final four method calls all pass the same value and seem to
 * indicate that the images top left hand corner is aligned with the top left
- * hand corner of cell A1 and that its bottom right hand corner is also
+ * hand corner of cell A1 and that it's bottom right hand corner is also
 * aligned with the top left hand corner of cell A1. Yet, running this code
 * would see the image fully occupying cell A1. That is the result of the
 * values passed to parameters three and four; these I have referred to as
@ -406,7 +406,7 @@ public class AddDimensionedImage {
     * the image, adjusts the columns width if necessary and creates then
     * returns a ClientAnchorDetail object that facilitates construction of
     * an ClientAnchor that will fix the image on the sheet and establish
-     * its size.
+     * it's size.
     *
     * @param sheet           A reference to the sheet that will 'contain' the image.
     * @param colNumber       A primitive int that contains the index number of a
@ -483,7 +483,7 @@ public class AddDimensionedImage {
                // Mow many co-ordinate positions are there per millimetre?
                colCoordinatesPerMM = ConvertImageUnits.TOTAL_COLUMN_COORDINATE_POSITIONS /
                        colWidthMM;
-                // Given the width of the image, what should be its co-ordinate?
+                // Given the width of the image, what should be it's co-ordinate?
                pictureWidthCoordinates = (int) (reqImageWidthMM * colCoordinatesPerMM);
            } else {
                pictureWidthCoordinates = (int) reqImageWidthMM *
@ -500,7 +500,7 @@ public class AddDimensionedImage {
     * the image, adjusts the rows height if necessary and creates then
     * returns a ClientAnchorDetail object that facilitates construction of
     * a ClientAnchor that will fix the image on the sheet and establish
-     * its size.
+     * it's size.
     *
     * @param sheet            A reference to the sheet that will 'contain' the image.
     * @param rowNumber        A primitive int that contains the index number of a
@ -528,7 +528,7 @@ public class AddDimensionedImage {
        int pictureHeightCoordinates;
        ClientAnchorDetail rowClientAnchorDetail = null;

-        // Get the row and its height
+        // Get the row and it's height
        row = sheet.getRow(rowNumber);
        if (row == null) {
            // Create row if it does not exist.
@ -624,7 +624,7 @@ public class AddDimensionedImage {
            colWidthMM = ConvertImageUnits.widthUnits2Millimetres(
                    (short) (sheet.getColumnWidth(toColumn)));
            // Note use of the cell border width constant. Testing with an image
-            // declared to fit exactly into one column demonstrated that its
+            // declared to fit exactly into one column demonstrated that it's
            // width was greater than the width of the column the POI returned.
            // Further, this difference was a constant value that I am assuming
            // related to the cell's borders. Either way, that difference needs
@ -632,7 +632,7 @@ public class AddDimensionedImage {
            totalWidthMM += (colWidthMM + ConvertImageUnits.CELL_BORDER_WIDTH_MILLIMETRES);
            toColumn++;
        }
-        // De-rement by one the last column value.
+        // De-crement by one the last column value.
        toColumn--;
        // Highly unlikely that this will be true but, if the width of a series
        // of columns is exactly equal to the required width of the image, then
--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
@ -19,10 +19,8 @@

 package org.apache.poi.examples.ss;

+import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.List;

 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@ -95,7 +93,7 @@ public final class ConditionalFormats {
            if (wb instanceof XSSFWorkbook) {
                file += "x";
            }
-            try (OutputStream out = Files.newOutputStream(Path.of(file))) {
+            try (FileOutputStream out = new FileOutputStream(file)) {
                wb.write(out);
            }
            System.out.println("Generated: " + file);
@ -203,7 +201,7 @@ public final class ConditionalFormats {
            if (rn%10 == 0) {
                str = str + "x10 ";
            }
-            if (str.isEmpty()) {
+            if (str.length() == 0) {
                str = "nothing special...";
            }
            r.createCell(1).setCellValue("It is " + str);
@ -287,7 +285,7 @@ public final class ConditionalFormats {
    /**
     * Use Excel conditional formatting to hide the duplicate values,
     * and make the list easier to read. In this example, when the table is sorted by Region,
-     * the second (and subsequent) occurrences of each region name will have white font colour.
+     * the second (and subsequent) occurences of each region name will have white font colour.
     */
    static void hideDupplicates(Sheet sheet) {
        sheet.createRow(0).createCell(0).setCellValue("City");
@ -311,7 +309,7 @@ public final class ConditionalFormats {
        sheetCF.addConditionalFormatting(regions, rule1);

        sheet.getRow(1).createCell(1).setCellValue("<== the second (and subsequent) " +
-                "occurrences of each region name will have white font colour.  " +
+                "occurences of each region name will have white font colour.  " +
                "Condition: Formula Is   =A2=A1   (White Font)");
    }

--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
@ -77,7 +77,7 @@ public class LinkedDropDownLists {
            LinkedDropDownLists.buildDataSheet(sheet);

            // Build the first data validation to occupy cell A1. Note
-            // that it retrieves its data from the named area or region called
+            // that it retrieves it's data from the named area or region called
            // CHOICES. Further information about this can be found in the
            // static buildDataSheet() method below.
            CellRangeAddressList addressList = new CellRangeAddressList(0, 0, 0, 0);
--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
@ -70,25 +70,21 @@ public final class SSPerformanceTest {

        if(warmup) {
            System.out.println("Performing a warmup run first");
-            runWithArgs(type, rows, cols, saveFile, System.currentTimeMillis());
+            runWithArgs(type, rows, cols, saveFile);
        }

-        System.out.println("Performing test-run");
        long timeStarted = System.currentTimeMillis();
-        runWithArgs(type, rows, cols, saveFile, timeStarted);
+        runWithArgs(type, rows, cols, saveFile);
        long timeFinished = System.currentTimeMillis();

        System.out.printf(Locale.ROOT, "Elapsed %.2f seconds for arguments %s%n", ((double)timeFinished - timeStarted) / 1000, Arrays.toString(args));
    }

-    private static void runWithArgs(String type, int rows, int cols, boolean saveFile, long timeStarted) throws IOException {
+    private static void runWithArgs(String type, int rows, int cols, boolean saveFile) throws IOException {
        try (Workbook workBook = createWorkbook(type)) {
            boolean isHType = workBook instanceof HSSFWorkbook;
            addContent(workBook, isHType, rows, cols);

-            long timeFinished = System.currentTimeMillis();
-            System.out.printf(Locale.ROOT, "Elapsed %.2f seconds before save%n", ((double)timeFinished - timeStarted) / 1000);
-
            if (saveFile) {
                String fileName = type + "_" + rows + "_" + cols + "." + getFileSuffix(type);
                saveFile(workBook, fileName);
--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
@ -28,8 +28,8 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;

+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.poi.logging.PoiLogManager;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataFormatter;
@ -134,7 +134,7 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
 */
@SuppressWarnings({"java:S106","java:S4823","java:S1192"})
 public class ToCSV {
-    private static final Logger LOG = PoiLogManager.getLogger(ToCSV.class);
+    private static final Logger LOG = LogManager.getLogger(ToCSV.class);

    private Workbook workbook;
    private ArrayList<ArrayList<String>> csvData;
@ -327,7 +327,7 @@ public class ToCSV {
        }

        // Step through each of the files in the source folder and for each
-        // open the workbook, convert its contents to CSV format and then
+        // open the workbook, convert it's contents to CSV format and then
        // save the resulting file away into the folder specified by the
        // contents of the destination variable. Note that the name of the
        // csv file will be created by taking the name of the Excel file,
@ -342,7 +342,7 @@ public class ToCSV {
                // Open the workbook
                this.openWorkbook(excelFile);

-                // Convert its contents into a CSV file
+                // Convert it's contents into a CSV file
                this.convertToCSV();

                // Build the name of the csv folder from that of the Excel workbook.
@ -451,7 +451,7 @@ public class ToCSV {
                // from this 'row' ArrayList one at a time and to write the Strings
                // away to a StringBuilder thus assembling a single line for inclusion
                // in the CSV file. If a row was empty or if it was short, then
-                // the ArrayList that contains its data will also be shorter than
+                // the ArrayList that contains it's data will also be shorter than
                // some of the others. Therefore, it is necessary to check within
                // the for loop to ensure that the ArrayList contains data to be
                // processed. If it does, then an element will be recovered and
@ -689,7 +689,7 @@ public class ToCSV {
        // It is not wise to have such a wide catch clause - Exception is very
        // close to being at the top of the inheritance hierarchy - though it
        // will suffice for this example as it is really not possible to recover
-        // easily  from an exceptional set of circumstances at this point in the
+        // easilly from an exceptional set of circumstances at this point in the
        // program. It should however, ideally be replaced with one or more
        // catch clauses optimised to handle more specific problems.
        catch(Exception ex) {
--- a/poi-examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/ToHtml.java
@ -320,7 +320,7 @@ public final class ToHtml {

    private String styleName(CellStyle style) {
        if (style == null) {
-            style = wb.getCellStyleAt(0);
+            style = wb.getCellStyleAt((short) 0);
        }
        StringBuilder sb = new StringBuilder();
        try (Formatter fmt = new Formatter(sb, Locale.ROOT)) {
--- a/poi-examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
@ -19,11 +19,9 @@

 package org.apache.poi.examples.util;

-import org.apache.poi.util.DefaultTempFileCreationStrategy;
-import org.apache.poi.util.TempFile;
-
 import java.io.File;
-import java.nio.file.Path;
+
+import org.apache.poi.util.TempFile;

 public final class TempFileUtils {
    private TempFileUtils() {
@ -31,7 +29,8 @@ public final class TempFileUtils {

    @SuppressWarnings("java:S106")
    public static void checkTempFiles() {
-        File tempDir = Path.of(System.getProperty(TempFile.JAVA_IO_TMPDIR), DefaultTempFileCreationStrategy.POIFILES).toFile();
+        String tmpDir = System.getProperty(TempFile.JAVA_IO_TMPDIR) + "/poifiles";
+        File tempDir = new File(tmpDir);
        if(tempDir.exists()) {
            String[] tempFiles = tempDir.list();
            if(tempFiles != null && tempFiles.length > 0) {
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/AddVideoToPptx.java.txt
@ -1,251 +1,251 @@
-/*
- *  ====================================================================
- *    Licensed to the Apache Software Foundation (ASF) under one or more
- *    contributor license agreements.  See the NOTICE file distributed with
- *    this work for additional information regarding copyright ownership.
- *    The ASF licenses this file to You under the Apache License, Version 2.0
- *    (the "License"); you may not use this file except in compliance with
- *    the License.  You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- * ==================================================================== 
- */
-
-package org.apache.poi.xslf.usermodel;
-
-import java.awt.Rectangle;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.text.DecimalFormat;
-
-import javax.imageio.ImageIO;
-import javax.xml.namespace.QName;
-
-import org.apache.poi.openxml4j.opc.PackagePart;
-import org.apache.poi.openxml4j.opc.PackagePartName;
-import org.apache.poi.openxml4j.opc.PackageRelationship;
-import org.apache.poi.openxml4j.opc.PackagingURIHelper;
-import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.sl.usermodel.PictureData.PictureType;
-import org.apache.xmlbeans.XmlCursor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
-import org.openxmlformats.schemas.officeDocument.x2006.relationships.STRelationshipId;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTExtension;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTSlide;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonMediaNodeData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonTimeNodeData;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTTimeNodeList;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeIndefinite;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeFillType;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeRestartType;
-import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeType;
-
-import com.xuggle.mediatool.IMediaReader;
-import com.xuggle.mediatool.MediaListenerAdapter;
-import com.xuggle.mediatool.ToolFactory;
-import com.xuggle.mediatool.event.IVideoPictureEvent;
-import com.xuggle.xuggler.Global;
-import com.xuggle.xuggler.IContainer;
-import com.xuggle.xuggler.io.InputOutputStreamHandler;
-
-/**
- * Adding multiple videos to a slide
- * 
- * need the Xuggler 5.4 jars:
- *  &lt;repositories&gt;
- *  &lt;repository&gt;
- *  &lt;id&gt;xuggle repo&lt;/id&gt;
- *  &lt;url&gt;http://xuggle.googlecode.com/svn/trunk/repo/share/java/&lt;/url&gt;
- *  &lt;/repository&gt;
- *  &lt;/repositories&gt;
- *  ...
- *  &lt;dependency&gt;
- *  &lt;groupId&gt;xuggle&lt;/groupId&gt;
- *  &lt;artifactId&gt;xuggle-xuggler&lt;/artifactId&gt;
- *  &lt;version&gt;5.4&lt;/version&gt;
- *  &lt;/dependency&gt;
- * 
- * @see <a href="http://stackoverflow.com/questions/15197300/apache-poi-xslf-adding-movie-to-the-slide">Apache POI XSLF Adding movie to the slide</a>
- * @see <a href="http://apache-poi.1045710.n5.nabble.com/Question-about-embedded-video-in-PPTX-files-tt5718461.html">Question about embedded video in PPTX files</a>
- */
-public class AddVideoToPptx {
-    static DecimalFormat df_time = new DecimalFormat("0.####");
-
-    public static void main(String[] args) throws Exception {
-        URL video = new URL("http://archive.org/download/test-mpeg/test-mpeg.mpg");
-        // URL video = new URL("file:test-mpeg.mpg");
-
-        XMLSlideShow pptx = new XMLSlideShow();
-
-        // add video file
-        String videoFileName = video.getPath().substring(video.getPath().lastIndexOf('/')+1);
-        PackagePartName partName = PackagingURIHelper.createPartName("/ppt/media/"+videoFileName);
-        PackagePart part = pptx.getPackage().createPart(partName, "video/mpeg");
-        OutputStream partOs = part.getOutputStream();
-        InputStream fis = video.openStream();
-        byte buf[] = new byte[1024];
-        for (int readBytes; (readBytes = fis.read(buf)) != -1; partOs.write(buf, 0, readBytes));
-        fis.close();
-        partOs.close();
-
-        XSLFSlide slide1 = pptx.createSlide();
-        XSLFPictureShape pv1 = addPreview(pptx, slide1, part, 5, 50, 50);
-        addVideo(pptx, slide1, part, pv1, 5);
-        addTimingInfo(slide1, pv1);
-        XSLFPictureShape pv2 = addPreview(pptx, slide1, part, 9, 50, 250);
-        addVideo(pptx, slide1, part, pv2, 9);
-        addTimingInfo(slide1, pv2);
-
-        FileOutputStream fos = new FileOutputStream("pptx-with-video.pptx");
-        pptx.write(fos);
-        fos.close();
-        
-        pptx.close();
-    }
-
-    static XSLFPictureShape addPreview(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, double seconds, int x, int y) throws IOException {
-        // get preview after 5 sec.
-        IContainer ic = IContainer.make();
-        InputOutputStreamHandler iosh = new InputOutputStreamHandler(videoPart.getInputStream());
-        if (ic.open(iosh, IContainer.Type.READ, null) < 0) return null;
-
-        IMediaReader mediaReader = ToolFactory.makeReader(ic);
-
-        // stipulate that we want BufferedImages created in BGR 24bit color space
-        mediaReader.setBufferedImageTypeToGenerate(BufferedImage.TYPE_3BYTE_BGR);
-
-        ImageSnapListener isl = new ImageSnapListener(seconds);
-        mediaReader.addListener(isl);
-
-        // read out the contents of the media file and
-        // dispatch events to the attached listener
-        while (!isl.hasFired && mediaReader.readPacket() == null) ;
-
-        mediaReader.close();
-        ic.close();
-
-        // add snapshot
-        BufferedImage image1 = isl.image;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ImageIO.write(image1, "jpeg", bos);
-        XSLFPictureData snap = pptx.addPicture(bos.toByteArray(), PictureType.JPEG);
-        XSLFPictureShape pic1 = slide1.createPicture(snap);
-        pic1.setAnchor(new Rectangle(x, y, image1.getWidth(), image1.getHeight()));
-        return pic1;
-    }
-
-    static void addVideo(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, XSLFPictureShape pic1, double seconds) throws IOException {
-
-        // add video shape
-        PackagePartName partName = videoPart.getPartName();
-        PackageRelationship prsEmbed1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.microsoft.com/office/2007/relationships/media");
-        PackageRelationship prsExec1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video");
-        CTPicture xpic1 = (CTPicture)pic1.getXmlObject();
-        CTHyperlink link1 = xpic1.getNvPicPr().getCNvPr().addNewHlinkClick();
-        link1.setId("");
-        link1.setAction("ppaction://media");
-
-        // add video relation
-        CTApplicationNonVisualDrawingProps nvPr = xpic1.getNvPicPr().getNvPr();
-        nvPr.addNewVideoFile().setLink(prsExec1.getId());
-        CTExtension ext = nvPr.addNewExtLst().addNewExt();
-        // see http://msdn.microsoft.com/en-us/library/dd950140(v=office.12).aspx
-        ext.setUri("{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");
-        String p14Ns = "http://schemas.microsoft.com/office/powerpoint/2010/main";
-
-        try (XmlCursor cur = ext.newCursor()) {
-            cur.toEndToken();
-            cur.beginElement(new QName(p14Ns, "media", "p14"));
-            cur.insertNamespace("p14", p14Ns);
-            cur.insertAttributeWithValue(new QName(STRelationshipId.type.getName().getNamespaceURI(), "embed"), prsEmbed1.getId());
-            cur.beginElement(new QName(p14Ns, "trim", "p14"));
-            cur.insertAttributeWithValue("st", df_time.format(seconds*1000.0));
-        }
-    }
-
-    static void addTimingInfo(XSLFSlide slide1, XSLFPictureShape pic1) {
-        // add slide timing information, so video can be controlled
-        CTSlide xslide = slide1.getXmlObject();
-        CTTimeNodeList ctnl;
-        if (!xslide.isSetTiming()) {
-            CTTLCommonTimeNodeData ctn = xslide.addNewTiming().addNewTnLst().addNewPar().addNewCTn();
-            ctn.setDur(STTLTimeIndefinite.INDEFINITE);
-            ctn.setRestart(STTLTimeNodeRestartType.NEVER);
-            ctn.setNodeType(STTLTimeNodeType.TM_ROOT);
-            ctnl = ctn.addNewChildTnLst();
-        } else {
-            ctnl = xslide.getTiming().getTnLst().getParArray(0).getCTn().getChildTnLst();
-        }
-
-        CTTLCommonMediaNodeData cmedia = ctnl.addNewVideo().addNewCMediaNode();
-        cmedia.setVol(80000);
-        CTTLCommonTimeNodeData ctn = cmedia.addNewCTn();
-        ctn.setFill(STTLTimeNodeFillType.HOLD);
-        ctn.setDisplay(false);
-        ctn.addNewStCondLst().addNewCond().setDelay(STTLTimeIndefinite.INDEFINITE);
-        cmedia.addNewTgtEl().addNewSpTgt().setSpid(""+pic1.getShapeId());
-    }
-
-
-    static class ImageSnapListener extends MediaListenerAdapter {
-        final double SECONDS_BETWEEN_FRAMES;
-        final long MICRO_SECONDS_BETWEEN_FRAMES;
-        boolean hasFired = false;
-        BufferedImage image = null;
-
-        // The video stream index, used to ensure we display frames from one and
-        // only one video stream from the media container.
-        int mVideoStreamIndex = -1;
-
-        // Time of last frame write
-        long mLastPtsWrite = Global.NO_PTS;
-
-        public ImageSnapListener(double seconds) {
-            SECONDS_BETWEEN_FRAMES = seconds;
-            MICRO_SECONDS_BETWEEN_FRAMES =
-                    (long)(Global.DEFAULT_PTS_PER_SECOND * SECONDS_BETWEEN_FRAMES);
-        }
-
-
-        @Override
-        public void onVideoPicture(IVideoPictureEvent event) {
-
-            if (event.getStreamIndex() != mVideoStreamIndex) {
-                // if the selected video stream id is not yet set, go ahead an
-                // select this lucky video stream
-                if (mVideoStreamIndex != -1) return;
-                mVideoStreamIndex = event.getStreamIndex();
-            }
-
-            long evtTS = event.getTimeStamp();
-
-            // if uninitialized, back date mLastPtsWrite to get the very first frame
-            if (mLastPtsWrite == Global.NO_PTS)
-                mLastPtsWrite = Math.max(0, evtTS - MICRO_SECONDS_BETWEEN_FRAMES);
-
-            // if its time to write the next frame
-            if (evtTS - mLastPtsWrite >= MICRO_SECONDS_BETWEEN_FRAMES) {
-                if (!hasFired) {
-                    image = event.getImage();
-                    hasFired = true;
-                }
-                // update last write time
-                mLastPtsWrite += MICRO_SECONDS_BETWEEN_FRAMES;
-            }
-        }
-    }
-
-}
+/*
+ *  ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one or more
+ *    contributor license agreements.  See the NOTICE file distributed with
+ *    this work for additional information regarding copyright ownership.
+ *    The ASF licenses this file to You under the Apache License, Version 2.0
+ *    (the "License"); you may not use this file except in compliance with
+ *    the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ * ==================================================================== 
+ */
+
+package org.apache.poi.xslf.usermodel;
+
+import java.awt.Rectangle;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.text.DecimalFormat;
+
+import javax.imageio.ImageIO;
+import javax.xml.namespace.QName;
+
+import org.apache.poi.openxml4j.opc.PackagePart;
+import org.apache.poi.openxml4j.opc.PackagePartName;
+import org.apache.poi.openxml4j.opc.PackageRelationship;
+import org.apache.poi.openxml4j.opc.PackagingURIHelper;
+import org.apache.poi.openxml4j.opc.TargetMode;
+import org.apache.poi.sl.usermodel.PictureData.PictureType;
+import org.apache.xmlbeans.XmlCursor;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink;
+import org.openxmlformats.schemas.officeDocument.x2006.relationships.STRelationshipId;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTExtension;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTSlide;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonMediaNodeData;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTTLCommonTimeNodeData;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTTimeNodeList;
+import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeIndefinite;
+import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeFillType;
+import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeRestartType;
+import org.openxmlformats.schemas.presentationml.x2006.main.STTLTimeNodeType;
+
+import com.xuggle.mediatool.IMediaReader;
+import com.xuggle.mediatool.MediaListenerAdapter;
+import com.xuggle.mediatool.ToolFactory;
+import com.xuggle.mediatool.event.IVideoPictureEvent;
+import com.xuggle.xuggler.Global;
+import com.xuggle.xuggler.IContainer;
+import com.xuggle.xuggler.io.InputOutputStreamHandler;
+
+/**
+ * Adding multiple videos to a slide
+ * 
+ * need the Xuggler 5.4 jars:
+ *  &lt;repositories&gt;
+ *  &lt;repository&gt;
+ *  &lt;id&gt;xuggle repo&lt;/id&gt;
+ *  &lt;url&gt;http://xuggle.googlecode.com/svn/trunk/repo/share/java/&lt;/url&gt;
+ *  &lt;/repository&gt;
+ *  &lt;/repositories&gt;
+ *  ...
+ *  &lt;dependency&gt;
+ *  &lt;groupId&gt;xuggle&lt;/groupId&gt;
+ *  &lt;artifactId&gt;xuggle-xuggler&lt;/artifactId&gt;
+ *  &lt;version&gt;5.4&lt;/version&gt;
+ *  &lt;/dependency&gt;
+ * 
+ * @see <a href="http://stackoverflow.com/questions/15197300/apache-poi-xslf-adding-movie-to-the-slide">Apache POI XSLF Adding movie to the slide</a>
+ * @see <a href="http://apache-poi.1045710.n5.nabble.com/Question-about-embedded-video-in-PPTX-files-tt5718461.html">Question about embedded video in PPTX files</a>
+ */
+public class AddVideoToPptx {
+    static DecimalFormat df_time = new DecimalFormat("0.####");
+
+    public static void main(String[] args) throws Exception {
+        URL video = new URL("http://archive.org/download/test-mpeg/test-mpeg.mpg");
+        // URL video = new URL("file:test-mpeg.mpg");
+
+        XMLSlideShow pptx = new XMLSlideShow();
+
+        // add video file
+        String videoFileName = video.getPath().substring(video.getPath().lastIndexOf('/')+1);
+        PackagePartName partName = PackagingURIHelper.createPartName("/ppt/media/"+videoFileName);
+        PackagePart part = pptx.getPackage().createPart(partName, "video/mpeg");
+        OutputStream partOs = part.getOutputStream();
+        InputStream fis = video.openStream();
+        byte buf[] = new byte[1024];
+        for (int readBytes; (readBytes = fis.read(buf)) != -1; partOs.write(buf, 0, readBytes));
+        fis.close();
+        partOs.close();
+
+        XSLFSlide slide1 = pptx.createSlide();
+        XSLFPictureShape pv1 = addPreview(pptx, slide1, part, 5, 50, 50);
+        addVideo(pptx, slide1, part, pv1, 5);
+        addTimingInfo(slide1, pv1);
+        XSLFPictureShape pv2 = addPreview(pptx, slide1, part, 9, 50, 250);
+        addVideo(pptx, slide1, part, pv2, 9);
+        addTimingInfo(slide1, pv2);
+
+        FileOutputStream fos = new FileOutputStream("pptx-with-video.pptx");
+        pptx.write(fos);
+        fos.close();
+        
+        pptx.close();
+    }
+
+    static XSLFPictureShape addPreview(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, double seconds, int x, int y) throws IOException {
+        // get preview after 5 sec.
+        IContainer ic = IContainer.make();
+        InputOutputStreamHandler iosh = new InputOutputStreamHandler(videoPart.getInputStream());
+        if (ic.open(iosh, IContainer.Type.READ, null) < 0) return null;
+
+        IMediaReader mediaReader = ToolFactory.makeReader(ic);
+
+        // stipulate that we want BufferedImages created in BGR 24bit color space
+        mediaReader.setBufferedImageTypeToGenerate(BufferedImage.TYPE_3BYTE_BGR);
+
+        ImageSnapListener isl = new ImageSnapListener(seconds);
+        mediaReader.addListener(isl);
+
+        // read out the contents of the media file and
+        // dispatch events to the attached listener
+        while (!isl.hasFired && mediaReader.readPacket() == null) ;
+
+        mediaReader.close();
+        ic.close();
+
+        // add snapshot
+        BufferedImage image1 = isl.image;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ImageIO.write(image1, "jpeg", bos);
+        XSLFPictureData snap = pptx.addPicture(bos.toByteArray(), PictureType.JPEG);
+        XSLFPictureShape pic1 = slide1.createPicture(snap);
+        pic1.setAnchor(new Rectangle(x, y, image1.getWidth(), image1.getHeight()));
+        return pic1;
+    }
+
+    static void addVideo(XMLSlideShow pptx, XSLFSlide slide1, PackagePart videoPart, XSLFPictureShape pic1, double seconds) throws IOException {
+
+        // add video shape
+        PackagePartName partName = videoPart.getPartName();
+        PackageRelationship prsEmbed1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.microsoft.com/office/2007/relationships/media");
+        PackageRelationship prsExec1 = slide1.getPackagePart().addRelationship(partName, TargetMode.INTERNAL, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video");
+        CTPicture xpic1 = (CTPicture)pic1.getXmlObject();
+        CTHyperlink link1 = xpic1.getNvPicPr().getCNvPr().addNewHlinkClick();
+        link1.setId("");
+        link1.setAction("ppaction://media");
+
+        // add video relation
+        CTApplicationNonVisualDrawingProps nvPr = xpic1.getNvPicPr().getNvPr();
+        nvPr.addNewVideoFile().setLink(prsExec1.getId());
+        CTExtension ext = nvPr.addNewExtLst().addNewExt();
+        // see http://msdn.microsoft.com/en-us/library/dd950140(v=office.12).aspx
+        ext.setUri("{DAA4B4D4-6D71-4841-9C94-3DE7FCFB9230}");
+        String p14Ns = "http://schemas.microsoft.com/office/powerpoint/2010/main";
+
+        try (XmlCursor cur = ext.newCursor()) {
+            cur.toEndToken();
+            cur.beginElement(new QName(p14Ns, "media", "p14"));
+            cur.insertNamespace("p14", p14Ns);
+            cur.insertAttributeWithValue(new QName(STRelationshipId.type.getName().getNamespaceURI(), "embed"), prsEmbed1.getId());
+            cur.beginElement(new QName(p14Ns, "trim", "p14"));
+            cur.insertAttributeWithValue("st", df_time.format(seconds*1000.0));
+        }
+    }
+
+    static void addTimingInfo(XSLFSlide slide1, XSLFPictureShape pic1) {
+        // add slide timing information, so video can be controlled
+        CTSlide xslide = slide1.getXmlObject();
+        CTTimeNodeList ctnl;
+        if (!xslide.isSetTiming()) {
+            CTTLCommonTimeNodeData ctn = xslide.addNewTiming().addNewTnLst().addNewPar().addNewCTn();
+            ctn.setDur(STTLTimeIndefinite.INDEFINITE);
+            ctn.setRestart(STTLTimeNodeRestartType.NEVER);
+            ctn.setNodeType(STTLTimeNodeType.TM_ROOT);
+            ctnl = ctn.addNewChildTnLst();
+        } else {
+            ctnl = xslide.getTiming().getTnLst().getParArray(0).getCTn().getChildTnLst();
+        }
+
+        CTTLCommonMediaNodeData cmedia = ctnl.addNewVideo().addNewCMediaNode();
+        cmedia.setVol(80000);
+        CTTLCommonTimeNodeData ctn = cmedia.addNewCTn();
+        ctn.setFill(STTLTimeNodeFillType.HOLD);
+        ctn.setDisplay(false);
+        ctn.addNewStCondLst().addNewCond().setDelay(STTLTimeIndefinite.INDEFINITE);
+        cmedia.addNewTgtEl().addNewSpTgt().setSpid(""+pic1.getShapeId());
+    }
+
+
+    static class ImageSnapListener extends MediaListenerAdapter {
+        final double SECONDS_BETWEEN_FRAMES;
+        final long MICRO_SECONDS_BETWEEN_FRAMES;
+        boolean hasFired = false;
+        BufferedImage image = null;
+
+        // The video stream index, used to ensure we display frames from one and
+        // only one video stream from the media container.
+        int mVideoStreamIndex = -1;
+
+        // Time of last frame write
+        long mLastPtsWrite = Global.NO_PTS;
+
+        public ImageSnapListener(double seconds) {
+            SECONDS_BETWEEN_FRAMES = seconds;
+            MICRO_SECONDS_BETWEEN_FRAMES =
+                    (long)(Global.DEFAULT_PTS_PER_SECOND * SECONDS_BETWEEN_FRAMES);
+        }
+
+
+        @Override
+        public void onVideoPicture(IVideoPictureEvent event) {
+
+            if (event.getStreamIndex() != mVideoStreamIndex) {
+                // if the selected video stream id is not yet set, go ahead an
+                // select this lucky video stream
+                if (mVideoStreamIndex != -1) return;
+                mVideoStreamIndex = event.getStreamIndex();
+            }
+
+            long evtTS = event.getTimeStamp();
+
+            // if uninitialized, back date mLastPtsWrite to get the very first frame
+            if (mLastPtsWrite == Global.NO_PTS)
+                mLastPtsWrite = Math.max(0, evtTS - MICRO_SECONDS_BETWEEN_FRAMES);
+
+            // if it's time to write the next frame
+            if (evtTS - mLastPtsWrite >= MICRO_SECONDS_BETWEEN_FRAMES) {
+                if (!hasFired) {
+                    image = event.getImage();
+                    hasFired = true;
+                }
+                // update last write time
+                mLastPtsWrite += MICRO_SECONDS_BETWEEN_FRAMES;
+            }
+        }
+    }
+
+}
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
@ -25,7 +25,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -64,7 +64,7 @@ public final class BarChartDemo {
        }

        try (FileInputStream argIS = new FileInputStream(args[0]);
-            BufferedReader modelReader = Files.newBufferedReader(Path.of(args[1]), StandardCharsets.UTF_8)) {
+            BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[1]), StandardCharsets.UTF_8)) {

            String chartTitle = modelReader.readLine();  // first line is chart title
            String seriesText = modelReader.readLine();
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
@ -26,7 +26,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -72,7 +72,7 @@ public final class ChartFromScratch {
            return;
        }

-        try (BufferedReader modelReader = Files.newBufferedReader(Path.of(args[0]), StandardCharsets.UTF_8)) {
+        try (BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[0]), StandardCharsets.UTF_8)) {

            String chartTitle = modelReader.readLine();  // first line is chart title
            String seriesText = modelReader.readLine();
@ -180,10 +180,6 @@ public final class ChartFromScratch {
        chart.setTitleText(chartTitle);
        chart.setTitleOverlay(false);
        chart.setAutoTitleDeleted(false);
-
-        // temporary workaround for https://bz.apache.org/bugzilla/show_bug.cgi?id=67510
-        if (bottomAxis.hasNumberFormat()) bottomAxis.setNumberFormat("@");
-        if (leftAxis.hasNumberFormat()) leftAxis.setNumberFormat("#,##0.00");
    }

    private static final int COLUMN_LANGUAGES = 0;
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
@ -41,7 +41,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -64,7 +64,7 @@ public final class DoughnutChartFromScratch {
            return;
        }

-        try (BufferedReader modelReader = Files.newBufferedReader(Path.of(args[0]), StandardCharsets.UTF_8)) {
+        try (BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[0]), StandardCharsets.UTF_8)) {

            String chartTitle = modelReader.readLine();  // first line is chart title
            String seriesText = modelReader.readLine();
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
@ -25,7 +25,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -61,7 +61,7 @@ public final class PieChartDemo {
        }

        try (FileInputStream argIS = new FileInputStream(args[0]);
-             BufferedReader modelReader = Files.newBufferedReader(Path.of(args[1]), StandardCharsets.UTF_8)) {
+             BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[1]), StandardCharsets.UTF_8)) {
            String chartTitle = modelReader.readLine();  // first line is chart title

            try (XMLSlideShow pptx = new XMLSlideShow(argIS)) {
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-data.txt
@ -1,12 +1,12 @@
-10 languages with most speakers as first language
-countries,speakers,language
-58,315,العربية
-4,243,বাংলা
-38,1299,中文
-118,378,English
-4,260,हिन्दी
-2,128,日本語
-15,223,português
-6,119,ਪੰਜਾਬੀ
-18,154,Русский язык
-31,442,español
+10 languages with most speakers as first language
+countries,speakers,language
+58,315,العربية
+4,243,বাংলা
+38,1299,中文
+118,378,English
+4,260,हिन्दी
+2,128,日本語
+15,223,português
+6,119,ਪੰਜਾਬੀ
+18,154,Русский язык
+31,442,español
--- a/poi-examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-data.txt
@ -1,4 +1,4 @@
-My Chart
-First 1.0
-Second 3.0
+My Chart
+First 1.0
+Second 3.0
 Third 4.0
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/FromHowTo.java
@ -136,7 +136,7 @@ public class FromHowTo {
            if(nextIsString && StringUtil.isNotBlank(lastContents)) {
                Integer idx = Integer.valueOf(lastContents);
                lastContents = lruCache.get(idx);
-                if (lastContents == null && !lruCache.containsKey(idx) && sst != null) {
+                if (lastContents == null && !lruCache.containsKey(idx)) {
                    lastContents = sst.getItemAt(idx).getString();
                    lruCache.put(idx, lastContents);
                }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/LoadPasswordProtectedXlsxStreaming.java
@ -20,12 +20,12 @@
 package org.apache.poi.examples.xssf.eventusermodel;

 import java.io.InputStream;
-import java.util.Iterator;

 import org.apache.poi.examples.xssf.usermodel.LoadPasswordProtectedXlsx;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.poifs.crypt.temp.AesZipFileZipEntrySource;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
+import org.apache.poi.xssf.eventusermodel.XSSFReader.SheetIterator;

 /**
 * An example that loads a password protected workbook and counts the sheets.
@ -48,12 +48,11 @@ public final class LoadPasswordProtectedXlsxStreaming {
        try (AesZipFileZipEntrySource source = AesZipFileZipEntrySource.createZipEntrySource(inputStream);
             OPCPackage pkg = OPCPackage.open(source)) {
            XSSFReader reader = new XSSFReader(pkg);
-            Iterator<InputStream> iter = reader.getSheetsData();
+            SheetIterator iter = (SheetIterator)reader.getSheetsData();
            int count = 0;
            while(iter.hasNext()) {
-                try (InputStream stream = iter.next()) {
-                    count++;
-                }
+                iter.next();
+                count++;
            }
            System.out.println("sheet count: " + count);
        }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/eventusermodel/XLSX2CSV.java
@ -212,7 +212,7 @@ public class XLSX2CSV {
                  styles, null, strings, sheetHandler, formatter, false);
            sheetParser.setContentHandler(handler);
            sheetParser.parse(sheetSource);
-         } catch (ParserConfigurationException e) {
+         } catch(ParserConfigurationException e) {
            throw new RuntimeException("SAX parser appears to be broken - " + e.getMessage());
         }
    }
@ -234,12 +234,7 @@ public class XLSX2CSV {
                String sheetName = iter.getSheetName();
                this.output.println();
                this.output.println(sheetName + " [index=" + index + "]:");
-
-                try {
-                    processSheet(styles, strings, new SheetToCSV(), stream);
-                } catch (NumberFormatException e) {
-                    throw new IOException("Failed to parse sheet " + sheetName, e);
-                }
+                processSheet(styles, strings, new SheetToCSV(), stream);
            }
            ++index;
        }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/DeferredGeneration.java
@ -53,13 +53,12 @@ public class DeferredGeneration {

            try (FileOutputStream fileOut = new FileOutputStream("DeferredGeneration.xlsx")) {
                wb.write(fileOut);
-                // writeAvoidingTempFiles was added as an experimental change in POI 5.1.0
-                // wb.writeAvoidingTempFiles(fileOut);
+                //writeAvoidingTempFiles was added as an experimental change in POI 5.1.0
+                //wb.writeAvoidingTempFiles(fileOut);
+            } finally {
+                //the dispose call is necessary to ensure temp files are removed
+                wb.dispose();
            }
-            // finally {
-              // the dispose call is no longer necessary to ensure temp files are removed
-              // wb.dispose();
-            // }
            System.out.println("wrote DeferredGeneration.xlsx");
        }
    }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/Outlining.java
@ -46,11 +46,10 @@ public class Outlining {

            try (FileOutputStream fileOut = new FileOutputStream("outlining_collapsed.xlsx")) {
                wb2.write(fileOut);
+            } finally {
+                //the dispose call is necessary to ensure temp files are removed
+                wb2.dispose();
            }
-            // finally {
-              // the dispose call is no longer necessary to ensure temp files are removed
-              // wb2.dispose();
-            // }
        }
    }
 }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/SavePasswordProtectedXlsx.java
@ -58,7 +58,8 @@ public final class SavePasswordProtectedXlsx {
        TempFileUtils.checkTempFiles();
        String filename = args[0];
        String password = args[1];
-        try (SXSSFWorkbookWithCustomZipEntrySource wb = new SXSSFWorkbookWithCustomZipEntrySource()) {
+        SXSSFWorkbookWithCustomZipEntrySource wb = new SXSSFWorkbookWithCustomZipEntrySource();
+        try {
            for(int i = 0; i < 10; i++) {
                SXSSFSheet sheet = wb.createSheet("Sheet" + i);
                for(int r = 0; r < 1000; r++) {
@ -77,6 +78,10 @@ public final class SavePasswordProtectedXlsx {
            } finally {
                tempData.dispose();
            }
+        } finally {
+            wb.close();
+            //the dispose call is necessary to ensure temp files are removed
+            wb.dispose();
        }
        TempFileUtils.checkTempFiles();
    }
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarChart.java
@ -104,10 +104,6 @@ public final class BarChart {
            solidFillSeries(data, 0, PresetColor.CHARTREUSE);
            solidFillSeries(data, 1, PresetColor.TURQUOISE);

-            // temporary workaround for https://bz.apache.org/bugzilla/show_bug.cgi?id=67510
-            if (bottomAxis.hasNumberFormat()) bottomAxis.setNumberFormat("@");
-            if (leftAxis.hasNumberFormat()) leftAxis.setNumberFormat("#,##0.00");
-
            // Write the output to a file
            try (FileOutputStream fileOut = new FileOutputStream("ooxml-bar-chart.xlsx")) {
                wb.write(fileOut);
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BigGridDemo.java
@ -35,8 +35,8 @@ import java.util.Random;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.poi.logging.PoiLogManager;
 import org.apache.poi.openxml4j.opc.internal.ZipHelper;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.ss.usermodel.FillPatternType;
@ -77,7 +77,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 * See <a href="https://poi.apache.org/spreadsheet/how-to.html#sxssf">SXSSF (Streaming Usermodel API)</a>.
 */
 public final class BigGridDemo {
-    private static final Logger LOG = PoiLogManager.getLogger(BigGridDemo.class);
+    private static final Logger LOG = LogManager.getLogger(BigGridDemo.class);

    private static final Random rnd = new Random();

--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CustomXMLMapping.java
@ -38,7 +38,7 @@ public final class CustomXMLMapping {
            for (XSSFMap map : wb.getCustomXMLMappings()) {
                XSSFExportToXml exporter = new XSSFExportToXml(map);

-                UnsynchronizedByteArrayOutputStream os = UnsynchronizedByteArrayOutputStream.builder().get();
+                UnsynchronizedByteArrayOutputStream os = new UnsynchronizedByteArrayOutputStream();
                exporter.exportToXML(os, true);
                String xml = os.toString(StandardCharsets.UTF_8);
                System.out.println(xml);
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LineChart.java
@ -105,10 +105,6 @@ public final class LineChart {
            solidLineSeries(data, 0, PresetColor.CHARTREUSE);
            solidLineSeries(data, 1, PresetColor.TURQUOISE);

-            // temporary workaround for https://bz.apache.org/bugzilla/show_bug.cgi?id=67510
-            if (bottomAxis.hasNumberFormat()) bottomAxis.setNumberFormat("@");
-            if (leftAxis.hasNumberFormat()) leftAxis.setNumberFormat("#,##0.00");
-
            // Write the output to a file
            try (FileOutputStream fileOut = new FileOutputStream("ooxml-line-chart.xlsx")) {
                wb.write(fileOut);
--- a/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ScatterChart.java
@ -99,10 +99,6 @@ public final class ScatterChart {
            solidLineSeries(data, 0, PresetColor.CHARTREUSE);
            solidLineSeries(data, 1, PresetColor.TURQUOISE);

-            // temporary workaround for https://bz.apache.org/bugzilla/show_bug.cgi?id=67510
-            if (bottomAxis.hasNumberFormat()) bottomAxis.setNumberFormat("@");
-            if (leftAxis.hasNumberFormat()) leftAxis.setNumberFormat("#,##0.00");
-
            // Write the output to a file
            try (FileOutputStream fileOut = new FileOutputStream("ooxml-scatter-chart.xlsx")) {
                wb.write(fileOut);
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BarChartExample.java
@ -26,7 +26,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -63,7 +63,7 @@ public final class BarChartExample {
        }

        try (FileInputStream argIS = new FileInputStream(args[0]);
-            BufferedReader modelReader = Files.newBufferedReader(Path.of(args[1]), StandardCharsets.UTF_8)) {
+            BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[1]), StandardCharsets.UTF_8)) {

            String chartTitle = modelReader.readLine();  // first line is chart title
            String seriesText = modelReader.readLine();
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/ChartFromScratch.java
@ -24,7 +24,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;

@ -67,7 +67,7 @@ public final class ChartFromScratch {
            return;
        }

-        try (BufferedReader modelReader = Files.newBufferedReader(Path.of(args[0]), StandardCharsets.UTF_8)) {
+        try (BufferedReader modelReader = Files.newBufferedReader(Paths.get(args[0]), StandardCharsets.UTF_8)) {

            String chartTitle = modelReader.readLine();  // first line is chart title
            String seriesText = modelReader.readLine();
@ -146,10 +146,6 @@ public final class ChartFromScratch {
        chart.setTitleText(chartTitle);
        chart.setTitleOverlay(false);
        chart.setAutoTitleDeleted(false);
-
-        // temporary workaround for https://bz.apache.org/bugzilla/show_bug.cgi?id=67510
-        if (bottomAxis.hasNumberFormat()) bottomAxis.setNumberFormat("@");
-        if (leftAxis.hasNumberFormat()) leftAxis.setNumberFormat("#,##0.00");
    }

    private static final int COLUMN_LANGUAGES = 0;
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleImages.java
@ -22,10 +22,10 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;

-import org.apache.poi.common.usermodel.PictureType;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.BreakType;
+import org.apache.poi.xwpf.usermodel.Document;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
 import org.apache.poi.xwpf.usermodel.XWPFRun;
@ -45,30 +45,30 @@ public final class SimpleImages {
            XWPFRun r = p.createRun();

            for (String imgFile : args) {
-                PictureType format;
+                int format;

                if (imgFile.endsWith(".emf")) {
-                    format = PictureType.EMF;
+                    format = Document.PICTURE_TYPE_EMF;
                } else if (imgFile.endsWith(".wmf")) {
-                    format = PictureType.WMF;
+                    format = Document.PICTURE_TYPE_WMF;
                } else if (imgFile.endsWith(".pict")) {
-                    format = PictureType.PICT;
+                    format = Document.PICTURE_TYPE_PICT;
                } else if (imgFile.endsWith(".jpeg") || imgFile.endsWith(".jpg")) {
-                    format = PictureType.JPEG;
+                    format = Document.PICTURE_TYPE_JPEG;
                } else if (imgFile.endsWith(".png")) {
-                    format = PictureType.PNG;
+                    format = Document.PICTURE_TYPE_PNG;
                } else if (imgFile.endsWith(".dib")) {
-                    format = PictureType.DIB;
+                    format = Document.PICTURE_TYPE_DIB;
                } else if (imgFile.endsWith(".gif")) {
-                    format = PictureType.GIF;
+                    format = Document.PICTURE_TYPE_GIF;
                } else if (imgFile.endsWith(".tiff")) {
-                    format = PictureType.TIFF;
+                    format = Document.PICTURE_TYPE_TIFF;
                } else if (imgFile.endsWith(".eps")) {
-                    format = PictureType.EPS;
+                    format = Document.PICTURE_TYPE_EPS;
                } else if (imgFile.endsWith(".bmp")) {
-                    format = PictureType.BMP;
+                    format = Document.PICTURE_TYPE_BMP;
                } else if (imgFile.endsWith(".wpg")) {
-                    format = PictureType.WPG;
+                    format = Document.PICTURE_TYPE_WPG;
                } else {
                    System.err.println("Unsupported picture: " + imgFile +
                            ". Expected emf|wmf|pict|jpeg|png|dib|gif|tiff|eps|bmp|wpg");
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/UpdateEmbeddedDoc.java
@ -44,7 +44,7 @@ import org.apache.poi.xwpf.usermodel.XWPFDocument;
 * SpreadsheetML workbook embedded into the document.<p>
 *
 * This code was successfully tested with the following file from the POI test collection:
- * test-data/document/EmbeddedDocument.docx
+ * http://svn.apache.org/repos/asf/poi/trunk/test-data/document/EmbeddedDocument.docx
 */
@SuppressWarnings({"java:S106","java:S4823","java:S1192"})
 public class UpdateEmbeddedDoc {
--- a/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-data.txt
@ -1,12 +1,12 @@
-10 languages with most speakers as first language
-countries,speakers,language
-58,315,العربية
-4,243,বাংলা
-38,1299,中文
-118,378,English
-4,260,हिन्दी
-2,128,日本語
-15,223,português
-6,119,ਪੰਜਾਬੀ
-18,154,Русский язык
-31,442,español
+10 languages with most speakers as first language
+countries,speakers,language
+58,315,العربية
+4,243,বাংলা
+38,1299,中文
+118,378,English
+4,260,हिन्दी
+2,128,日本語
+15,223,português
+6,119,ਪੰਜਾਬੀ
+18,154,Русский язык
+31,442,español
--- a/poi-examples/src/main/java9/module-info.class
+++ b/poi-examples/src/main/java9/module-info.class
--- a/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java
+++ b/poi-examples/src/test/java/org/apache/poi/examples/hssf/eventusermodel/TestXLS2CSVmra.java
@ -1,115 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-
-package org.apache.poi.examples.hssf.eventusermodel;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.NumberRecord;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.junit.jupiter.api.Test;
-
-class TestXLS2CSVmra {
-    @Test
-    void test() throws Exception {
-        XLS2CSVmra.main(new String[] { HSSFTestDataSamples.getSampleFile("SampleSS.xls").getAbsolutePath() });
-    }
-
-    @Test
-    void testWithMinCols() throws Exception {
-        XLS2CSVmra.main(new String[] { HSSFTestDataSamples.getSampleFile("SampleSS.xls").getAbsolutePath(), "100" });
-    }
-
-    @Test
-    void testProcess() throws IOException {
-        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-        PrintStream out = new PrintStream(outStream, false, StandardCharsets.UTF_8.name());
-        XLS2CSVmra cvs = new XLS2CSVmra(
-                new POIFSFileSystem(new FileInputStream(HSSFTestDataSamples.getSampleFile("SampleSS.xls").getAbsolutePath())),
-                out, -1);
-
-        cvs.process();
-
-        outStream.flush();
-
-        assertEquals(sanitize("\n"
-                + "First Sheet [1]:\n"
-                + "\"Test spreadsheet\"\n"
-                + "\"2nd row\",\"2nd row 2nd column\"\n"
-                + "\n"
-                + "\"This one is red\"\n"
-                + "\n"
-                + "Sheet Number 2 [2]:\n"
-                + "\"Start of 2nd sheet\"\n"
-                + "\"Sheet 2 row 2\"\n"
-                + "\n"
-                + "\"I'm in bold blue, on a yellow background\"\n"
-                + "\n"
-                + "\"cb=1\",\"cb=10\",\"cb=2\",\"cb=sum\"\n"
-                + "1,10,2,13\n"
-                + "\n"
-                + "Sheet3 [3]:\n"), sanitize(new String(outStream.toByteArray(), StandardCharsets.UTF_8)));
-    }
-
-    @Test
-    void testProcessNumberRecord() throws IOException {
-        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-        PrintStream out = new PrintStream(outStream, false, StandardCharsets.UTF_8.name());
-        XLS2CSVmra cvs = new XLS2CSVmra(
-                new POIFSFileSystem(new FileInputStream(HSSFTestDataSamples.getSampleFile("empty.xls").getAbsolutePath())),
-                out, -1);
-
-        // need to call process() first to initialize members
-        cvs.process();
-
-        outStream.flush();
-
-        assertEquals(sanitize("\n"
-                + "Лист1 [1]:\n"
-                + "\n"
-                + "Лист2 [2]:\n"
-                + "\n"
-                + "Лист3 [3]:\n"), sanitize(new String(outStream.toByteArray(), StandardCharsets.UTF_8)));
-
-
-        NumberRecord record = new NumberRecord();
-        record.setValue(1.243);
-
-        cvs.processRecord(record);
-
-        outStream.flush();
-
-        assertEquals(sanitize("\n"
-                + "Лист1 [1]:\n"
-                + "\n"
-                + "Лист2 [2]:\n"
-                + "\n"
-                + "Лист3 [3]:\n"
-                + "1.243"), sanitize(new String(outStream.toByteArray(), StandardCharsets.UTF_8)));
-    }
-
-    private String sanitize(String str) {
-        return str.replace("\r\n", "\n");
-    }
-}
--- a/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
+++ b/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
@ -18,31 +18,24 @@
 package org.apache.poi.integration;

 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;

-import java.io.IOException;
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;

 import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
 import org.apache.poi.examples.xssf.eventusermodel.XLSX2CSV;
-import org.apache.poi.ooxml.POIXMLException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackageAccess;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

-import net.bytebuddy.utility.RandomString;
-
 public class TestXLSX2CSV {
    private PrintStream err;
-    private final UnsynchronizedByteArrayOutputStream errorBytes = UnsynchronizedByteArrayOutputStream.builder().get();
+    private final UnsynchronizedByteArrayOutputStream errorBytes = new UnsynchronizedByteArrayOutputStream();

    @BeforeEach
    public void setUp() throws UnsupportedEncodingException {
@ -84,7 +77,7 @@ public class TestXLSX2CSV {

    @Test
    public void testSampleFile() throws Exception {
-        final UnsynchronizedByteArrayOutputStream outputBytes = UnsynchronizedByteArrayOutputStream.builder().get();
+        final UnsynchronizedByteArrayOutputStream outputBytes = new UnsynchronizedByteArrayOutputStream();
        PrintStream out = new PrintStream(outputBytes, true, StandardCharsets.UTF_8.name());

        // The package open is instantaneous, as it should be.
@ -101,28 +94,9 @@ public class TestXLSX2CSV {
        assertTrue(output.contains(",\"hello, xssf\",,\"hello, xssf\""), "Had: " + output);
    }

-    @Test
-    public void testInvalidSampleFile() throws Exception {
-        final UnsynchronizedByteArrayOutputStream outputBytes = UnsynchronizedByteArrayOutputStream.builder().get();
-        PrintStream out = new PrintStream(outputBytes, true, StandardCharsets.UTF_8.name());
-
-        // The package open is instantaneous, as it should be.
-        try (OPCPackage p = OPCPackage.open(XSSFTestDataSamples.getSampleFile("clusterfuzz-testcase-minimized-XLSX2CSVFuzzer-5025401116950528.xlsx").getAbsolutePath(), PackageAccess.READ)) {
-            XLSX2CSV xlsx2csv = new XLSX2CSV(p, out, -1);
-            assertThrows(POIXMLException.class,
-                    xlsx2csv::process);
-        }
-
-        String errorOutput = errorBytes.toString(StandardCharsets.UTF_8);
-        assertEquals("", errorOutput);
-
-        String output = outputBytes.toString(StandardCharsets.UTF_8);
-        assertEquals("", output, "Had: " + output);
-    }
-
    @Test
    public void testMinColumns() throws Exception {
-        final UnsynchronizedByteArrayOutputStream outputBytes = UnsynchronizedByteArrayOutputStream.builder().get();
+        final UnsynchronizedByteArrayOutputStream outputBytes = new UnsynchronizedByteArrayOutputStream();
        PrintStream out = new PrintStream(outputBytes, true, StandardCharsets.UTF_8.name());

        // The package open is instantaneous, as it should be.
@ -135,87 +109,7 @@ public class TestXLSX2CSV {
        assertEquals("", errorOutput);

        String output = outputBytes.toString(StandardCharsets.UTF_8);
-		assertTrue(output.contains("\"Lorem\",111,,,"), "Had: " + output);
-		assertTrue(output.contains(",\"hello, xssf\",,\"hello, xssf\","), "Had: " + output);
-    }
-
-	@Disabled("Used for local micro-benchmarking")
-	@Test
-	public void microBenchmark() {
-		checkReplace("str");
-		checkReplace("str.123");
-		checkReplace("str.123,");
-		checkReplace("str,,,.123,,,,");
-		for (int i = 0; i < 1000;i++) {
-			checkReplace(RandomString.make(20));
-		}
-
-		for (int i = 0;i < 10;i++) {
-			long start = System.currentTimeMillis();
-			String str = RandomString.make(100) + "\"\"" + RandomString.make(100) + "\"\"" + RandomString.make(100);
-			String expected = str.replace("\"", "\"\"");
-			for (int j = 0;j < 300000;j++) {
-				//assertEquals(expected, replaceString(str, "\"", "\"\""));
-				assertEquals(expected, replaceDirect(str, "\"", "\"\""));
-			}
-
-			System.out.println(" , " + (System.currentTimeMillis() - start));
-		}
-
-		// Java 8: replaceString: 1001, 921, 1264, 1019, 1258, 990, 1089, 1430, 1153, 907
-		// Java 8: replaceDirect: 375, 282, 240, 246, 264, 271, 258, 250, 263, 259
-		// Java 11: replaceString: 510, 218, 202, 205, 202, 198, 202, 198, 208, 201
-		// Java 11: replaceDirect: 384, 228, 204, 201, 201, 200, 206, 196, 200, 200
-		//
-		// => On Java 8, a custom implementation would make sense, however on Java 9
-		// 		String.replace() was optimized so that it does not make any difference
-		// 		anymore!
-	}
-
-	private void checkReplace(String orig) {
-		assertEquals(replaceString(orig, ",", "."), replaceDirect(orig, ",", "."),
-				"Did have a difference with " + orig);
-	}
-
-	public static String replaceString(String originalStr, String oldStr, String newStr) {
-		return originalStr.replace(oldStr, newStr);
-	}
-
-	public static String replaceDirect(String originalStr, String oldStr, String newStr) {
-		int p = originalStr.indexOf(oldStr);
-		if (p == -1) {
-			return originalStr;
-		} else {
-			StringBuilder result = new StringBuilder();
-			result.append(originalStr, 0, p);
-			result.append(newStr);
-			int q = p + oldStr.length();
-			while ((p = originalStr.indexOf(oldStr, q)) != -1) {
-				result.append(originalStr, q, p);
-				result.append(newStr);
-				q = p + oldStr.length();
-			}
-			result.append(originalStr, q, originalStr.length());
-			return result.toString();
-		}
-	}
-
-    @Test
-    public void testDeepFile() {
-        // returns with some System.err
-        try {
-            assertThrows(IOException.class,
-                    () -> XLSX2CSV.main(new String[] { XSSFTestDataSamples.getSampleFile("deep-data.xlsx").getAbsolutePath() }));
-        } catch (Throwable e) {
-            // restore output-streams again to get proper error output
-            System.setErr(err);
-
-            throw e;
-        }
-
-        String output = errorBytes.toString(StandardCharsets.UTF_8);
-        assertFalse(output.contains("Not found"), "Had: " + output);
-
-        System.out.println(output);
+        assertTrue(output.contains("\"Lorem\",111,,,"), "Had: " + output);
+        assertTrue(output.contains(",\"hello, xssf\",,\"hello, xssf\","), "Had: " + output);
    }
 }
--- a/poi-excelant/build.gradle
+++ b/poi-excelant/build.gradle
@ -23,15 +23,19 @@ configurations {

 sourceSets {
    main {
-        output.dir(JAVA9_OUT, builtBy: 'compileJava9')
+        if (jdkVersion > 8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
    }
    test {
-        output.dir(TEST9_OUT, builtBy: 'compileTest9')
+        if (jdkVersion > 8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
    }
 }

 dependencies {
-    api 'org.apache.ant:ant:1.10.15'
+    api 'org.apache.ant:ant:1.10.12'

    api project(':poi-ooxml')
    compileOnly project(path: ':poi-ooxml', configuration: 'archives')
@ -41,10 +45,14 @@ dependencies {
    testImplementation(project(path: ':poi-ooxml', configuration: 'tests')) {
        exclude group: 'org.apache.poi', module: 'poi-scratchpad'
    }
-    testImplementation 'com.google.guava:guava:33.5.0-jre'
-    testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.17'
+    testImplementation 'com.google.guava:guava:31.1-jre'
+    testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}"
+    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
    testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
+
+    if (SAXON_TEST) {
+        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
+    }
 }

 final String MODULE_NAME = 'org.apache.poi.excelant'
@ -57,45 +65,71 @@ final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-oo
 final String OOXML_LITE_REPORT = '../src/resources/ooxml-lite-report'
 final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"

-tasks.register('compileJava9', JavaCompile) {
+task compileJava9(type: JavaCompile) {
    dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
+        languageVersion = JavaLanguageVersion.of(jdkVersion >= 17 ? 17 : 11)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
    }
-    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
+        '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
+        '--module-path', files(MAIN_MODULE_PATH).asPath
    ]
+
+    onlyIf {
+        jdkVersion > 8
+    }
 }

-tasks.register('compileTest9', JavaCompile) {
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+task compileTest9(type: JavaCompile) {
    dependsOn 'compileTestJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'

    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
    }
-    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
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(TEST_MODULE_PATH).asPath
    ]
    classpath = files()
+
+    onlyIf {
+        jdkVersion > 8
+    }
 }


-jar {
-    dependsOn compileJava9
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'

-    destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}")
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+jar {
+    dependsOn cacheJava9
+
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (jdkVersion == 8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }

    manifest {
        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -118,12 +152,18 @@ sourcesJar {

 // Create a separate jar for test-code to depend on it in other projects
 // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
-    destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}-tests")
+task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")

-    setArchiveClassifier 'tests'
+    classifier 'tests'
    // ignore second module-info.class from main
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    duplicatesStrategy = 'exclude'
+
+    if (jdkVersion == 8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }

    from sourceSets.test.output + sourceSets.main.output

@ -142,9 +182,13 @@ test {
    doFirst {
        jvmArgs += [
            "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
-            '--add-modules', MODULE_NAME,
-            '--module-path', '../build/dist/maven/poi-excelant-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
        ]
+        if (jdkVersion > 8) {
+            jvmArgs += [
+                '--add-modules', MODULE_NAME,
+                '--module-path', '../build/dist/maven/poi-excelant-tests' + File.pathSeparator + files(TEST_MODULE_PATH).asPath,
+            ]
+        }
    }
 }

@ -158,22 +202,3 @@ publishing {
        }
    }
 }
-
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when generating the BOM (leave empty to include every configuration)
-    includeConfigs = ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating the BOM
-    //skipConfigs = ["compileClasspath", "testCompileClasspath"]
-    // Specified the type of project being built. Defaults to 'library'
-    projectType = "library"
-    // Specified the version of the CycloneDX specification to use. Defaults to 1.4.
-    schemaVersion = "1.4"
-    // Boms destination directory (defaults to build/reports)
-    destination = file("build/reports")
-    // The file name for the generated BOMs (before the file format suffix). Defaults to 'bom'
-    outputName = "poi-excelant-${project.version}.bom"
-    // The file format generated, can be xml, json or all for generating both
-    outputFormat = "all"
-    // Exclude BOM Serial Number
-    includeBomSerialNumber = true
-}
--- a/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
@ -37,7 +37,7 @@ import org.apache.tools.ant.Task;
 * <p>
 * In order to use this tag you must write a class that implements the
 * {@code IExcelAntWorkbookHandler} interface.  After writing the
- * class you should package it and its dependencies into a jar file to
+ * class you should package it and it's dependencies into a jar file to
 * add as library in your Ant build file.
 */
 public class ExcelAntHandlerTask extends Task {
--- a/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilFactory.java
@ -27,7 +27,7 @@ import java.util.Map;
 */
 public final class ExcelAntWorkbookUtilFactory {

-    private static final Map<String, ExcelAntWorkbookUtil> workbookUtilMap = new HashMap<>();
+    private static Map<String, ExcelAntWorkbookUtil> workbookUtilMap;

    private ExcelAntWorkbookUtilFactory() {
    }
@ -41,14 +41,16 @@ public final class ExcelAntWorkbookUtilFactory {
     *          a freshly instantiated one if none did exist before.
     */
    public static ExcelAntWorkbookUtil getInstance(String fileName) {
-        synchronized (workbookUtilMap) {
-            if(workbookUtilMap.containsKey(fileName)) {
-                return workbookUtilMap.get(fileName);
-            }
-
-            ExcelAntWorkbookUtil wbu = new ExcelAntWorkbookUtil(fileName);
-            workbookUtilMap.put(fileName, wbu);
-            return wbu;
+        if(workbookUtilMap == null) {
+            workbookUtilMap = new HashMap<>();
        }
+
+        if(workbookUtilMap.containsKey(fileName)) {
+            return workbookUtilMap.get(fileName);
+        }
+
+        ExcelAntWorkbookUtil wbu = new ExcelAntWorkbookUtil(fileName);
+        workbookUtilMap.put(fileName, wbu);
+        return wbu;
    }
 }
--- a/poi-excelant/src/main/java9/module-info.class
+++ b/poi-excelant/src/main/java9/module-info.class
--- a/poi-excelant/src/main/java9/module-info.java
+++ b/poi-excelant/src/main/java9/module-info.java
@ -18,7 +18,6 @@
 module org.apache.poi.excelant {

    requires ant;
-    requires transitive org.apache.poi.poi;
    requires org.apache.poi.ooxml;

    exports org.apache.poi.ss.excelant;
--- a/poi-excelant/src/poi-ant-contrib/java/Junit5Progress.java
+++ b/poi-excelant/src/poi-ant-contrib/java/Junit5Progress.java
@ -28,7 +28,7 @@ import org.junit.platform.launcher.TestIdentifier;
 /**
 * Custom listener class for Ants junitlauncher, because it chomps the important running details
 *
- * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=64836">Bug 64836 - junitlauncher poor summary</a>
+ * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=64836">Bug 64836 - junitlaucher poor summary</a>
 **/
 public class Junit5Progress implements TestExecutionListener {
    private final AtomicInteger numSkippedInTestSet = new AtomicInteger();
@ -76,17 +76,17 @@ public class Junit5Progress implements TestExecutionListener {
            String summary = String.format("Tests run: %d, Failures: %d, Aborted: %d, Skipped: %d, Time elapsed: %f sec", totalTestsInClass,
                this.numFailedInTestSet.get(), this.numAbortedInTestSet.get(), this.numSkippedInTestSet.get(), numSeconds);
            println(summary);
-        } else {
+        } else if (testIdentifier.isTest()) {
            switch (testExecutionResult.getStatus()) {
                case SUCCESSFUL:
                    this.numSucceededInTestSet.incrementAndGet();
                    break;
                case ABORTED:
-                    println("   Aborted: " + testIdentifier.getDisplayName() + ": " + testExecutionResult.getThrowable().orElse(null));
+                    println("   Aborted: " + testIdentifier.getDisplayName());
                    this.numAbortedInTestSet.incrementAndGet();
                    break;
                case FAILED:
-                    println("   Failed: " + testIdentifier.getDisplayName() + ": " + testExecutionResult.getThrowable().orElse(null));
+                    println("   Failed: " + testIdentifier.getDisplayName());
                    this.numFailedInTestSet.incrementAndGet();
                    break;
            }
--- a/poi-excelant/src/test/java9/module-info.class
+++ b/poi-excelant/src/test/java9/module-info.class
--- a/poi-integration/build.gradle
+++ b/poi-integration/build.gradle
@ -1,3 +1,5 @@
+import java.util.regex.Pattern
+
 /* ====================================================================
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@ -15,10 +17,8 @@
   limitations under the License.
 ==================================================================== */

-import java.util.regex.Pattern
-
 final String TEST9_SRC = 'src/test/java9'
-final String TEST9_OUT = layout.buildDirectory.dir('classes/java9/test/').get().asFile.absolutePath
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
 final String VERSIONS9 = 'META-INF/versions/9'
 final boolean IBMVM = System.getProperty("java.vendor").contains("IBM")

@ -29,7 +29,9 @@ configurations {

 sourceSets {
    test {
-        output.dir(TEST9_OUT, builtBy: 'compileTest9')
+        if (jdkVersion > 8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
        if (IBMVM) {
            java {
                exclude '**/HeapDump**'
@ -39,9 +41,9 @@ sourceSets {
 }

 dependencies {
-    testImplementation 'org.apache.ant:ant:1.10.15'
-    testImplementation 'org.apache.commons:commons-collections4:4.5.0'
-    testImplementation 'com.google.guava:guava:33.5.0-jre'
+    testImplementation 'org.apache.ant:ant:1.10.12'
+    testImplementation 'org.apache.commons:commons-collections4:4.4'
+    testImplementation 'com.google.guava:guava:31.1-jre'

    misc(project(':poi-ooxml')) {
        capabilities {
@ -75,9 +77,13 @@ dependencies {
        }
    }
    testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
-    testImplementation "org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion}"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.17'
+    testImplementation "org.apache.logging.log4j:log4j-slf4j18-impl:${log4jVersion}"
+    testImplementation 'org.slf4j:slf4j-simple:1.7.36'
    testRuntimeOnly "org.apiguardian:apiguardian-api:${apiGuardianVersion}"
+
+    if (SAXON_TEST) {
+        testRuntimeOnly "net.sf.saxon:Saxon-HE:${saxonVersion}"
+    }
 }

 final String MODULE_NAME = 'org.apache.poi.stress'
@ -90,26 +96,43 @@ final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-oo
 final String OOXML_LITE_REPORT = '../src/resources/ooxml-lite-report'
 final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"

-tasks.register('compileTest9', JavaCompile) {
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+        if (jdkVendor != '') vendor.set(JvmVendorSpec.matching(jdkVendor))
+    }
+}
+
+task compileTest9(type: JavaCompile) {
    dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar'

    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(Math.max(11, jdkVersion))
+        languageVersion = JavaLanguageVersion.of(jdkVersion)
+        if (jdkVendor != '') vendor = JvmVendorSpec.matching(jdkVendor)
    }
-    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(MODULE_COMPILE_PATH).asPath
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(MODULE_COMPILE_PATH).asPath
    ]
    classpath = files()
+
+    onlyIf {
+        jdkVersion > 8
+    }
 }


+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
 jar {
-    destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}")
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")

    manifest {
        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
@ -118,12 +141,18 @@ jar {

 // Create a separate jar for test-code to depend on it in other projects
 // See http://stackoverflow.com/questions/5144325/gradle-test-dependency
-task testJar(type: Jar, dependsOn: [ testClasses, compileTest9 ] ) {
-    destinationDirectory = file("../build/dist/maven/${base.archivesName.get()}-tests")
+task testJar(type: Jar, dependsOn: [ testClasses, cacheTest9 ] ) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")

-    setArchiveClassifier 'tests'
+    classifier 'tests'
    // ignore second module-info.class from main
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    duplicatesStrategy = 'exclude'
+
+    if (jdkVersion == 8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }

    from sourceSets.test.output + sourceSets.main.output

@ -147,22 +176,24 @@ test {
    doFirst {
        jvmArgs += [
            "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
-            '--add-modules', MODULE_NAME,
-            '--module-path', '../build/dist/maven/poi-integration-tests' + File.pathSeparator + files(MODULE_RUNTIME_PATH).asPath,
        ]
+        if (jdkVersion > 8) {
+            jvmArgs += [
+                '--add-modules', MODULE_NAME,
+                '--module-path', '../build/dist/maven/poi-integration-tests' + File.pathSeparator + files(MODULE_RUNTIME_PATH).asPath,
+            ]
+        }
        if (NO_SCRATCHPAD) {
            systemProperty 'scratchpad.ignore', 'true'
        }
    }
 }

-javadoc {
-    enabled = false
-}
+javadoc.onlyIf { false }

-sourcesJar {
-    enabled = false
-}
+javadocJar.onlyIf { false }
+
+sourcesJar.onlyIf { false }

 generateMetadataFileForPOIPublication.enabled = false
 publishPOIPublicationToMavenLocal.enabled = false
--- a/poi-integration/build.xml
+++ b/poi-integration/build.xml
@ -27,14 +27,11 @@ Before running this, you should execute the "jar" target in the main build.gradl
    <property name="dist" value="../build/dist"/>
    <property name="build" value="../build/distsourcebuild"/>

-    <!-- Gradle is executed in ../build/poi-<version>, so three ".." are needed to use gradle from the root-dir -->
-    <condition property="gradle.executable" value="../../../gradlew.bat" else="../../../gradlew">
+    <condition property="gradle.executable" value="../gradlew.bat" else="../gradlew">
        <os family="windows" />
    </condition>

    <target name="init" depends="">
-        <echo message="Using Ant: ${ant.version} from ${ant.home}, Ant detected Java ${ant.java.version} (may be different than actual Java sometimes...)" />
-        <echo message="Using Java: ${java.version}/${java.runtime.version}/${java.vm.version}/${java.vm.name} from ${java.vm.vendor} on ${os.name}: ${os.version}" />
    </target>

    <target name="run" depends="init,runSourceBuild,runCompileTest"/>
@ -51,14 +48,14 @@ Before running this, you should execute the "jar" target in the main build.gradl
                    <date xmlns="antlib:org.apache.tools.ant.types.resources.comparators"/>
                    <resources>
                        <fileset dir="${dist}">
-                            <include name="apache-poi-src-*.zip"/>
+                            <include name="poi-src-*.zip"/>
                        </fileset>
                    </resources>
                </sort>
            </last>
        </pathconvert>

-        <echo message="Found source package with pattern 'apache-poi-src-*.zip' in ${dist} at '${srcpackage}'. Run Gradle-task 'srcDistZip' in the main directory if it is missing"/>
+        <echo message="Found source package at ${srcpackage}"/>
        <unzip src="${srcpackage}" dest="${build}" failOnEmptyArchive="true"/>

        <!-- look for name of sub-dir, do this dynamically as it changes with every (beta|rc)-release -->
@ -77,7 +74,7 @@ Before running this, you should execute the "jar" target in the main build.gradl
        <!-- finally call Ant on the extracted source to check if we can build the packages -->
        <echo message="Building in temporary dir ${dirversion}/"/>
        <!--ant dir="${dirversion}" target="assemble" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/-->
-        <exec executable="${gradle.executable}" dir="${dirversion}" failonerror="true">
+        <exec executable="${gradle.executable}" dir="." failonerror="true">
            <arg value="assemble" />
        </exec>
    </target>
@ -94,9 +91,9 @@ Before running this, you should execute the "jar" target in the main build.gradl
            <sort>
                <resources>
                    <fileset dir="${dist}">
-                        <include name="**/poi-6.*.jar"/>
-                        <include name="**/poi-ooxml-6.*.jar"/>
-                        <include name="**/poi-ooxml-lite-6.*.jar"/>
+                        <include name="**/poi-5.*.jar"/>
+                        <include name="**/poi-ooxml-5.*.jar"/>
+                        <include name="**/poi-ooxml-lite-5.*.jar"/>
                        <exclude name="**/*-javadoc*"/>
                        <exclude name="**/*-sources*"/>
                    </fileset>
@ -126,7 +123,7 @@ Before running this, you should execute the "jar" target in the main build.gradl

        <echo message="Compiling examples without linking to scratchpad.jar to ensure that only some specific ones require this jar"/>
        <javac srcdir="../poi-examples/src/main/java" destdir="${build}"
-               target="11" source="11" debug="true"
+               target="1.8" source="1.8" debug="true"
               encoding="ASCII" fork="yes" includeantruntime="false"
               excludes="org/apache/poi/examples/hslf/**,org/apache/poi/examples/hsmf/**,org/apache/poi/examples/hwmf/**,**/EmbeddedObjects.java,**/EmeddedObjects.java,**/LoadEmbedded.java,**/Word2Forrest.java"
               classpath="${jarpackage}" classpathref="libs">
@ -137,10 +134,10 @@ Before running this, you should execute the "jar" target in the main build.gradl
            <sort>
                <resources>
                    <fileset dir="${dist}">
-                        <include name="**/poi-6.*.jar"/>
-                        <include name="**/poi-ooxml-6.*.jar"/>
-                        <include name="**/poi-ooxml-lite-6.*.jar"/>
-                        <include name="**/poi-scratchpad-6.*.jar"/>
+                        <include name="**/poi-5.*.jar"/>
+                        <include name="**/poi-ooxml-5.*.jar"/>
+                        <include name="**/poi-ooxml-lite-5.*.jar"/>
+                        <include name="**/poi-scratchpad-5.*.jar"/>
                        <exclude name="**/*-javadoc*"/>
                        <exclude name="**/*-sources*"/>
                    </fileset>
@ -150,7 +147,7 @@ Before running this, you should execute the "jar" target in the main build.gradl

        <echo message="Compiling all examples with the additional scratchpad.jar"/>
        <javac srcdir="../poi-examples/src/main/java" destdir="${build}"
-               target="11" source="11" debug="true"
+               target="1.8" source="1.8" debug="true"
               encoding="ASCII" fork="yes" includeantruntime="false"
               classpath="${jarpackagescratchpad}" classpathref="libs">
        </javac>
--- a/poi-integration/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
@ -37,6 +37,7 @@ import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor;
 import org.apache.poi.hssf.extractor.EventBasedExcelExtractor;
 import org.apache.poi.ooxml.POIXMLException;
 import org.apache.poi.ss.extractor.ExcelExtractor;
+import org.apache.poi.util.IOUtils;

 /**
 * Base class with things that can be run for any supported file handler
@ -87,78 +88,54 @@ public abstract class AbstractFileHandler implements FileHandler {
        long length = file.length();
        long modified = file.lastModified();

+        POITextExtractor extractor = null;
        String fileAndParentName = file.getParentFile().getName() + "/" + file.getName();
        try {
-            handleExtractingAsStream(file);
-
            // fix windows absolute paths for exception message tracking
            String relPath = file.getPath().replaceAll(".*test-data", "test-data").replace('\\', '/');
-            try (POITextExtractor extractor = ExtractorFactory.createExtractor(file)) {
-                assertNotNull(extractor, "Should get a POITextExtractor but had none for file " + relPath);
+            extractor = ExtractorFactory.createExtractor(file);
+            assertNotNull(extractor, "Should get a POITextExtractor but had none for file " + relPath);

-                assertNotNull(extractor.getText(), "Should get some text but had none for file " + relPath);
+            assertNotNull(extractor.getText(), "Should get some text but had none for file " + relPath);

-                // also try metadata
-                POITextExtractor metadataExtractor = extractor.getMetadataTextExtractor();
-                assertNotNull(metadataExtractor.getText());
+            // also try metadata
+            @SuppressWarnings("resource")
+            POITextExtractor metadataExtractor = extractor.getMetadataTextExtractor();
+            assertNotNull(metadataExtractor.getText());

-                assertFalse(EXPECTED_EXTRACTOR_FAILURES.contains(fileAndParentName),
-                        "Expected Extraction to fail for file " + relPath + " and handler " + this + ", but did not fail!");
+            assertFalse(EXPECTED_EXTRACTOR_FAILURES.contains(fileAndParentName),
+                "Expected Extraction to fail for file " + relPath + " and handler " + this + ", but did not fail!");

-                assertEquals(length, file.length(), "File should not be modified by extractor");
-                assertEquals(modified, file.lastModified(), "File should not be modified by extractor");
+            assertEquals(length, file.length(), "File should not be modified by extractor");
+            assertEquals(modified, file.lastModified(), "File should not be modified by extractor");

-                if (extractor instanceof POIOLE2TextExtractor) {
-                    POIOLE2TextExtractor ole2Extractor = (POIOLE2TextExtractor) extractor;
-                    ole2Extractor.getRoot();
-                    if (!(ole2Extractor instanceof EventBasedExcelExtractor)) {
-                        ole2Extractor.getSummaryInformation();
-                        ole2Extractor.getDocSummaryInformation();
-                    }
+            handleExtractingAsStream(file);

-                    try (HPSFPropertiesExtractor hpsfExtractor = new HPSFPropertiesExtractor(ole2Extractor)) {
-                        assertNotNull(hpsfExtractor.getDocumentSummaryInformationText());
-                        assertNotNull(hpsfExtractor.getSummaryInformationText());
-                        String text = hpsfExtractor.getText();
-                        //System.out.println(text);
-                        assertNotNull(text);
-                    }
-
-                    if (ole2Extractor.getRoot() != null && !Boolean.getBoolean("scratchpad.ignore")) {
-                        POITextExtractor[] embedded = ExtractorFactory.getEmbeddedDocsTextExtractors(ole2Extractor);
-                        try {
-                            for (POITextExtractor poiTextExtractor : embedded) {
-                                poiTextExtractor.getText();
-                                poiTextExtractor.getDocument();
-                                poiTextExtractor.getFilesystem();
-                                POITextExtractor metaData = poiTextExtractor.getMetadataTextExtractor();
-                                metaData.getFilesystem();
-                                metaData.getText();
-                            }
-                        } finally {
-                            for (POITextExtractor embeddedExtractor : embedded) {
-                                embeddedExtractor.close();
-                            }
-                        }
-                    }
-                }
-
-                // test again with including formulas and cell-comments as this caused some bugs
-                if (extractor instanceof ExcelExtractor &&
-                        // comment-extraction and formula extraction are not well supported in event based extraction
-                        !(extractor instanceof EventBasedExcelExtractor)) {
-                    ((ExcelExtractor) extractor).setFormulasNotResults(true);
-
-                    String text = extractor.getText();
-                    assertNotNull(text);
-                    // */
-
-                    ((ExcelExtractor) extractor).setIncludeCellComments(true);
-
-                    text = extractor.getText();
+            if (extractor instanceof POIOLE2TextExtractor) {
+                try (HPSFPropertiesExtractor hpsfExtractor = new HPSFPropertiesExtractor((POIOLE2TextExtractor) extractor)) {
+                    assertNotNull(hpsfExtractor.getDocumentSummaryInformationText());
+                    assertNotNull(hpsfExtractor.getSummaryInformationText());
+                    String text = hpsfExtractor.getText();
+                    //System.out.println(text);
                    assertNotNull(text);
                }
            }
+
+            // test again with including formulas and cell-comments as this caused some bugs
+            if (extractor instanceof ExcelExtractor &&
+                // comment-extraction and formula extraction are not well supported in event based extraction
+                !(extractor instanceof EventBasedExcelExtractor)) {
+                ((ExcelExtractor) extractor).setFormulasNotResults(true);
+
+                String text = extractor.getText();
+                assertNotNull(text);
+                // */
+
+                ((ExcelExtractor) extractor).setIncludeCellComments(true);
+
+                text = extractor.getText();
+                assertNotNull(text);
+            }
        } catch (IOException | POIXMLException e) {
            Exception prevE = e;
            Throwable cause;
@ -182,6 +159,8 @@ public abstract class AbstractFileHandler implements FileHandler {
            if (!e.getMessage().contains("POI Scratchpad jar missing") || !Boolean.getBoolean("scratchpad.ignore")) {
                throw e;
            }
+        } finally {
+            IOUtils.closeQuietly(extractor);
        }
    }

@ -191,11 +170,6 @@ public abstract class AbstractFileHandler implements FileHandler {
                assertNotNull(streamExtractor);

                assertNotNull(streamExtractor.getText());
-
-                POITextExtractor metadataTextExtractor = streamExtractor.getMetadataTextExtractor();
-                assertNotNull(metadataTextExtractor);
-
-                assertNotNull(metadataTextExtractor.getText());
            }
        }
    }
--- a/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
@ -29,8 +29,6 @@ public enum FileHandlerKnown {
    HSLF,
    HSMF,
    HSSF,
-    HEMF,
-    HWMF,
    HWPF,
    OPC,
    POIFS,
--- a/poi-integration/src/test/java/org/apache/poi/stress/HEMFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HEMFFileHandler.java
@ -1,85 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-import org.apache.poi.hemf.record.emf.HemfRecord;
-import org.apache.poi.hemf.record.emf.HemfRecordType;
-import org.apache.poi.hemf.record.emf.HemfText;
-import org.apache.poi.hemf.usermodel.HemfPicture;
-import org.junit.jupiter.api.Test;
-
-public class HEMFFileHandler implements FileHandler {
-
-    @Override
-    public void handleExtracting(File file) throws Exception {
-        try (InputStream stream = new BufferedInputStream(new FileInputStream(file))) {
-            HemfPicture picture = new HemfPicture(stream);
-
-            // mimic a bit what e.g. Tika does to extract some information from .emf files
-            for (HemfRecord record : picture.getRecords()) {
-                if (record.getEmfRecordType().equals(HemfRecordType.extTextOutW)) {
-                    assertInstanceOf(HemfText.EmfExtTextOutW.class, record);
-                    HemfText.EmfExtTextOutW textOut = (HemfText.EmfExtTextOutW) record;
-                    textOut.getText(StandardCharsets.UTF_16LE);
-                } else if (record.getEmfRecordType().equals(HemfRecordType.extTextOutA)) {
-                    assertInstanceOf(HemfText.EmfExtTextOutA.class, record);
-                    HemfText.EmfExtTextOutA textOut = (HemfText.EmfExtTextOutA) record;
-                    textOut.getText(StandardCharsets.UTF_8);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void handleAdditional(File file) throws Exception {
-        // no additional checks for now
-    }
-
-    @Override
-    public void handleFile(InputStream stream, String path) throws Exception {
-        HemfPicture picture = new HemfPicture(stream);
-
-        for (HemfRecord record : picture.getRecords()) {
-            record.getEmfRecordType();
-            record.getGenericRecordType();
-        }
-
-        BufferedImage dest = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
-        picture.draw(dest.createGraphics(), new Rectangle2D.Double(0, 0, 256, 256));
-    }
-
-    @Test
-    void test() throws Exception {
-        String file = "test-data/slideshow/wrench.emf";
-
-        try (InputStream stream = new BufferedInputStream(new FileInputStream(file))) {
-            handleFile(stream, file);
-        }
-
-        handleExtracting(new File(file));
-    }
-}
--- a/poi-integration/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
@ -45,16 +45,22 @@ public class HPBFFileHandler extends POIFSFileHandler {
    void test() throws Exception {
        File file = new File("test-data/publisher/SampleBrochure.pub");

-        try (InputStream stream = new FileInputStream(file)) {
+        InputStream stream = new FileInputStream(file);
+        try {
            handleFile(stream, file.getPath());
+        } finally {
+            stream.close();
        }

        handleExtracting(file);

-        try (InputStream stream = new FileInputStream(file)) {
+        stream = new FileInputStream(file);
+        try {
            try (PublisherTextExtractor extractor = new PublisherTextExtractor(stream)) {
                assertNotNull(extractor.getText());
            }
+        } finally {
+            stream.close();
        }
    }

--- a/poi-integration/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
@ -43,6 +43,8 @@ import org.apache.poi.util.TempFile;
 import org.junit.jupiter.api.Test;

 public class HPSFFileHandler extends POIFSFileHandler {
+    private static final String NL = System.getProperty("line.separator");
+
    private static final ThreadLocal<File> copyOutput = ThreadLocal.withInitial(HPSFFileHandler::getTempFile);

    static final Set<String> EXCLUDES_HANDLE_ADD = StressTestUtils.unmodifiableHashSet(
@ -101,7 +103,7 @@ public class HPSFFileHandler extends POIFSFileHandler {

    private static boolean hasPropertyStream(POIFSFileSystem poifs, String streamName) throws IOException {
        DirectoryNode root = poifs.getRoot();
-        if (!root.hasEntryCaseInsensitive(streamName)) {
+        if (!root.hasEntry(streamName)) {
            return false;
        }
        try (DocumentInputStream dis = root.createDocumentInputStream(streamName)) {
@ -138,10 +140,12 @@ public class HPSFFileHandler extends POIFSFileHandler {
        try (InputStream stream = new FileInputStream(path)) {
            handleFile(stream, path);
        }
+    }

-        File file = new File(path);
+    // a test-case to test this locally without executing the full TestAllFiles
+    @Test
+    void testExtractor() {
+        File file = new File("test-data/hpsf/TestBug44375.xls");
        assertDoesNotThrow(() -> handleExtracting(file));
-
-        handleAdditional(file);
    }
 }
--- a/poi-integration/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
@ -23,15 +23,15 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;

+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.poi.logging.PoiLogManager;
 import org.apache.poi.hslf.usermodel.HSLFSlideShow;
 import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
 import org.junit.jupiter.api.Test;

 public class HSLFFileHandler extends SlideShowHandler {

-    private static final Logger LOGGER = PoiLogManager.getLogger(HSLFFileHandler.class);
+    private static final Logger LOGGER = LogManager.getLogger(HSLFFileHandler.class);

    @Override
    public void handleFile(InputStream stream, String path) throws Exception {
@ -84,8 +84,6 @@ public class HSLFFileHandler extends SlideShowHandler {
        }

        handleExtracting(file);
-
-        handleAdditional(file);
    }

    public static void main(String[] args) throws Exception {
--- a/poi-integration/src/test/java/org/apache/poi/stress/HWMFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HWMFFileHandler.java
@ -1,93 +0,0 @@
-/* ====================================================================
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-==================================================================== */
-package org.apache.poi.stress;
-
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-
-import java.awt.image.BufferedImage;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-
-import org.apache.poi.hwmf.record.HwmfFont;
-import org.apache.poi.hwmf.record.HwmfRecord;
-import org.apache.poi.hwmf.record.HwmfRecordType;
-import org.apache.poi.hwmf.record.HwmfText;
-import org.apache.poi.hwmf.usermodel.HwmfPicture;
-import org.apache.poi.util.LocaleUtil;
-import org.junit.jupiter.api.Test;
-
-public class HWMFFileHandler implements FileHandler {
-
-    @Override
-    public void handleExtracting(File file) throws Exception {
-        try (InputStream stream = new BufferedInputStream(new FileInputStream(file))) {
-            HwmfPicture picture = new HwmfPicture(stream);
-            Charset charset = LocaleUtil.CHARSET_1252;
-
-            // mimic a bit what e.g. Tika does to extract some information from .wmf files
-            for (HwmfRecord record : picture.getRecords()) {
-                if (record.getWmfRecordType().equals(HwmfRecordType.createFontIndirect)) {
-                    HwmfFont font = ((HwmfText.WmfCreateFontIndirect) record).getFont();
-                    charset = (font.getCharset() == null || font.getCharset().getCharset() == null) ?
-                                    LocaleUtil.CHARSET_1252 : font.getCharset().getCharset();
-                }
-
-                if (record.getWmfRecordType().equals(HwmfRecordType.extTextOut)) {
-                    assertInstanceOf(HwmfText.WmfExtTextOut.class, record);
-                    HwmfText.WmfExtTextOut textOut = (HwmfText.WmfExtTextOut) record;
-                    textOut.getText(charset);
-                } else if (record.getWmfRecordType().equals(HwmfRecordType.textOut)) {
-                    assertInstanceOf(HwmfText.WmfTextOut.class, record);
-                    HwmfText.WmfTextOut textOut = (HwmfText.WmfTextOut) record;
-                    textOut.getText(charset);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void handleAdditional(File file) throws Exception {
-        // no additional checks for now
-    }
-
-    @Override
-    public void handleFile(InputStream stream, String path) throws Exception {
-        HwmfPicture picture = new HwmfPicture(stream);
-
-        for (HwmfRecord record : picture.getRecords()) {
-            record.getWmfRecordType();
-            record.getGenericRecordType();
-        }
-
-        BufferedImage dest = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
-        picture.draw(dest.createGraphics());
-    }
-
-    @Test
-    void test() throws Exception {
-        String file = "test-data/slideshow/santa.wmf";
-
-        try (InputStream stream = new BufferedInputStream(new FileInputStream(file))) {
-            handleFile(stream, file);
-        }
-
-        handleExtracting(new File(file));
-    }
-}
--- a/poi-integration/src/test/java/org/apache/poi/stress/OPCFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/OPCFileHandler.java
@ -19,11 +19,10 @@ package org.apache.poi.stress;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

-import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.PushbackInputStream;
-import java.nio.file.Files;
 import java.util.Set;

 import org.apache.poi.openxml4j.opc.ContentTypes;
@ -62,13 +61,17 @@ public class OPCFileHandler extends AbstractFileHandler {
        }
    }

+    @Override
+    public void handleExtracting(File file) {
+        // text-extraction is not possible currently for these types of files
+    }
+
    // a test-case to test this locally without executing the full TestAllFiles
    @Test
    void test() throws Exception {
        File file = new File("test-data/diagram/test.vsdx");

-        try (InputStream stream = new BufferedInputStream(
-                new PushbackInputStream(Files.newInputStream(file.toPath()), 100000))) {
+        try (InputStream stream = new PushbackInputStream(new FileInputStream(file), 100000)) {
            handleFile(stream, file.getPath());
        }

--- a/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
@ -57,7 +57,7 @@ public class POIFSFileHandler extends AbstractFileHandler {
    }

    protected void handlePOIDocument(POIDocument doc) throws Exception {
-        try (UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get()) {
+        try (UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream()) {
            doc.write(out);

            try (InputStream in = out.toInputStream();
--- a/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
@ -40,7 +40,7 @@ public final class POIXMLDocumentHandler {
    protected static boolean isEncrypted(InputStream stream) throws IOException {
        if (FileMagic.valueOf(stream) == FileMagic.OLE2) {
            try (POIFSFileSystem poifs = new POIFSFileSystem(stream)) {
-                if (poifs.getRoot().hasEntryCaseInsensitive(Decryptor.DEFAULT_POIFS_ENTRY)) {
+                if (poifs.getRoot().hasEntry(Decryptor.DEFAULT_POIFS_ENTRY)) {
                    return true;
                }
            }
--- a/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
@ -29,7 +29,6 @@ import java.lang.ref.WeakReference;
 import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
 import org.apache.poi.sl.draw.Drawable;
 import org.apache.poi.sl.usermodel.GroupShape;
-import org.apache.poi.sl.usermodel.MasterSheet;
 import org.apache.poi.sl.usermodel.Notes;
 import org.apache.poi.sl.usermodel.PictureData;
 import org.apache.poi.sl.usermodel.Shape;
@ -50,7 +49,7 @@ public abstract class SlideShowHandler extends POIFSFileHandler {
        readPictures(ss);

        // write out the file
-        UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get();
+        UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream();
        ss.write(out);

        readContent(ss);
@ -77,11 +76,8 @@ public abstract class SlideShowHandler extends POIFSFileHandler {
                }
            }

-            MasterSheet<?, ?> masterSheet = s.getMasterSheet();
-            if (masterSheet != null) {
-                for (Shape<?,?> shape : masterSheet) {
-                    readShapes(shape);
-                }
+            for (Shape<?,?> shape : s.getMasterSheet()) {
+                readShapes(shape);
            }
        }
    }
--- a/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
@ -37,8 +37,6 @@ public abstract class SpreadsheetHandler extends AbstractFileHandler {
        // try to access some of the content
        readContent(wb);

-        extractEmbedded(wb);
-
        // write out the file
        writeToArray(wb);

@ -63,7 +61,7 @@ public abstract class SpreadsheetHandler extends AbstractFileHandler {
    }

    private UnsynchronizedByteArrayOutputStream writeToArray(Workbook wb) throws IOException {
-        UnsynchronizedByteArrayOutputStream stream = UnsynchronizedByteArrayOutputStream.builder().get();
+        UnsynchronizedByteArrayOutputStream stream = new UnsynchronizedByteArrayOutputStream();
        wb.write(stream);
        return stream;
    }
--- a/poi-integration/src/test/java/org/apache/poi/stress/StressMap.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/StressMap.java
@ -46,7 +46,7 @@ public class StressMap {
    private final Pattern SCRATCH_HANDLER = Pattern.compile("(HSLF|HWPF|HSMF|HMEF)");

    public void load(File mapFile) throws IOException {
-        try (Workbook wb = WorkbookFactory.create(mapFile, null, true)) {
+        try (Workbook wb = WorkbookFactory.create(mapFile)) {
            readExMap(wb.getSheet("Exceptions"));
            readHandlerMap(wb.getSheet("Handlers"));
        }
@ -119,7 +119,7 @@ public class StressMap {
            Row row = iter.next();

            if (SCRATCH_IGNORE && handlerIdx > -1) {
-                String handler = row.getCell(handlerIdx) == null ? "" : row.getCell(handlerIdx).getStringCellValue();
+                String handler = row.getCell(handlerIdx).getStringCellValue();
                if (SCRATCH_HANDLER.matcher(handler).find()) {
                    // ignore exception of ignored files
                    continue;
--- a/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
@ -36,7 +36,6 @@ import java.util.stream.Stream;
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
 import org.apache.tools.ant.DirectoryScanner;
-import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@ -50,12 +49,12 @@ import org.opentest4j.AssertionFailedError;
 *  to reveal problems which are introduced, but not covered (yet) by unit tests.
 *
 *  This test looks for any file under the test-data directory and tries to do some useful
- *  processing with it based on its type.
+ *  processing with it based on it's type.
 *
 *  The test is implemented as a junit {@link ParameterizedTest} test, which leads
 *  to one test-method call for each file (currently around 950 files are handled).
 *
- *  There is a mapping of extension to implementations of the interface
+ *  There is a a mapping of extension to implementations of the interface
 *  {@link FileHandler} which defines how the file is loaded and which actions are
 *  tried with the file.
 *
@ -96,19 +95,14 @@ public class TestAllFiles {
        "poifs/protected_sha512.xlsx",
        "poifs/60320-protected.xlsx",
        "poifs/protected_sha512.xlsx",
-
-        // stress docs
-        "document/deep-table-cell.docx",
-
-        // invalid files
-        "spreadsheet/bug69769.xlsx",
-
-        // NOTE: Expected failures should usually be added in file "stress.xls" instead
-        // of being listed here in order to also verify the expected exception details!
    };

    // cheap workaround of skipping the few problematic files
-    public static final String[] SCAN_EXCLUDES_NOSCRATCHPAD = concat(SCAN_EXCLUDES, new String[] {
+    public static final String[] SCAN_EXCLUDES_NOSCRATCHPAD = {
+        "**/.svn/**",
+        "lost+found",
+        "**/.git/**",
+        "**/ExternalEntityInText.docx", //the DocType (DTD) declaration causes this to fail
        "**/right-to-left.xlsx", //the threaded comments in this file cause XSSF clone to fail
        "document/word2.doc",
        "document/cpansearch.perl.org_src_tobyink_acme-rundoc-0.001_word-lib_hello_world.docm",
@ -124,39 +118,17 @@ public class TestAllFiles {
        "spreadsheet/testEXCEL_3.xls",
        "spreadsheet/testEXCEL_4.xls",
        "poifs/unknown_properties.msg",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-4701121678278656.pub",
-        "hsmf/clusterfuzz-testcase-minimized-POIHSMFFuzzer-4848576776503296.msg",
-        "hsmf/clusterfuzz-testcase-minimized-POIHSMFFuzzer-5336473854148608.msg",
-        "slideshow/clusterfuzz-testcase-minimized-POIHSLFFuzzer-6416153805979648.ppt",
-        "slideshow/clusterfuzz-testcase-minimized-POIHSLFFuzzer-6710128412590080.ppt",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-4701121678278656.pub",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-5285517825277952.xls",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-6322470200934400.xls",
-        "document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-5418937293340672.doc",
-        "document/clusterfuzz-testcase-minimized-POIHWPFFuzzer-5440721166139392.doc",
-        "diagram/clusterfuzz-testcase-minimized-POIHDGFFuzzer-5947849161179136.vsd",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-5436547081830400.xls",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-4819588401201152.xls",
-        "diagram/clusterfuzz-testcase-minimized-POIVisioFuzzer-4537225637134336.vsd",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-6537773940867072.xls",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-4977868385681408.xls",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-4651309315719168.xls",
-        "document/clusterfuzz-testcase-POIHWPFFuzzer-5696094627495936.doc",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-4657005060816896.xls",
-        "diagram/clusterfuzz-testcase-minimized-POIHDGFFuzzer-4913778037489664.vsd",
-        "diagram/clusterfuzz-testcase-minimized-POIHDGFFuzzer-6478389109981184.vsd",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-4918886059278336.pub",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-4918886059278336.pub",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-6325615354773504.pub",
-        "spreadsheet/clusterfuzz-testcase-minimized-POIHSSFFuzzer-4734163573080064.xls",
-        "spreadsheet/rde.imf.ru_sites_default_files_rde_documents_vodootvedenie_2020.xlsb.xls",
-        "publisher/clusterfuzz-testcase-minimized-POIHPBFFuzzer-6325615354773504.pub",
-});
+
+        // exclude files failing on windows nodes, because of limited JCE policies
+        "document/bug53475-password-is-pass.docx",
+        "poifs/60320-protected.xlsx",
+        "poifs/protected_sha512.xlsx",
+        "poifs/60320-protected.xlsx",
+        "poifs/protected_sha512.xlsx",
+    };

    private static final Set<String> EXPECTED_FAILURES = StressTestUtils.unmodifiableHashSet(
-            "document/truncated62886.docx",
-            // this document fails with IBM JDK because of a different exception being thrown
-            "spreadsheet/clusterfuzz-testcase-minimized-POIXSSFFuzzer-5089447305609216.xlsx"
+            "document/truncated62886.docx"
    );

    public static Stream<Arguments> allfiles(String testName) throws IOException {
@ -178,7 +150,6 @@ public class TestAllFiles {
                continue;
            }

-            boolean found = false;
            for (FileHandlerKnown handler : sm.getHandler(file)) {
                ExcInfo info1 = sm.getExcInfo(file, testName, handler);
                if (info1 == null || info1.isValid(testName, handler.name())) {
@ -189,13 +160,8 @@ public class TestAllFiles {
                        (info1 != null) ? info1.getExClazz() : null,
                        (info1 != null) ? info1.getExMessage() : null
                    ));
-                    found = true;
                }
            }
-
-            if (!found) {
-                System.out.println("Could not find a handler for " + file);
-            }
        }

        return result.stream();
@ -218,7 +184,7 @@ public class TestAllFiles {
            FileHandler fileHandler = handler.getHandler();
            assertNotNull(fileHandler, "Did not find a handler for file " + file);
            Executable exec = () -> fileHandler.handleExtracting(new File(ROOT_DIR, file));
-            verify(file, exec, exClass, exMessage, password, fileHandler);
+            verify(file, exec, exClass, exMessage, password);
        } finally {
            Thread.currentThread().setName(threadName);
        }
@ -234,19 +200,12 @@ public class TestAllFiles {
        String threadName = Thread.currentThread().getName();
        try {
            Thread.currentThread().setName("Handle - " + file + " - " + handler);
-
-            // Some of the tests hang in JDK 8 due to Graphics-Rendering issues in JDK itself,
-            // therefore we do not run some tests here
-            Assumptions.assumeFalse(isJava8() && (
-                    file.endsWith("23884_defense_FINAL_OOimport_edit.ppt")
-            ), "Some files hang in JDK graphics rendering on Java 8 due to a JDK bug");
-
            System.out.println("Running handleFiles on "+file);
            FileHandler fileHandler = handler.getHandler();
            assertNotNull(fileHandler, "Did not find a handler for file " + file);
            try (InputStream stream = new BufferedInputStream(new FileInputStream(new File(ROOT_DIR, file)), 64 * 1024)) {
                Executable exec = () -> fileHandler.handleFile(stream, file);
-                verify(file, exec, exClass, exMessage, password, fileHandler);
+                verify(file, exec, exClass, exMessage, password);
            }
        } finally {
            Thread.currentThread().setName(threadName);
@ -263,23 +222,19 @@ public class TestAllFiles {
        String threadName = Thread.currentThread().getName();
        try {
            Thread.currentThread().setName("Additional - " + file + " - " + handler);
-            if (StressTestUtils.excludeFile(file, EXPECTED_FAILURES))
-                return;
-
            System.out.println("Running additionals on "+file);
            FileHandler fileHandler = handler.getHandler();
            assertNotNull(fileHandler, "Did not find a handler for file " + file);
            Executable exec = () -> fileHandler.handleAdditional(new File(ROOT_DIR, file));
-            verify(file, exec, exClass, exMessage, password, fileHandler);
+            verify(file, exec, exClass, exMessage, password);
        } finally {
            Thread.currentThread().setName(threadName);
        }
    }

    @SuppressWarnings("unchecked")
-    private static void verify(String file, Executable exec, Class<? extends Throwable> exClass, String exMessage, String password,
-            FileHandler fileHandler) {
-        final String errPrefix = file.replace("\\", "/") + " - failed for handler " + fileHandler.getClass().getSimpleName() + ": ";
+    private static void verify(String file, Executable exec, Class<? extends Throwable> exClass, String exMessage, String password) {
+        final String errPrefix = file + " - failed. ";
        // this also removes the password for non encrypted files
        Biff8EncryptionKey.setCurrentUserPassword(password);
        if (exClass != null && AssertionFailedError.class.isAssignableFrom(exClass)) {
@ -295,47 +250,20 @@ public class TestAllFiles {
        } else if (exClass != null) {
            Exception e = assertThrows((Class<? extends Exception>)exClass, exec, errPrefix + " expected " + exClass);
            String actMsg = pathReplace(e.getMessage());
-
-            // perform special handling of NullPointerException as
-            // JDK started to add more information in some newer JDK, so
-            // it sometimes has a message and sometimes not!
            if (NullPointerException.class.isAssignableFrom(exClass)) {
                if (actMsg != null) {
-                    assertTrue(actMsg.contains(exMessage), errPrefix + "Message: " + actMsg + " - didn't contain: " + exMessage);
+                    assertTrue(actMsg.contains(exMessage), errPrefix + "Message: "+actMsg+" - didn't contain: "+exMessage);
                }
            } else {
-                // verify that message is either null for both or set for both
-                assertTrue(actMsg != null || isBlank(exMessage),
-                        errPrefix + " for " + exClass + " expected message '" + exMessage + "' but had '" + actMsg + "': " + e);
-
-                if (actMsg != null &&
-                        // in newer JDK versions IndexOutOfBoundsException switch from empty message
-                        // to more useful content
-                        // so skip the check for this type of exception if expected message is null
-                        (exMessage != null || !IndexOutOfBoundsException.class.isAssignableFrom(exClass))) {
-                    assertNotNull(exMessage,
-                            errPrefix + "Expected message was null, but actMsg wasn't: Message: " + actMsg + ": " + e);
-                    assertTrue(actMsg.contains(exMessage),
-                            errPrefix + "Message: " + actMsg + " - didn't contain: " + exMessage);
-                }
+                assertNotNull(actMsg, errPrefix);
+                assertTrue(actMsg.contains(exMessage),
+                        errPrefix + "Message: " + actMsg + " - didn't contain: " + exMessage);
            }
        } else {
            assertDoesNotThrow(exec, errPrefix);
        }
    }

-    private static boolean isBlank(final String str) {
-        if (str != null) {
-            final int strLen = str.length();
-            for (int i = 0; i < strLen; i++) {
-                if (!Character.isWhitespace(str.charAt(i))) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
    private static String pathReplace(String msg) {
        if (msg == null) return null;

@ -351,15 +279,4 @@ public class TestAllFiles {

        return msg;
    }
-
-    private static boolean isJava8() {
-        return System.getProperty("java.version").startsWith("1.8");
-    }
-
-    private static String[] concat(String[] a, String[] b) {
-        String[] result = new String[a.length + b.length];
-        System.arraycopy(a, 0, result, 0, a.length);
-        System.arraycopy(b, 0, result, a.length, b.length);
-        return result;
-    }
 }
--- a/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
@ -41,11 +41,11 @@ public class XSSFBFileHandler extends AbstractFileHandler {
    public void handleFile(InputStream stream, String path) throws Exception {
        byte[] bytes = IOUtils.toByteArray(stream);

-        try (OPCPackage opcPackage = OPCPackage.open(UnsynchronizedByteArrayInputStream.builder().setByteArray(bytes).get())) {
+        try (OPCPackage opcPackage = OPCPackage.open(new UnsynchronizedByteArrayInputStream(bytes))) {
            testOne(opcPackage);
        }

-        testNotHandledByWorkbookException(OPCPackage.open(UnsynchronizedByteArrayInputStream.builder().setByteArray(bytes).get()));
+        testNotHandledByWorkbookException(OPCPackage.open(new UnsynchronizedByteArrayInputStream(bytes)));
    }

    private void testNotHandledByWorkbookException(OPCPackage pkg) throws IOException {
@ -78,7 +78,7 @@ public class XSSFBFileHandler extends AbstractFileHandler {
        XSSFBEventBasedExcelExtractor ex = new XSSFBEventBasedExcelExtractor(pkg);
        String txt = ex.getText();
        if (txt.length() < 1) {
-            throw new IllegalArgumentException("Should have gotten some text.");
+            throw new RuntimeException("Should have gotten some text.");
        }
    }

--- a/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
@ -16,6 +16,7 @@
 ==================================================================== */
 package org.apache.poi.stress;

+import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
 import static org.apache.poi.xssf.XSSFTestDataSamples.getSampleFile;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@ -28,7 +29,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.HashSet;
 import java.util.Iterator;
@ -36,7 +36,6 @@ import java.util.Set;

 import javax.xml.transform.TransformerException;

-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.examples.ss.ExcelComparator;
@ -55,7 +54,6 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.eventusermodel.XSSFReader;
 import org.apache.poi.xssf.extractor.XSSFExportToXml;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFMap;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -74,7 +72,7 @@ public class XSSFFileHandler extends SpreadsheetHandler {
        // make sure the potentially large byte-array is freed up quickly again
        {

-            UnsynchronizedByteArrayOutputStream out = UnsynchronizedByteArrayOutputStream.builder().get();
+            UnsynchronizedByteArrayOutputStream out = new UnsynchronizedByteArrayOutputStream();
            IOUtils.copy(stream, out);

            if (pass != null) {
@ -117,13 +115,6 @@ public class XSSFFileHandler extends SpreadsheetHandler {
        // and finally ensure that exporting to XML works
        exportToXML(wb);

-        // also try to read and write the sheet via SXSSF
-        try (SXSSFWorkbook swb = new SXSSFWorkbook(wb)) {
-            try (OutputStream out = NullOutputStream.INSTANCE) {
-                swb.write(out);
-            }
-        }
-
        // this allows to trigger a heap-dump at this point to see which memory is still allocated
        //HeapDump.dumpHeap("/tmp/poi.hprof", false);

@ -165,7 +156,7 @@ public class XSSFFileHandler extends SpreadsheetHandler {
            TransformerException {
        for (XSSFMap map : wb.getCustomXMLMappings()) {
            XSSFExportToXml exporter = new XSSFExportToXml(map);
-            exporter.exportToXML(NullOutputStream.INSTANCE, true);
+            exporter.exportToXML(NULL_OUTPUT_STREAM, true);
        }
    }

@ -203,7 +194,7 @@ public class XSSFFileHandler extends SpreadsheetHandler {
            XLSX2CSV.main(new String[]{file.getAbsolutePath()});
            ExcelComparator.main(new String[]{file.getAbsolutePath(), file.getAbsolutePath()});

-            assertFalse(EXPECTED_ADDITIONAL_FAILURES.contains(testFile), "Expected Extraction to fail for file " + file + " and handler " + this + ", but did not fail!" );
+            assertFalse( EXPECTED_ADDITIONAL_FAILURES.contains(testFile), "Expected Extraction to fail for file " + file + " and handler " + this + ", but did not fail!" );

        } catch (OLE2NotOfficeXmlFileException e) {
            // we have some files that are not actually OOXML and thus cannot be tested here
@ -226,8 +217,6 @@ public class XSSFFileHandler extends SpreadsheetHandler {
        }

        handleExtracting(file);
-
-        handleAdditional(file);
    }

    @Test
--- a/poi-integration/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
@ -22,7 +22,6 @@ import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Set;

-import org.apache.commons.io.output.NullOutputStream;
 import org.apache.poi.ooxml.POIXMLException;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.junit.jupiter.api.Test;
@ -42,8 +41,6 @@ public class XWPFFileHandler extends AbstractFileHandler {
        try (XWPFDocument doc = new XWPFDocument(stream)) {
            new POIXMLDocumentHandler().handlePOIXMLDocument(doc);
            POIXMLDocumentHandler.cursorRecursive(doc.getDocument());
-
-            doc.write(NullOutputStream.INSTANCE);
        } catch (POIXMLException e) {
            Exception cause = (Exception)e.getCause();
            throw cause == null ? e : cause;
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`// empty file required to have a standalone build`