65206 - Migrate ant / maven to gradle build

compile / jar / test of mrJars
don't include ants build.xml anymore
rename directories to match project and maven artifact names
refactor artifacts - so each project has one artifact
replace static references in hssf/dev tests with junit5 constructs, which had problems in parallel tests
increase gradle heap to 4gb because of OOM - maybe less would also work

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

3647 files changed, 2128 insertions, 724 deletions

diff --git a/build.gradle b/build.gradle
index ee3e3d2dbf..64f0bdacde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ buildscript {
 }
 
 plugins {
+    id 'base'
     id("org.nosphere.apache.rat") version "0.7.0"
 }
 
@@ -59,6 +60,7 @@ ant.taskdef(name: "junit",
         classpath: configurations.antLibs.asPath)
 
 wrapper {
+    // https://stackoverflow.com/a/54741656/2066598
     gradleVersion = '6.8'
 }
 
@@ -78,6 +80,7 @@ wrapper.finalizedBy adjustWrapperPropertiesFile
  */
 allprojects {
     apply plugin: 'eclipse'
+//    apply plugin: 'idea'
 }
 
 /**
@@ -89,6 +92,7 @@ subprojects {
     //Put instructions for each sub project, but not the master
     apply plugin: 'java-library'
     apply plugin: 'jacoco'
+    apply plugin: 'maven-publish'
 
     version = '5.0.1-SNAPSHOT'
     ext {
@@ -108,6 +112,10 @@ subprojects {
         options.encoding = 'UTF-8'
     }
 
+    tasks.withType(Jar) {
+        duplicatesStrategy = 'fail'
+    }
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
@@ -127,7 +135,7 @@ subprojects {
 
     jar {
         manifest {
-            attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': version
+            attributes 'Implementation-Title': 'Apache POI', 'Implementation-Version': project.version
         }
     }
 
@@ -209,6 +217,56 @@ subprojects {
     jenkins.dependsOn javadoc
     jenkins.dependsOn jacocoTestReport
     jenkins.dependsOn rat
+
+    publishing {
+        publications {
+            POI(MavenPublication) {
+                groupId 'org.apache.poi'
+
+                pom {
+                    packaging = 'jar'
+                    url = 'https://poi.apache.org/'
+
+                    mailingLists {
+                        mailingList {
+                            name = 'POI Users List'
+                            subscribe = 'user-subscribe@poi.apache.org'
+                            unsubscribe = 'user-unsubscribe@poi.apache.org'
+                            archive = 'http://mail-archives.apache.org/mod_mbox/poi-user/'
+                        }
+                        mailingList {
+                            name = 'POI Developer List'
+                            subscribe = 'dev-subscribe@poi.apache.org'
+                            unsubscribe = 'dev-unsubscribe@poi.apache.org'
+                            archive = 'http://mail-archives.apache.org/mod_mbox/poi-dev/'
+                        }
+                    }
+
+                    licenses {
+                        license {
+                            name = 'Apache License, Version 2.0'
+                            url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                            distribution = 'repo'
+                        }
+                    }
+
+                    organization {
+                        name = 'Apache Software Foundation'
+                        url = 'http://www.apache.org/'
+                    }
+
+                    withXml {
+                        def r = asElement()
+                        def doc = r.getOwnerDocument()
+                        def asl = doc.createComment(new File('../legal/HEADER').text)
+                        // adding ASF header before root node is ignored
+                        // doc.insertBefore(asl, doc.getDocumentElement())
+                        r.insertBefore(asl, r.getFirstChild())
+                    }
+                }
+            }
+        }
+    }
 }
 
 // Make JavaDoc behave similar to Ant, i.e. be a bit more lenient
@@ -264,6 +322,10 @@ task allJavaDoc(type: Javadoc) {
 task jenkins
 jenkins.dependsOn allJavaDoc
 
+clean {
+    delete "${rootDir}/build/dist"
+}
+
 rat {
     // Input directory, defaults to '.'
     inputDir.set(file("."))
@@ -306,3 +368,14 @@ rat {
     // Prints the list of files with unapproved licences to the console, defaults to false
     verbose.set(true)
 }
+
+/*task downloadJarsToLibs() {
+    def f = new File("$projectDir/../lib/ooxml/xmlbeans-5.0.0.jar")
+    if (!f.exists()) {
+    println 'writing file ' + f.getAbsolutePath()
+    f.getParentFile().mkdirs()
+    new URL('https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar').withInputStream{ i -> f.withOutputStream{ it << i }}
+    }
+}*/
+
+//compileJava.dependsOn 'downloadJarsToLibs'
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 221f22491d..3fd20748ba 100644
--- a/build.xml
+++ b/build.xml
@@ -89,9 +89,9 @@ under the License.
         <attribute name="name"/>
         <attribute name="value"/>
         <sequential>
-            <mkdir dir="excelant/build/poi-ant-contrib"/>
-            <javac srcdir="excelant/src//poi-ant-contrib/java" destdir="excelant/build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
-            <taskdef name="PropertyResetHelper" classname="PropertyReset" classpath="excelant/build/poi-ant-contrib"/>
+            <mkdir dir="poi-excelant/build/poi-ant-contrib"/>
+            <javac srcdir="poi-excelant/src//poi-ant-contrib/java" destdir="poi-excelant/build/poi-ant-contrib" includeantruntime="true" excludes="Junit5Progress.java"/>
+            <taskdef name="PropertyResetHelper" classname="PropertyReset" classpath="poi-excelant/build/poi-ant-contrib"/>
             <PropertyResetHelper name="@{name}" value="@{value}" />
         </sequential>
     </macrodef>
@@ -115,65 +115,66 @@ under the License.
     <property name="tempdir" value="build/tmp"/>
 
     <!-- Main: -->
-    <property name="main.resources.main" value="main/src/main/resources"/>
-    <property name="main.src" location="main/src/main/java"/>
-    <property name="main.src.test" location="main/src/test/java"/>
-    <property name="main.resources.test" location="main/src/test/resources"/>
+    <property name="main.resources.main" value="poi/src/main/resources"/>
+    <property name="main.src" location="poi/src/main/java"/>
+    <property name="main.src.test" location="poi/src/test/java"/>
+    <property name="main.resources.test" location="poi/src/test/resources"/>
     <property name="main.documentation" value="src/documentation"/>
-    <property name="main.output.dir" location="main/build/classes/ant/java"/>
-    <property name="main.output.test.dir" location="main/build/test-classes"/>
-    <property name="main.reports.test" location="main/build/test-results"/>
-    <property name="main.testokfile" location="main/build/testokfile.txt"/>
-    <property name="main.output.gen-sources.dir" location="main/build/generated-sources"/>
-    <property name="main.version.template" location="main/src/main/version/Version.java.template"/>
+    <property name="main.output.dir" location="poi/build/classes/ant/java"/>
+    <property name="main.output.test.dir" location="poi/build/test-classes"/>
+    <property name="main.reports.test" location="poi/build/test-results"/>
+    <property name="main.testokfile" location="poi/build/testokfile.txt"/>
+    <property name="main.output.gen-sources.dir" location="poi/build/generated-sources"/>
+    <property name="main.version.template" location="poi/src/main/version/Version.java.template"/>
     <property name="main.version.java" location="${main.output.gen-sources.dir}/org/apache/poi/Version.java"/>
 
     <!-- Scratchpad: -->
-    <property name="scratchpad.resources.main" value="scratchpad/src/main/resources"/>
-    <property name="scratchpad.src" location="scratchpad/src/main/java"/>
-    <property name="scratchpad.src.test" location="scratchpad/src/test/java"/>
-    <property name="scratchpad.resources.test" location="scratchpad/src/main/resources"/>
-    <property name="scratchpad.reports.test" location="scratchpad/build/test-results"/>
-    <property name="scratchpad.output.dir" location="scratchpad/build/classes/ant/java"/>
-    <property name="scratchpad.output.test.dir" location="scratchpad/build/test-classes"/>
-    <property name="scratchpad.testokfile" location="scratchpad/build/testokfile.txt"/>
+    <property name="scratchpad.resources.main" value="poi-scratchpad/src/main/resources"/>
+    <property name="scratchpad.src" location="poi-scratchpad/src/main/java"/>
+    <property name="scratchpad.src.test" location="poi-scratchpad/src/test/java"/>
+    <property name="scratchpad.resources.test" location="poi-scratchpad/src/main/resources"/>
+    <property name="scratchpad.reports.test" location="poi-scratchpad/build/test-results"/>
+    <property name="scratchpad.output.dir" location="poi-scratchpad/build/classes/ant/java"/>
+    <property name="scratchpad.output.test.dir" location="poi-scratchpad/build/test-classes"/>
+    <property name="scratchpad.testokfile" location="poi-scratchpad/build/testokfile.txt"/>
 
     <!-- Examples: -->
-    <property name="examples.src" location="examples/src/main/java"/>
-    <property name="examples.output.dir" location="examples/build/classes/ant/java"/>
+    <property name="examples.src" location="poi-examples/src/main/java"/>
+    <property name="examples.output.dir" location="poi-examples/build/classes/ant/java"/>
 
     <!-- OOXML support: -->
-    <property name="ooxml.src" location="ooxml/src/main/java"/>
-    <property name="ooxml.resources.main" value="ooxml/src/main/resources"/>
-    <property name="ooxml.src.test" location="ooxml/src/test/java"/>
-    <property name="ooxml.resources.test" location="ooxml/src/test/resources"/>
-    <property name="ooxml.reports.test" location="ooxml/build/test-results"/>
-    <property name="ooxml.output.dir" location="ooxml/build/classes/ant/java"/>
-    <property name="ooxml.output.test.dir" location="ooxml/build/test-classes"/>
-    <property name="ooxml.testokfile" location="ooxml/build/testokfile.txt"/>
-
-    <property name="ooxml.lite.agent" location="lib/ooxml-tests/ooxml-lite-agent.jar"/>
-    <property name="ooxml.lite.report" location="ooxml-schema/build/ooxml-lite-report"/>
+    <property name="ooxml.src" location="poi-ooxml/src/main/java"/>
+    <property name="ooxml.resources.main" value="poi-ooxml/src/main/resources"/>
+    <property name="ooxml.src.test" location="poi-ooxml/src/test/java"/>
+    <property name="ooxml.resources.test" location="poi-ooxml/src/test/resources"/>
+    <property name="ooxml.reports.test" location="poi-ooxml/build/test-results"/>
+    <property name="ooxml.output.dir" location="poi-ooxml/build/classes/ant/java"/>
+    <property name="ooxml.output.test.dir" location="poi-ooxml/build/test-classes"/>
+    <property name="ooxml.testokfile" location="poi-ooxml/build/testokfile.txt"/>
+
+    <property name="ooxml.lite.agent" location="build/dist/maven/poi-ooxml-lite-agent/poi-ooxml-lite-agent-${version.id}.jar"/>
+    <property name="ooxml.lite.report" location="build/ooxml-lite-report"/>
     <property name="ooxml.lite.jar" location="build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${version.id}.jar"/>
     <property name="ooxml.lite.includes" value="^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"/>
+    <property name="ooxml.lite.output.dir" location="poi-ooxml-lite-agent/build/classes/ant/java"/>
 
 
     <!-- Integration testing: -->
-    <property name="integration.src.test" location="integrationtest/src/test/java"/>
-    <property name="integration.resources.test" location="integrationtest/src/test/resources"/>
-    <property name="integration.reports.test" location="integrationtest/build/test-results"/>
-    <property name="integration.output.test.dir" location="integrationtest/build/test-classes"/>
-    <property name="integration.testokfile" location="integrationtest/build/testokfile.txt"/>
+    <property name="integration.src.test" location="poi-integration/src/test/java"/>
+    <property name="integration.resources.test" location="poi-integration/src/test/resources"/>
+    <property name="integration.reports.test" location="poi-integration/build/test-results"/>
+    <property name="integration.output.test.dir" location="poi-integration/build/test-classes"/>
+    <property name="integration.testokfile" location="poi-integration/build/testokfile.txt"/>
 
     <!-- Excelant: -->
-    <property name="excelant.resource.main" value="excelant/src/main/resources"/>
-    <property name="excelant.src" location="excelant/src/main/java"/>
-    <property name="excelant.src.test" location="excelant/src/test/java"/>
-    <property name="excelant.resources.test" location="excelant/src/test/resources"/>
-    <property name="excelant.reports.test" location="excelant/build/test-results"/>
-    <property name="excelant.output.dir" location="excelant/build/classes/ant/java"/>
-    <property name="excelant.output.test.dir" location="excelant/build/test-classes"/>
-    <property name="excelant.testokfile" location="excelant/build/testokfile.txt"/>
+    <property name="excelant.resource.main" value="poi-excelant/src/main/resources"/>
+    <property name="excelant.src" location="poi-excelant/src/main/java"/>
+    <property name="excelant.src.test" location="poi-excelant/src/test/java"/>
+    <property name="excelant.resources.test" location="poi-excelant/src/test/resources"/>
+    <property name="excelant.reports.test" location="poi-excelant/build/test-results"/>
+    <property name="excelant.output.dir" location="poi-excelant/build/classes/ant/java"/>
+    <property name="excelant.output.test.dir" location="poi-excelant/build/test-classes"/>
+    <property name="excelant.testokfile" location="poi-excelant/build/testokfile.txt"/>
 
     <macrodef name="dependency">
         <attribute name="prefix"/>
@@ -347,21 +348,21 @@ under the License.
 
     <!-- See https://www.ecma-international.org/publications/standards/Ecma-376.htm -->
     <!-- "Copy these file(s), free of charge" -->
-    <property name="ooxml-schema.output.dir" location="ooxml-schema/build/classes/ant/java"/>
-    <property name="ooxml-schema.output.test.dir" location="ooxml-schema/build/test-classes"/>
-    <property name="ooxml-schema.output.gen-sources.dir" location="ooxml-schema/build/generated-sources"/>
-    <property name="ooxml-schema.output.gen-classes.dir" location="ooxml-schema/build/generated-classes"/>
-    <property name="ooxml.xsds.izip.1" value="${basedir}/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
-    <property name="ooxml.xsds.src.dir" location="ooxml-schema/build/xsds"/>
+    <property name="ooxml-schema.output.dir" location="poi-ooxml-full/build/classes/ant/java"/>
+    <property name="ooxml-schema.output.test.dir" location="poi-ooxml-full/build/test-classes"/>
+    <property name="ooxml-schema.output.gen-sources.dir" location="poi-ooxml-full/build/generated-sources"/>
+    <property name="ooxml-schema.output.gen-classes.dir" location="poi-ooxml-full/build/generated-classes"/>
+    <property name="ooxml.xsds.izip.1" value="${basedir}/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip"/>
+    <property name="ooxml.xsds.src.dir" location="poi-ooxml-full/build/xsds"/>
     <property name="ooxml.xsds.src.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}-sources.jar"/>
     <property name="ooxml.xsds.jar" location="build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version.id}.jar"/>
 
     <!-- additional schemas are packed into the poi schemas jar, -->
     <!-- so we don't have to care about a separate versioning of the original ooxml schemas -->
-    <property name="ooxml.xsds.izip.2" value="${basedir}/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip"/>
-    <property name="ooxml.security.xsd.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt"/>
-    <property name="ooxml.visio.xsd.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf"/>
-    <property name="ooxml.schema.xsdconfig.dir" location="ooxml-schema/src/main/xmlschema/org/apache/poi/schemas"/>
+    <property name="ooxml.xsds.izip.2" value="${basedir}/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip"/>
+    <property name="ooxml.security.xsd.dir" location="poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt"/>
+    <property name="ooxml.visio.xsd.dir" location="poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf"/>
+    <property name="ooxml.schema.xsdconfig.dir" location="poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas"/>
 
     <!-- Coverage -->
     <property name="coverage.dir" value="build/coverage"/>
@@ -623,13 +624,13 @@ under the License.
 
     <target name="clean" description="Remove generated artefacts">
         <delete dir="build"/>
-        <delete dir="examples/build"/>
-        <delete dir="excelant/build"/>
-        <delete dir="integrationtest/build"/>
-        <delete dir="main/build"/>
-        <delete dir="ooxml/build"/>
-        <delete dir="ooxml-schema/build"/>
-        <delete dir="scratchpad/build"/>
+        <delete dir="poi-examples/build"/>
+        <delete dir="poi-excelant/build"/>
+        <delete dir="poi-integration/build"/>
+        <delete dir="poi/build"/>
+        <delete dir="poi-ooxml/build"/>
+        <delete dir="poi-ooxml-full/build"/>
+        <delete dir="poi-scratchpad/build"/>
         <delete includeemptydirs="true">
             <fileset dir="sonar">
                 <include name="*/target/**"/>
@@ -972,8 +973,8 @@ under the License.
         </javac>
 
         <javac release="9"
-               srcdir="${basedir}/ooxml-schema/src/ooxml-full/java9"
-               destdir="${basedir}/ooxml-schema/src/ooxml-full/java9"
+               srcdir="${basedir}/poi-ooxml-full/src/main/java9"
+               destdir="${basedir}/poi-ooxml-full/src/main/java9"
                includeantruntime="false"
                fork="true"
                modulepath="lib/ooxml"
@@ -986,8 +987,8 @@ under the License.
         <jar destfile="${ooxml.xsds.jar}">
             <fileset dir="${ooxml-schema.output.dir}"/>
             <fileset dir="${ooxml-schema.output.gen-classes.dir}"/>
-            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-full/java9" prefix="META-INF/versions/9" excludes="*.java"/>
-            <metainf dir="legal/"/>
+            <zipfileset dir="${basedir}/poi-ooxml-full/src/main/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <metainf dir="legal/" excludes="HEADER"/>
             <manifest>
                 <attribute name="Multi-Release" value="true"/>
                 <attribute name="Automatic-Module-Name" value="org.apache.poi.ooxml.schemas"/>
@@ -1004,8 +1005,8 @@ under the License.
 
         <jar destfile="${ooxml.xsds.src.jar}">
             <fileset dir="${ooxml-schema.output.gen-sources.dir}"/>
-            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-full/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
-            <metainf dir="legal"/>
+            <zipfileset dir="${basedir}/poi-ooxml-full/src/main/java9" prefix="META-INF/versions/9/" excludes="*.class"/>
+            <metainf dir="legal" excludes="HEADER"/>
         </jar>
     </target>
 
@@ -1039,7 +1040,7 @@ under the License.
                 <string>@{module}</string>
                 <filterchain>
                     <prefixlines prefix="poi-"/>
-                    <replacestring from="poi-main" to="poi"/>
+                    <replacestring from="poi-poi" to="poi"/>
                 </filterchain>
             </loadresource>
 
@@ -1080,7 +1081,7 @@ under the License.
                 <zipfileset dir="${basedir}/@{module}/src/main/java9"
                             prefix="META-INF/versions/9"
                             excludes="*.java"/>
-                <metainf dir="legal/"/>
+                <metainf dir="legal/" excludes="HEADER"/>
                 <manifest>
                     <attribute name="Multi-Release" value="true"/>
                     <attribute name="Automatic-Module-Name" value="org.apache.poi.@{module}"/>
@@ -1139,7 +1140,7 @@ under the License.
                 <resources/>
                 <test-resources/>
                 <zipfileset dir="${basedir}/@{module}/src/test/java9" prefix="META-INF/versions/9" excludes="*.java"/>
-                <metainf dir="legal/"/>
+                <metainf dir="legal/" excludes="HEADER"/>
                 <manifest>
                     <attribute name="Multi-Release" value="true"/>
                     <attribute name="Automatic-Module-Name" value="org.apache.poi.@{module}"/>
@@ -1157,7 +1158,7 @@ under the License.
             <!-- create the sources jar -->
             <jar destfile="build/dist/maven/${maven-name}/${maven-name}-@{version}-sources.jar">
                 <fileset dir="@{java}"/>
-                <metainf dir="legal/"/>
+                <metainf dir="legal/" excludes="HEADER"/>
                 <manifest>
                     <attribute name="Built-By" value="${user.name}"/>
                     <attribute name="Specification-Title" value="Apache POI"/>
@@ -1173,12 +1174,13 @@ under the License.
     </macrodef>
 
     <target name="compile-main" depends="init, compile-version">
-        <compile-jar module="main"
+        <compile-jar module="poi"
             java="${main.src}" classes="${main.output.dir}"
             test="${main.src.test}" test-classes="${main.output.test.dir}">
             <lib>
                 <pathelement path="lib/main"/>
                 <pathelement path="lib/main-tests"/>
+                <pathelement path="lib/excelant"/>
             </lib>
             <resources>
                 <fileset dir="${main.resources.main}"/>
@@ -1190,7 +1192,7 @@ under the License.
     </target>
 
     <target name="compile-scratchpad" depends="compile-main">
-        <compile-jar module="scratchpad"
+        <compile-jar module="poi-scratchpad"
              java="${scratchpad.src}" classes="${scratchpad.output.dir}"
              test="${scratchpad.src.test}" test-classes="${scratchpad.output.test.dir}">
             <lib>
@@ -1208,7 +1210,7 @@ under the License.
     </target>
 
     <target name="compile-examples" depends="compile-main,compile-scratchpad,compile-ooxml">
-        <compile-jar module="examples"
+        <compile-jar module="poi-examples"
                      java="${examples.src}" classes="${examples.output.dir}">
             <lib>
                 <pathelement path="build/dist/maven/poi-ooxml-full"/>
@@ -1222,7 +1224,7 @@ under the License.
     </target>
 
     <target name="compile-ooxml" depends="compile-main,compile-scratchpad,compile-ooxml-xsds">
-        <compile-jar module="ooxml"
+        <compile-jar module="poi-ooxml"
              java="${ooxml.src}" classes="${ooxml.output.dir}"
              test="${ooxml.src.test}" test-classes="${ooxml.output.test.dir}">
             <lib>
@@ -1242,9 +1244,21 @@ under the License.
         </compile-jar>
 
         <!-- create ooxml-lite-agent jar -->
+        <mkdir dir="${ooxml.lite.output.dir}"/>
+        <javac release="8"
+               srcdir="${basedir}/poi-ooxml-lite-agent/src/main/java"
+               destdir="${ooxml.lite.output.dir}"
+               includeantruntime="false"
+               fork="true">
+            <classpath>
+                <fileset dir="${basedir}/lib/main-tests" includes="*.jar"/>
+                <fileset dir="${basedir}/lib/ooxml" includes="*.jar"/>
+            </classpath>
+        </javac>
+
         <javac release="9"
-               srcdir="${basedir}/ooxml/src/ooxml-lite-agent/java9"
-               destdir="${basedir}/ooxml/src/ooxml-lite-agent/java9"
+               srcdir="${basedir}/poi-ooxml-lite-agent/src/main/java9"
+               destdir="${basedir}/poi-ooxml-lite-agent/src/main/java9"
                includeantruntime="false"
                fork="true"
                modulepath="${basedir}/lib/main-tests"
@@ -1253,8 +1267,8 @@ under the License.
         </javac>
 
         <jar destfile="${ooxml.lite.agent}">
-            <fileset dir="${ooxml.output.test.dir}" includes="org/apache/poi/ooxml/lite/**"/>
-            <zipfileset dir="${basedir}/ooxml/src/ooxml-lite-agent/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <fileset dir="${ooxml.lite.output.dir}"/>
+            <zipfileset dir="${basedir}/poi-ooxml-lite-agent/src/main/java9" prefix="META-INF/versions/9" excludes="*.java"/>
             <manifest>
                 <attribute name="Multi-Release" value="true"/>
                 <attribute name="Automatic-Module-Name" value="org.apache.poi.ooxml_lite"/>
@@ -1304,8 +1318,8 @@ under the License.
             </path>
 
 
-            <mkdir dir="excelant/build/poi-ant-contrib"/>
-            <javac srcdir="excelant/src/poi-ant-contrib/java" destdir="excelant/build/poi-ant-contrib"
+            <mkdir dir="poi-excelant/build/poi-ant-contrib"/>
+            <javac srcdir="poi-excelant/src/poi-ant-contrib/java" destdir="poi-excelant/build/poi-ant-contrib"
                    includeantruntime="true" includes="Junit5Progress.java" classpathref="junit-jars"/>
 
 
@@ -1340,7 +1354,7 @@ under the License.
                 <classpath>
                     <path refid="junit-jars" if:true="${isJava8}"/>
                     <fileset dir="${basedir}" includes="${cp_java}" if:true="${isJava8}"/>
-                    <pathelement location="excelant/build/poi-ant-contrib"/>
+                    <pathelement location="poi-excelant/build/poi-ant-contrib"/>
                 </classpath>
 
                 <testclasses outputDir="@{outputDir}">
@@ -1414,7 +1428,7 @@ under the License.
     </target>
 
     <target name="compile-excelant" depends="compile-main,compile-ooxml">
-        <compile-jar module="excelant"
+        <compile-jar module="poi-excelant"
             java="${excelant.src}" classes="${excelant.output.dir}"
             test="${excelant.src.test}" test-classes="${excelant.output.test.dir}">
             <lib>
@@ -1459,7 +1473,7 @@ under the License.
         <mkdir dir="${integration.output.test.dir}/META-INF/versions/9"/>
 
         <javac release="9"
-               srcdir="${basedir}/integrationtest/src/test/java9"
+               srcdir="${basedir}/poi-integration/src/test/java9"
                destdir="${integration.output.test.dir}/META-INF/versions/9"
                includeantruntime="false"
                fork="true"
@@ -1478,20 +1492,20 @@ under the License.
             </modulepath>
         </javac>
 
-        <manifest file="integrationtest/build/poi-manifest.mf">
+        <manifest file="poi-integration/build/poi-manifest.mf">
             <attribute name="Multi-Release" value="true"/>
             <attribute name="Automatic-Module-Name" value="org.apache.poi.stress"/>
         </manifest>
 
         <jar destfile="build/dist/maven/poi-integration/poi-integration-${version.id}.jar"
              basedir="${integration.output.test.dir}"
-             manifest="integrationtest/build/poi-manifest.mf"/>
+             manifest="poi-integration/build/poi-manifest.mf"/>
     </target>
 
     <target name="-version-java-check">
 		<!-- recompile Version.java from the template whenever source or the version in build.xml changes -->
         <uptodate property="version.java.notRequired" targetfile="${main.output.dir}/org/apache/poi/Version.class">
-            <srcfiles file="main/src/main/version/Version.java.template"/>
+            <srcfiles file="poi/src/main/version/Version.java.template"/>
             <srcfiles file="build.xml"/>
         </uptodate>
     </target>
@@ -1821,7 +1835,7 @@ under the License.
 
         <local name="full.schema"/>
         <loadresource property="full.schema">
-            <file file="${basedir}/ooxml-schema/src/ooxml-full/java9/module-info.java"/>
+            <file file="${basedir}/poi-ooxml-full/src/main/java9/module-info.java"/>
             <filterchain>
                 <linecontains negate="true" matchany="true">
                     <contains value="exports"/>
@@ -1830,11 +1844,11 @@ under the License.
             </filterchain>
         </loadresource>
 
-        <echo output="${basedir}/ooxml-schema/src/ooxml-lite/java9/module-info.java">${full.schema}${lite.exports}}</echo>
+        <echo output="${basedir}/poi-ooxml-lite/src/main/java9/module-info.java">${full.schema}${lite.exports}}</echo>
 
         <javac release="9"
-               srcdir="${basedir}/ooxml-schema/src/ooxml-lite/java9"
-               destdir="${basedir}/ooxml-schema/src/ooxml-lite/java9"
+               srcdir="${basedir}/poi-ooxml-lite/src/main/java9"
+               destdir="${basedir}/poi-ooxml-lite/src/main/java9"
                includeantruntime="false"
                fork="true"
                unless:true="${isJava8}">
@@ -1869,7 +1883,7 @@ under the License.
         <mkdir dir="build/dist/maven/poi-ooxml-lite"/>
 
         <jar destfile="${ooxml.lite.jar}" duplicate="fail">
-            <zipfileset dir="${basedir}/ooxml-schema/src/ooxml-lite/java9" prefix="META-INF/versions/9" excludes="*.java"/>
+            <zipfileset dir="${basedir}/poi-ooxml-lite/src/main/java9" prefix="META-INF/versions/9" excludes="*.java"/>
             <zipfileset src="${ooxml.xsds.jar}">
                 <patternset>
                     <includesfile name="${ooxml.lite.report}.clazz1"/>
@@ -2185,7 +2199,7 @@ under the License.
             <jar destfile="build/dist/maven/${destfile}.jar">
                 <fileset dir="@{src}" unless:true="${isjar}"/>
                 <zipfileset src="@{src}" if:true="${isjar}"/>
-                <metainf dir="legal/"/>
+                <metainf dir="legal/" excludes="HEADER"/>
                 <manifest>
                     <attribute name="Multi-Release" value="true"/>
                     <attribute name="Automatic-Module-Name" value="org.apache.poi.@{module}"/>
@@ -2261,7 +2275,7 @@ under the License.
             <jar destfile="${dist.dir}/maven/@{dest}/@{dest}-${version.id}-javadoc.jar"
                  manifest="build/poi-manifest.mf">
                 <fileset dir="${build.maven.javadocs}"/>
-                <metainf dir="legal/"/>
+                <metainf dir="legal/" excludes="HEADER"/>
             </jar>
         </sequential>
     </macrodef>
@@ -2280,7 +2294,7 @@ under the License.
         <property name="zipdir" value="${jar.name}-${version.id}"/>
 
         <mappedresources id="legal-files" cache="true">
-            <fileset dir="legal"/>
+            <fileset dir="legal" excludes="HEADER"/>
             <globmapper from="*" to="${zipdir}/*"/>
         </mappedresources>
 
@@ -2340,7 +2354,7 @@ under the License.
                       scripts/**,
                       TEST*,
                       *.ipr,
-                      *.iml,
+                      **/*.iml,
                       *.iws,
                       *.lnk,
                       *.rdf,
@@ -2437,24 +2451,24 @@ under the License.
              uri="antlib:org.apache.rat.anttasks"
              classpath="${rat.jar}" />
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
-            <fileset dir="examples/src" excludes="main/java/org/apache/poi/**/*-chart-data.txt"/>
-            <fileset dir="excelant/src"/>
-            <fileset dir="integrationtest/src"/>
-            <fileset dir="main/src">
+            <fileset dir="poi-examples/src" excludes="main/java/org/apache/poi/**/*-chart-data.txt"/>
+            <fileset dir="poi-excelant/src"/>
+            <fileset dir="poi-integration/src"/>
+            <fileset dir="poi/src">
                 <exclude name="main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml" />
             </fileset>
-            <fileset dir="ooxml/src">
+            <fileset dir="poi-ooxml/src">
                 <exclude name="main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml" />
                 <exclude name="main/resources/org/apache/poi/xslf/usermodel/empty.pptx" />
                 <exclude name="main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml" />
             </fileset>
-            <fileset dir="ooxml-schema/src">
+            <fileset dir="poi-ooxml-full/src">
                 <exclude name="main/xmlschema/org/apache/poi/xdgf/visio.xsd" />
                 <exclude name="main/xmlschema/org/apache/poi/schemas/XAdES*.xsd" />
                 <exclude name="main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd" />
                 <exclude name="main/xmlschema/org/apache/poi/schemas/*.zip" />
             </fileset>
-            <fileset dir="scratchpad/src"/>
+            <fileset dir="poi-scratchpad/src"/>
 
             <fileset dir="src">
                 <exclude name="documentation/*.txt" />
@@ -2690,11 +2704,11 @@ under the License.
             <auxClasspath path="${pdf.pdfbox.jar}"/>
             <auxClasspath path="${pdf.fontbox.jar}"/>
             <auxClasspath path="${pdf.graphics2d.jar}"/>
-            <sourcePath path="main/src/main/java" />
-            <sourcePath path="excelant/src/main/java" />
-            <sourcePath path="examples/src/main/java" />
-            <sourcePath path="ooxml/src/main/java" />
-            <sourcePath path="scratchpad/src/main/java" />
+            <sourcePath path="poi/src/main/java" />
+            <sourcePath path="poi-excelant/src/main/java" />
+            <sourcePath path="poi-examples/src/main/java" />
+            <sourcePath path="poi-ooxml/src/main/java" />
+            <sourcePath path="poi-scratchpad/src/main/java" />
         </spotbugs>
 
         <!-- instead of calling findbugs again, we simply transform the xml -->
@@ -2920,7 +2934,7 @@ under the License.
             <format property="tstamp_next" pattern="yyyy-MM" offset="3" unit="month"/>
         </tstamp>
 
-        <taskdef name="NextRelease" classname="NextRelease" classpath="excelant/build/poi-ant-contrib"/>
+        <taskdef name="NextRelease" classname="NextRelease" classpath="poi-excelant/build/poi-ant-contrib"/>
         <NextRelease property="rel_next"/>
 
         <antcall target="-update-build.xml">
@@ -3044,7 +3058,7 @@ under the License.
         </tstamp>
 
 
-        <taskdef name="NextRelease" classname="NextRelease" classpath="excelant/build/poi-ant-contrib"/>
+        <taskdef name="NextRelease" classname="NextRelease" classpath="poi-excelant/build/poi-ant-contrib"/>
         <NextRelease property="rel_prev" increment="-1"/>
 
         <!-- we don't simply generate a new iso file date with tstamp,
@@ -3057,8 +3071,8 @@ under the License.
         </loadresource>
 
         <replaceregexp file="build.gradle" match="( +version += +)'[^']+'" replace="\1'${version.id}'"/>
-        <replaceregexp file="examples/src/main/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
-        <replaceregexp file="examples/src/main/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
+        <replaceregexp file="poi-examples/src/main/groovy/build.gradle" match="( *compile 'org.apache.poi:[^0-9]+)([0-9.]+)'" replace="\1${rel_prev}'" byline="true"/>
+        <replaceregexp file="poi-examples/src/main/scala/build.sbt" match='( *org.apache.poi.* ")[0-9.]+(.+)' replace="\1${rel_prev}\2" byline="true"/>
         <replaceregexp file="osgi/pom.xml" match="version>${rel_prev}[^&lt;]+" replace="version>${version.id}"/>
         <replaceregexp file="doap_POI.rdf" match="&lt;release&gt;" replace="&lt;release&gt;&#10;      &lt;Version&gt;&#10;        &lt;name&gt;Apache POI ${rel_prev}&lt;/name&gt;&#10;        &lt;created&gt;${file_date_iso}&lt;/created&gt;&#10;        &lt;revision&gt;${rel_prev}&lt;/revision&gt;&#10;      &lt;/Version&gt;&#10;    &lt;/release&gt;&#10;    &lt;release&gt;"/>
 
@@ -3146,7 +3160,7 @@ under the License.
                 </filterchain>
             </loadfile>
 
-            <taskdef name="bytes2mega" classname="Bytes2Mega" classpath="excelant/build/poi-ant-contrib"/>
+            <taskdef name="bytes2mega" classname="Bytes2Mega" classpath="poi-excelant/build/poi-ant-contrib"/>
             <local name="fileSizeMb"/>
             <bytes2mega property="fileSizeMb" bytes="${fileSize}"/>
 
diff --git a/examples/build.gradle b/examples/build.gradle
deleted file mode 100644
index 15ab280aa1..0000000000
--- a/examples/build.gradle
+++ /dev/null
@@ -1,26 +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.
-==================================================================== */
-
-dependencies {
-    implementation project(':ooxml')
-    implementation project(':scratchpad')
-
-    implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
-
-	testImplementation project(path: ':ooxml', configuration: 'tests')
-	testImplementation project(path: ':main', configuration: 'tests')
-}
diff --git a/examples/src/main/java9/module-info.class b/examples/src/main/java9/module-info.class
deleted file mode 100644
index 7f1d82fc9e..0000000000
--- a/examples/src/main/java9/module-info.class
+++ /dev/null
diff --git a/excelant/src/main/java9/module-info.class b/excelant/src/main/java9/module-info.class
deleted file mode 100644
index 2d75c59c3f..0000000000
--- a/excelant/src/main/java9/module-info.class
+++ /dev/null
diff --git a/excelant/src/test/java9/module-info.class b/excelant/src/test/java9/module-info.class
deleted file mode 100644
index 815e1396a6..0000000000
--- a/excelant/src/test/java9/module-info.class
+++ /dev/null
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..4f4e5ef86a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,3 @@
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx4096m
\ No newline at end of file
diff --git a/integrationtest/build.gradle b/integrationtest/build.gradle
deleted file mode 100644
index 31ad899086..0000000000
--- a/integrationtest/build.gradle
+++ /dev/null
@@ -1,37 +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.
-==================================================================== */
-
-dependencies {
-    testImplementation 'org.apache.ant:ant:1.10.9'
-
-    testImplementation project(':ooxml')
-    testImplementation project(':scratchpad')
-    testImplementation project(':examples')
-
-    testImplementation files(this.project(':ooxml').sourceSets.test.runtimeClasspath)
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.integrationtest'
-    }
-}
-
-test {
-    // exclude these from the normal test-run
-    exclude '**/*FileHandler.class'
-}
diff --git a/excelant/build.gradle b/legal/HEADER
index e9889fe853..b642119555 100644
--- a/excelant/build.gradle
+++ b/legal/HEADER
@@ -1,4 +1,5 @@
-/* ====================================================================
+
+====================================================================
    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.
@@ -13,18 +14,4 @@
    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.
-==================================================================== */
-
-dependencies {
-    api 'org.apache.ant:ant:1.10.9'
-
-    api project(':ooxml')
-
-    testImplementation project(path: ':main', configuration: 'tests')
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.excelant'
-    }
-}
+====================================================================
diff --git a/main/build.gradle b/main/build.gradle
deleted file mode 100644
index f561dfb112..0000000000
--- a/main/build.gradle
+++ /dev/null
@@ -1,48 +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.
-==================================================================== */
-
-dependencies {
-    implementation "commons-codec:commons-codec:${commonsCodecVersion}"
-    implementation 'org.apache.commons:commons-collections4:4.4'
-    implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
-    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-    implementation 'javax.activation:activation:1.1.1'
-    api 'com.zaxxer:SparseBitSet:1.2'
-
-    testImplementation 'org.reflections:reflections:0.9.12'
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.main'
-    }
-}
-
-// 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) {
-    baseName = "test-${project.archivesBaseName}"
-    from sourceSets.test.output
-}
-
-configurations {
-    tests
-}
-
-artifacts {
-    tests testJar
-}
diff --git a/main/src/main/java9/module-info.class b/main/src/main/java9/module-info.class
deleted file mode 100644
index 5d96fed54b..0000000000
--- a/main/src/main/java9/module-info.class
+++ /dev/null
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java b/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
deleted file mode 100644
index 91481c80ec..0000000000
--- a/main/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
+++ /dev/null
@@ -1,80 +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.hssf.dev;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Stream;
-
-import org.apache.poi.POIDataSamples;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-/**
- * Base class for integration-style tests which iterate over all test-files
- * and execute the same action to find out if any change breaks these applications.
- */
-public abstract class BaseTestIteratingXLS {
-	protected static final Map<String,Class<? extends Throwable>> EXCLUDED = new HashMap<>();
-
-    private static Stream<Arguments> files() {
-        String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY);
-        if(dataDirName == null) {
-            dataDirName = "test-data";
-        }
-
-        List<Arguments> files = new ArrayList<>();
-        findFile(files, dataDirName + "/spreadsheet");
-        findFile(files, dataDirName + "/hpsf");
-
-        return files.stream();
-    }
-
-    private static void findFile(List<Arguments> list, String dir) {
-        String[] files = new File(dir).list((arg0, arg1) -> arg1.toLowerCase(Locale.ROOT).endsWith(".xls"));
-        assertNotNull(files, "Did not find any xls files in directory " + dir);
-
-        for(String file : files) {
-            list.add(Arguments.of(new File(dir, file)));
-        }
-    }
-
-    @ParameterizedTest
-    @MethodSource("files")
-	void testMain(File file) throws Exception {
-	    String fileName = file.getName();
-
-	    Class<? extends Throwable> t = EXCLUDED.get(fileName);
-
-        if (t == null) {
-            runOneFile(file);
-        } else {
-            assertThrows(t, () -> runOneFile(file));
-        }
-
-	}
-
-	abstract void runOneFile(File pFile) throws Exception;
-}
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
deleted file mode 100644
index ee06b7d101..0000000000
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
+++ /dev/null
@@ -1,58 +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.hssf.dev;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
-import org.apache.poi.hssf.record.RecordInputStream;
-import org.apache.poi.util.NullOutputStream;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
-
-class TestBiffDrawingToXml extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("61300.xls", RecordFormatException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); // BIFF 5
-    }
-
-	@Override
-	void runOneFile(File pFile) throws Exception {
-        try (InputStream wb = new FileInputStream(pFile)) {
-            BiffDrawingToXml.writeToFile(new NullOutputStream(), wb, false, new String[0]);
-        }
-	}
-}
diff --git a/main/src/test/java9/module-info.class b/main/src/test/java9/module-info.class
deleted file mode 100644
index 31c243495d..0000000000
--- a/main/src/test/java9/module-info.class
+++ /dev/null
diff --git a/ooxml-schema/build.gradle b/ooxml-schema/build.gradle
deleted file mode 100644
index 2aaa0d7eb1..0000000000
--- a/ooxml-schema/build.gradle
+++ /dev/null
@@ -1,68 +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.
-==================================================================== */
-
-apply plugin: 'java'
-
-configurations {
-    antdep
-}
-
-dependencies {
-    antdep 'org.apache.ant:ant:1.10.9'
-}
-
-/*task downloadJarsToLibs() {
-    def f = new File("$projectDir/../lib/ooxml/xmlbeans-5.0.0.jar")
-    if (!f.exists()) {
-	println 'writing file ' + f.getAbsolutePath()
-	f.getParentFile().mkdirs()
-	new URL('https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar').withInputStream{ i -> f.withOutputStream{ it << i }}
-    }
-}*/
-
-// we need to ensure that the custom ant tasks are compiled before we import the build.xml file
-
-task compileContrib (type: JavaCompile) {
-    source = "../excelant/src/poi-ant-contrib/java"
-    include '*.java'
-    exclude 'Junit5Progress.java'
-    classpath = configurations.antdep
-    destinationDirectory = file('../excelant/build/poi-ant-contrib')
-}
-
-
-// for now import the ant-task for building the jars from build.xml
-// we need to rename the tasks as e.g. task "jar" conflicts with :ooxml:jar
-
-ant.importBuild('../build.xml') { antTargetName ->
-    'ant-' + antTargetName
-}
-
-compileJava.dependsOn 'compileContrib'
-compileJava.dependsOn 'ant-compile-ooxml-xsds'
-
-//compileJava.dependsOn 'downloadJarsToLibs'
-
-dependencies {
-    api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml.schemas'
-    }
-}
diff --git a/ooxml-schema/src/ooxml-full/java9/module-info.class b/ooxml-schema/src/ooxml-full/java9/module-info.class
deleted file mode 100644
index 4c1707b28d..0000000000
--- a/ooxml-schema/src/ooxml-full/java9/module-info.class
+++ /dev/null
diff --git a/ooxml-schema/src/ooxml-lite/java9/module-info.class b/ooxml-schema/src/ooxml-lite/java9/module-info.class
deleted file mode 100644
index 5a1a8d9258..0000000000
--- a/ooxml-schema/src/ooxml-lite/java9/module-info.class
+++ /dev/null
diff --git a/ooxml/build.gradle b/ooxml/build.gradle
deleted file mode 100644
index 3fac94efbe..0000000000
--- a/ooxml/build.gradle
+++ /dev/null
@@ -1,66 +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.
-==================================================================== */
-
-dependencies {
-    api project(":ooxml-schema")
-    implementation 'org.apache.commons:commons-collections4:4.4'
-    api "org.apache.commons:commons-compress:${commonsCompressVersion}"
-    api 'org.apache.santuario:xmlsec:2.2.1'
-    api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
-    api 'com.github.virtuald:curvesapi:1.06'
-    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-
-    api "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
-    implementation("org.apache.xmlgraphics:batik-bridge:${batikVersion}") {
-        exclude group: 'org.apache.xmlgraphics', module: 'batik-script'
-    }
-    implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}"
-
-    api 'de.rototor.pdfbox:graphics2d:0.30'
-
-    api project(':main')
-    api files("../build/dist/maven/poi-ooxml-full/poi-ooxml-full-${version}.jar")
-
-    testRuntime project(':scratchpad')
-    testImplementation 'org.xmlunit:xmlunit-core:2.8.0'
-    testImplementation 'org.reflections:reflections:0.9.12'
-    testImplementation project(path: ':main', configuration: 'tests')
-    testImplementation 'org.openjdk.jmh:jmh-core:1.26'
-    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
-    testImplementation 'com.google.guava:guava:30.0-jre'
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.ooxml'
-    }
-}
-
-// 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) {
-	baseName = "test-${project.archivesBaseName}"
-	from sourceSets.test.output
-}
-
-configurations {
-	tests
-}
-
-artifacts {
-	tests testJar
-}
diff --git a/ooxml/src/main/java9/module-info.class b/ooxml/src/main/java9/module-info.class
deleted file mode 100644
index 9f991b0c36..0000000000
--- a/ooxml/src/main/java9/module-info.class
+++ /dev/null
diff --git a/ooxml/src/ooxml-lite-agent/java9/module-info.class b/ooxml/src/ooxml-lite-agent/java9/module-info.class
deleted file mode 100644
index 51e4e32994..0000000000
--- a/ooxml/src/ooxml-lite-agent/java9/module-info.class
+++ /dev/null
diff --git a/ooxml/src/test/java9/module-info.class b/ooxml/src/test/java9/module-info.class
deleted file mode 100644
index 8fc0ead938..0000000000
--- a/ooxml/src/test/java9/module-info.class
+++ /dev/null
diff --git a/poi-examples/build.gradle b/poi-examples/build.gradle
new file mode 100644
index 0000000000..5b1deb141f
--- /dev/null
+++ b/poi-examples/build.gradle
@@ -0,0 +1,99 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+import java.util.regex.Pattern
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+}
+
+
+dependencies {
+    api project(':poi-ooxml')
+    api project(':poi-scratchpad')
+    implementation project(path: ':poi-ooxml', configuration: 'archives')
+    implementation project(path: ':poi-ooxml-full', configuration: 'archives')
+    implementation project(path: ':poi-scratchpad', configuration: 'archives')
+
+    implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+
+	testImplementation project(path: ':ooxml', configuration: 'tests')
+	testImplementation project(path: ':main', configuration: 'tests')
+}
+
+final String MODULE_NAME = 'org.apache.poi.examples'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    withSourcesJar()
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    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
+    ]
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+sourcesJar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+}
diff --git a/examples/src/main/clojure/SpreadSheetDemo.clj b/poi-examples/src/main/clojure/SpreadSheetDemo.clj
index fbef7c991c..fbef7c991c 100644
--- a/examples/src/main/clojure/SpreadSheetDemo.clj
+++ b/poi-examples/src/main/clojure/SpreadSheetDemo.clj
diff --git a/examples/src/main/groovy/SpreadSheetDemo.groovy b/poi-examples/src/main/groovy/SpreadSheetDemo.groovy
index b9f30c0ce6..b9f30c0ce6 100644
--- a/examples/src/main/groovy/SpreadSheetDemo.groovy
+++ b/poi-examples/src/main/groovy/SpreadSheetDemo.groovy
diff --git a/examples/src/main/groovy/build.gradle b/poi-examples/src/main/groovy/build.gradle
index 79bccbcdeb..79bccbcdeb 100644
--- a/examples/src/main/groovy/build.gradle
+++ b/poi-examples/src/main/groovy/build.gradle
diff --git a/examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java b/poi-examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
index 406d6dc335..406d6dc335 100644
--- a/examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/crypt/OOXMLPasswordsTry.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
index c24afe1376..c24afe1376 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/CopyCompare.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
index b42b936768..b42b936768 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ModifyDocumentSummaryInformation.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
index ca8cba1ce9..ca8cba1ce9 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ReadCustomPropertySets.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java
index b901a89a3d..b901a89a3d 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/ReadTitle.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
index 94ceaf6c03..94ceaf6c03 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteAuthorAndTitle.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java
index a9a50cf8e4..a9a50cf8e4 100644
--- a/examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hpsf/WriteTitle.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java
index 53d3c46077..53d3c46077 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/ApacheconEU08.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java
index 5ab8b86a39..5ab8b86a39 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/BulletsDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java
index be8a227d1a..be8a227d1a 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/CreateHyperlink.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java
index 6996dc8751..6996dc8751 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/DataExtraction.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java
index 938b52e6d2..938b52e6d2 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/Graphics2DDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java
index 4dd4349df5..4dd4349df5 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/HeadersFootersDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java
index 307178d0e0..307178d0e0 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/Hyperlinks.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java
index 0f6929fee7..0f6929fee7 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/SoundFinder.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java
index 561ec717ab..561ec717ab 100644
--- a/examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hslf/TableDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java b/poi-examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java
index 4ab88cf27a..4ab88cf27a 100644
--- a/examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hsmf/Msg2txt.java
diff --git a/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
index a0b393cf5b..a0b393cf5b 100644
--- a/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
diff --git a/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
index 129f9327da..129f9327da 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java
index 25affcb0f8..25affcb0f8 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Alignment.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java
index f50391ade8..f50391ade8 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/BigExample.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java
index fba3b33214..fba3b33214 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Borders.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java
index 6b6434b3e1..6b6434b3e1 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellComments.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java
index 5ba1656ff1..5ba1656ff1 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CellTypes.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java
index 8994d6f17e..8994d6f17e 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
index b77e0d1474..b77e0d1474 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/CreateDateCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
index 149c908fac..149c908fac 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/EmbeddedObjects.java
diff --git a/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
index 0e71406b58..0e71406b58 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
index ca2a61e41e..ca2a61e41e 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/FrillsAndFills.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
index f53065de94..f53065de94 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HSSFReadWrite.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
index 96fa30a90f..96fa30a90f 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/HyperlinkFormula.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
index ae4a37ea13..ae4a37ea13 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/Hyperlinks.java
diff --git a/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
index 76d0172f82..76d0172f82 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java
index 16114b2d63..16114b2d63 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/MergedCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
index 487668da10..487668da10 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewLinesInCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java
index d2d8f31d0a..d2d8f31d0a 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewSheet.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
index 16c0e04de1..16c0e04de1 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/NewWorkbook.java
diff --git a/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
index 4603864d86..4603864d86 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
index eca55d4378..eca55d4378 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/OfficeDrawingWithGraphics.java
diff --git a/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
index 42f1b16fc3..42f1b16fc3 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
index e36b7ad26c..e36b7ad26c 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ReadWriteWorkbook.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
index db737cd5bb..db737cd5bb 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/RepeatingRowsAndColumns.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
index 54c3879e41..54c3879e41 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/SplitAndFreezePanes.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
index 0c87a335b3..0c87a335b3 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/WorkingWithFonts.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
index e958489cf7..e958489cf7 100644
--- a/examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hssf/usermodel/ZoomSheet.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java b/poi-examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java
index a6c0b64978..a6c0b64978 100644
--- a/examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hwmf/ROP2Table.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java b/poi-examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java
index 2e680a0aa3..2e680a0aa3 100644
--- a/examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hwmf/ROP3Table.java
diff --git a/examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java b/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
index 937da16a33..937da16a33 100644
--- a/examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/hwpf/Word2Forrest.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
index 6e102038b6..6e102038b6 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/AddDimensionedImage.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java
index af86efc724..af86efc724 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/AligningCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java
index a4865a32a3..a4865a32a3 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/BusinessPlan.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java
index ead4093ac4..ead4093ac4 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/CalendarDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java
index 6997a9e8fa..6997a9e8fa 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/CellStyleDetails.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
index 22eec9633a..22eec9633a 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/ConditionalFormats.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java
index f98d64b2c6..f98d64b2c6 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/DrawingBorders.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java
index 069aef0ebe..069aef0ebe 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/ExcelComparator.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
index 5cbc63be60..5cbc63be60 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/LinkedDropDownLists.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
index 3c52ecf253..3c52ecf253 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/LoadEmbedded.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java
index 28d1c648f0..28d1c648f0 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/LoanCalculator.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
index c041509d45..c041509d45 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/SSPerformanceTest.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java
index 77b55c826d..77b55c826d 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/TimesheetDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
index 1c39838cd3..1c39838cd3 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/ToCSV.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java
index 2675df181b..2675df181b 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/CalculateMortgage.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
index 4135c80904..4135c80904 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/CheckFunctionsSupported.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
index 49feb3f7aa..49feb3f7aa 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/SettingExternalFunction.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
index 939fd9ab9d..939fd9ab9d 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/UserDefinedFunctionExample.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
index 4e71ba8e65..4e71ba8e65 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/formula/mortgage-calculation.xls
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
index 4614a31031..4614a31031 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/HSSFHtmlHelper.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java
index 8747ad4c9d..8747ad4c9d 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/HtmlHelper.java
diff --git a/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
index 65c8878916..65c8878916 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
index 40bd504818..40bd504818 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/XSSFHtmlHelper.java
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css
index f056123780..f056123780 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/excelStyle.css
diff --git a/examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java
index 1b41376632..1b41376632 100644
--- a/examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/ss/html/package-info.java
diff --git a/examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java b/poi-examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
index 7d2d01b409..7d2d01b409 100644
--- a/examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/util/TempFileUtils.java
diff --git a/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
index 2d32c4d81b..2d32c4d81b 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
index 2c159fbb59..2c159fbb59 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/BarChartDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
index bdfc3ea498..bdfc3ea498 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/ChartFromScratch.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java
index 40a7c7f0d9..40a7c7f0d9 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/DataExtraction.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
index 77a438967f..77a438967f 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/DoughnutChartFromScratch.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
index 9fcf312011..9fcf312011 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/LinkVideoToPptx.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java
index 89ae0b1aa9..89ae0b1aa9 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/MergePresentations.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
index 5f3d6470c8..5f3d6470c8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/PieChartDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java
index d1b4768a1c..d1b4768a1c 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial1.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java
index 78afd7015f..78afd7015f 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial2.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java
index 420605ee75..420605ee75 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial3.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java
index a39e9030d8..a39e9030d8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial4.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java
index cc459a17bb..cc459a17bb 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial5.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java
index 1648e21acf..1648e21acf 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial6.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java
index d617de8dbc..d617de8dbc 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/Tutorial7.java
diff --git a/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
index 22c7b86ab8..22c7b86ab8 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx b/poi-examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx
index e4d2613046..e4d2613046 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/bar-chart-template.pptx
diff --git a/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
index 40b6959c2c..40b6959c2c 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx b/poi-examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx
index 33d28e154c..33d28e154c 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/pie-chart-template.pptx
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java
index 2d384a8389..2d384a8389 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step1.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java b/poi-examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java
index 68fcf14f5c..68fcf14f5c 100644
--- a/examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xslf/tutorial/Step2.java
diff --git a/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
index d61b4adb38..d61b4adb38 100644
--- a/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
diff --git a/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
index 96ba25e396..96ba25e396 100644
--- a/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
diff --git a/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
index a9772b00ba..a9772b00ba 100644
--- a/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
diff --git a/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
index 9c53c4ee0b..9c53c4ee0b 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
index f131e5b6e8..f131e5b6e8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/streaming/HybridStreaming.java
diff --git a/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
index 6c29813edd..6c29813edd 100644
--- a/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
diff --git a/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
index f991047db7..f991047db7 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java
index 17a92d3d8c..17a92d3d8c 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/AligningCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
index 32329f2c29..32329f2c29 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/BarAndLineChart.java
diff --git a/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
index 8c68fe87a7..8c68fe87a7 100644
--- a/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
diff --git a/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
index 574458f7be..574458f7be 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
index fa06960bfc..fa06960bfc 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CalendarDemo.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java
index eb5757779c..eb5757779c 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CellComments.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java
index 36e93dec2f..36e93dec2f 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateCell.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
index 991dd2f71a..991dd2f71a 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
index 53951d0ebd..53951d0ebd 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreatePivotTable2.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java
index 7e1d56ad00..7e1d56ad00 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateTable.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
index 03d88d67ef..03d88d67ef 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/CreateUserDefinedDataFormats.java
diff --git a/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
index ebc04a4d33..ebc04a4d33 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
index b4af95c5ae..b4af95c5ae 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/EmbeddedObjects.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
index a80916148a..a80916148a 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ExcelChartWithTargetLine.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
index baf462ce32..baf462ce32 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FillsAndColors.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
index 389e87fd0b..389e87fd0b 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/FitSheetToOnePage.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
index 946ae50fd4..946ae50fd4 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HeadersAndFooters.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
index 519631960e..519631960e 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/HyperlinkExample.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java
index 0b49927977..0b49927977 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/IterateCells.java
diff --git a/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
index 724d3e2608..724d3e2608 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
index 1ca5c34307..1ca5c34307 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/LoadPasswordProtectedXlsx.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java
index 22695c53fe..22695c53fe 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/MergingCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
index 8064260dd8..8064260dd8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/NewLinesInCells.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java
index 09f87cd5fa..09f87cd5fa 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/Outlining.java
diff --git a/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
index a5ce3c84ae..a5ce3c84ae 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
index ef6d9470c7..ef6d9470c7 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SelectedSheet.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
index 92d1f4ce6d..92d1f4ce6d 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/ShiftRows.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
index 4a8afee879..4a8afee879 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/SplitAndFreezePanes.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
index 9bb43f96fc..9bb43f96fc 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkbookProperties.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
index 5ffa54aab8..5ffa54aab8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithBorders.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
index a40ae57f42..a40ae57f42 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithFonts.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
index a43c5125a3..a43c5125a3 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPageSetup.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
index 555bc513d8..555bc513d8 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithPictures.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
index 43376fa1f6..43376fa1f6 100644
--- a/examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xssf/usermodel/WorkingWithRichText.java
diff --git a/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
index d26907c30e..d26907c30e 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
index 39c9d0812e..39c9d0812e 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/BetterHeaderFooterExample.java
diff --git a/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
index 889ff30fb1..889ff30fb1 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
index 70d2b7e588..70d2b7e588 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/HeaderFooterTable.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
index 57515545cf..57515545cf 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocument.java
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
index 659f6b6f39..659f6b6f39 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleDocumentWithHeader.java
diff --git a/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
index 1f996cfd1f..1f996cfd1f 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
index 4b9e51e1d1..4b9e51e1d1 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/SimpleTable.java
diff --git a/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
index faf31b3ded..faf31b3ded 100644
--- a/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
diff --git a/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
index 22c7b86ab8..22c7b86ab8 100644
--- a/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
diff --git a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
index ddd57ef0a3..ddd57ef0a3 100644
--- a/examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
+++ b/poi-examples/src/main/java/org/apache/poi/examples/xwpf/usermodel/bar-chart-template.docx
diff --git a/poi-examples/src/main/java9/module-info.class b/poi-examples/src/main/java9/module-info.class
new file mode 100644
index 0000000000..99c4f271f9
--- /dev/null
+++ b/poi-examples/src/main/java9/module-info.class
diff --git a/examples/src/main/java9/module-info.java b/poi-examples/src/main/java9/module-info.java
index 68b580e3ee..68b580e3ee 100644
--- a/examples/src/main/java9/module-info.java
+++ b/poi-examples/src/main/java9/module-info.java
diff --git a/examples/src/main/jsp/HSSFExample.jsp b/poi-examples/src/main/jsp/HSSFExample.jsp
index 4dd0a4f4e5..4dd0a4f4e5 100644
--- a/examples/src/main/jsp/HSSFExample.jsp
+++ b/poi-examples/src/main/jsp/HSSFExample.jsp
diff --git a/examples/src/main/ruby/Makefile b/poi-examples/src/main/ruby/Makefile
index a298da3296..a298da3296 100644
--- a/examples/src/main/ruby/Makefile
+++ b/poi-examples/src/main/ruby/Makefile
diff --git a/examples/src/main/ruby/Poi4R.i b/poi-examples/src/main/ruby/Poi4R.i
index 2f72ce9948..2f72ce9948 100644
--- a/examples/src/main/ruby/Poi4R.i
+++ b/poi-examples/src/main/ruby/Poi4R.i
diff --git a/examples/src/main/ruby/cpp/RubyIO.cpp b/poi-examples/src/main/ruby/cpp/RubyIO.cpp
index d4a4638cf0..d4a4638cf0 100644
--- a/examples/src/main/ruby/cpp/RubyIO.cpp
+++ b/poi-examples/src/main/ruby/cpp/RubyIO.cpp
diff --git a/examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java b/poi-examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java
index e23a0a7d39..e23a0a7d39 100644
--- a/examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java
+++ b/poi-examples/src/main/ruby/java/org/apache/poi/RubyOutputStream.java
diff --git a/examples/src/main/ruby/tests/tc_base_tests.rb b/poi-examples/src/main/ruby/tests/tc_base_tests.rb
index 33492c7ab7..33492c7ab7 100644
--- a/examples/src/main/ruby/tests/tc_base_tests.rb
+++ b/poi-examples/src/main/ruby/tests/tc_base_tests.rb
diff --git a/examples/src/main/ruby/tests/tc_gc.rb b/poi-examples/src/main/ruby/tests/tc_gc.rb
index 82c3c2b132..82c3c2b132 100644
--- a/examples/src/main/ruby/tests/tc_gc.rb
+++ b/poi-examples/src/main/ruby/tests/tc_gc.rb
diff --git a/examples/src/main/ruby/tests/ts_all.rb b/poi-examples/src/main/ruby/tests/ts_all.rb
index ef50ad5d6d..ef50ad5d6d 100644
--- a/examples/src/main/ruby/tests/ts_all.rb
+++ b/poi-examples/src/main/ruby/tests/ts_all.rb
diff --git a/examples/src/main/scala/XSSFMain.scala b/poi-examples/src/main/scala/XSSFMain.scala
index 3365c903ca..3365c903ca 100644
--- a/examples/src/main/scala/XSSFMain.scala
+++ b/poi-examples/src/main/scala/XSSFMain.scala
diff --git a/examples/src/main/scala/build.sbt b/poi-examples/src/main/scala/build.sbt
index 598dc28951..598dc28951 100644
--- a/examples/src/main/scala/build.sbt
+++ b/poi-examples/src/main/scala/build.sbt
diff --git a/examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java b/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
index 6863fc9bbe..6863fc9bbe 100644
--- a/examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
+++ b/poi-examples/src/test/java/org/apache/poi/integration/TestXLSX2CSV.java
diff --git a/poi-excelant/build.gradle b/poi-excelant/build.gradle
new file mode 100644
index 0000000000..4c2b063f32
--- /dev/null
+++ b/poi-excelant/build.gradle
@@ -0,0 +1,234 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+import java.util.regex.Pattern
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String TEST9_SRC = 'src/test/java9'
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+    test {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
+    }
+}
+
+configurations {
+    tests
+}
+
+dependencies {
+    api 'org.apache.ant:ant:1.10.9'
+
+    api project(':poi-ooxml')
+    api project(':poi-scratchpad')
+    api project(path: ':poi-ooxml', configuration: 'archives')
+    api project(path: ':poi-scratchpad', configuration: 'archives')
+
+    testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
+    testImplementation project(path: ':poi', configuration: 'tests')
+    testImplementation project(path: ':poi-ooxml', configuration: 'tests')
+    testImplementation project(path: ':poi-scratchpad', configuration: 'tests')
+    testImplementation 'com.google.guava:guava:30.0-jre'
+}
+
+final String MODULE_NAME = 'org.apache.poi.excelant'
+final Pattern MODULE_NOT_REGEX = ~'((poi|poi-ooxml|poi-scratchpad)[/\\\\][^/\\\\]+$|batik-script)'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+
+final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-ooxml-lite-agent-${project.version}.jar"
+final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
+final String OOXML_LITE_JAR = "../build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${project.version}.jar"
+final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava', ':poi-ooxml:jar', ':poi-scratchpad:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    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
+    ]
+}
+
+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'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(TEST9_OUT + VERSIONS9)
+    source = file(TEST9_SRC)
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(TEST_MODULE_PATH).asPath
+    ]
+    classpath = files()
+}
+
+
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+// 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) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
+
+    classifier 'tests'
+    // ignore second module-info.class from main
+    duplicatesStrategy = 'exclude'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }
+
+    from sourceSets.test.output + sourceSets.main.output
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+sourcesJar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+}
+
+javadoc {
+//    fails currently, need to fix the sources
+    failOnError = false
+//    if(JavaVersion.current().isJava9Compatible()) {
+//        options.addBooleanOption('html5', true)
+//    }
+}
+
+artifacts {
+    tests testJar
+}
+
+test {
+    dependsOn { testJar }
+
+    useJUnitPlatform()
+
+    doFirst {
+        jvmArgs = [
+            '-Djava.io.tmpdir=build',
+            '-DPOI.testdata.path=../test-data',
+            '-Djava.awt.headless=true',
+            '-Djava.locale.providers=JRE,CLDR',
+            '-Duser.language=en',
+            '-Duser.country=US',
+            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
+            "-Dversion.id=${project.version}",
+            '-ea',
+            "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3',
+            // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
+        ]
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            jvmArgs += [
+                '-Dsun.reflect.debugModuleAccessChecks=true',
+                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
+                '--illegal-access=warn',
+                '--add-modules', MODULE_NAME,
+
+                // 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=ALL-UNNAMED',
+                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                '--module-path', '../build/dist/maven/poi-excelant-tests:' + files(TEST_MODULE_PATH).asPath,
+            ]
+        }
+    }
+}
+
+publishing {
+    publications {
+        POI(MavenPublication) {
+            artifactId project.archivesBaseName
+
+            from components.java
+
+            pom {
+                name = 'Apache POI - API based on OPC and OOXML schemas'
+                description = 'Apache POI - Java API To Access Microsoft Format Files'
+            }
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
index eb446dfde6..eb446dfde6 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntEvaluateCell.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
index 75892aa738..75892aa738 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntHandlerTask.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
index 0739ef5833..0739ef5833 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntPrecision.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java
index e62f0623d9..e62f0623d9 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSet.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
index 2451a61e68..2451a61e68 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetDoubleCell.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
index 8dc599b104..8dc599b104 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetFormulaCell.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
index e1ab047fbf..e1ab047fbf 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntSetStringCell.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
index 4fc7a80508..4fc7a80508 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTask.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
index 2fd45cab15..2fd45cab15 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntTest.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
index f96a01f996..f96a01f996 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunction.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
index c8db7008d6..c8db7008d6 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/IExcelAntWorkbookHandler.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
index 4eecd4faeb..4eecd4faeb 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntEvaluationResult.java
diff --git a/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
index ee3f443228..ee3f443228 100644
--- a/excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
+++ b/poi-excelant/src/main/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtil.java
diff --git a/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
index 113f0390f7..113f0390f7 100644
--- a/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
diff --git a/poi-excelant/src/main/java9/module-info.class b/poi-excelant/src/main/java9/module-info.class
new file mode 100644
index 0000000000..9d9c4c142d
--- /dev/null
+++ b/poi-excelant/src/main/java9/module-info.class
diff --git a/excelant/src/main/java9/module-info.java b/poi-excelant/src/main/java9/module-info.java
index 43b64560a7..43b64560a7 100644
--- a/excelant/src/main/java9/module-info.java
+++ b/poi-excelant/src/main/java9/module-info.java
diff --git a/excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml b/poi-excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml
index af13cc649b..af13cc649b 100644
--- a/excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml
+++ b/poi-excelant/src/main/resources/org/apache/poi/ss/excelant/antlib.xml
diff --git a/excelant/src/poi-ant-contrib/java/Bytes2Mega.java b/poi-excelant/src/poi-ant-contrib/java/Bytes2Mega.java
index 3bdafe18f5..3bdafe18f5 100644
--- a/excelant/src/poi-ant-contrib/java/Bytes2Mega.java
+++ b/poi-excelant/src/poi-ant-contrib/java/Bytes2Mega.java
diff --git a/excelant/src/poi-ant-contrib/java/Junit5Progress.java b/poi-excelant/src/poi-ant-contrib/java/Junit5Progress.java
index 8e87ef064f..8e87ef064f 100644
--- a/excelant/src/poi-ant-contrib/java/Junit5Progress.java
+++ b/poi-excelant/src/poi-ant-contrib/java/Junit5Progress.java
diff --git a/excelant/src/poi-ant-contrib/java/NextRelease.java b/poi-excelant/src/poi-ant-contrib/java/NextRelease.java
index c0b6b3d864..c0b6b3d864 100644
--- a/excelant/src/poi-ant-contrib/java/NextRelease.java
+++ b/poi-excelant/src/poi-ant-contrib/java/NextRelease.java
diff --git a/excelant/src/poi-ant-contrib/java/PropertyReset.java b/poi-excelant/src/poi-ant-contrib/java/PropertyReset.java
index 4f569e67fd..4f569e67fd 100644
--- a/excelant/src/poi-ant-contrib/java/PropertyReset.java
+++ b/poi-excelant/src/poi-ant-contrib/java/PropertyReset.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
index 73eb984db7..73eb984db7 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/CalculateMortgageFunction.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
index 48086fc22d..48086fc22d 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/ExcelAntUserDefinedFunctionTestHelper.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
index d6a3a74b7d..d6a3a74b7d 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/MockExcelAntWorkbookHandler.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
index dbf096ca26..2a2b36b827 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestBuildFile.java
@@ -51,7 +51,7 @@ public class TestBuildFile {
 
     @BeforeEach
     void setUp() {
-        String filename = TestBuildFile.getDataDir() + "/../excelant/src/test/resources/tests.xml";
+        String filename = TestBuildFile.getDataDir() + "/../poi-excelant/src/test/resources/tests.xml";
         int logLevel = Project.MSG_DEBUG;
 
         logBuffer = new StringBuilder();
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
index 2902144fde..2902144fde 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntPrecision.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java
index 42f6cd256c..42f6cd256c 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSet.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
index 45c4f53635..45c4f53635 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntSetDoubleCell.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
index 52b580ac6f..52b580ac6f 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/TestExcelAntUserDefinedFunction.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
index 16189f1d50..16189f1d50 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/ExcelAntWorkbookUtilTestHelper.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
index dcb044a2eb..dcb044a2eb 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntEvaluationResult.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
index 4f46084c6a..4f46084c6a 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtil.java
diff --git a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
index 26e700fa8b..26e700fa8b 100644
--- a/excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
+++ b/poi-excelant/src/test/java/org/apache/poi/ss/excelant/util/TestExcelAntWorkbookUtilFactory.java
diff --git a/poi-excelant/src/test/java9/module-info.class b/poi-excelant/src/test/java9/module-info.class
new file mode 100644
index 0000000000..c4cef92e79
--- /dev/null
+++ b/poi-excelant/src/test/java9/module-info.class
diff --git a/excelant/src/test/java9/module-info.java b/poi-excelant/src/test/java9/module-info.java
index a26d9bd04d..a26d9bd04d 100644
--- a/excelant/src/test/java9/module-info.java
+++ b/poi-excelant/src/test/java9/module-info.java
diff --git a/excelant/src/test/resources/tests.xml b/poi-excelant/src/test/resources/tests.xml
index 0882195551..0882195551 100644
--- a/excelant/src/test/resources/tests.xml
+++ b/poi-excelant/src/test/resources/tests.xml
diff --git a/poi-integration/build.gradle b/poi-integration/build.gradle
new file mode 100644
index 0000000000..b4e72eba78
--- /dev/null
+++ b/poi-integration/build.gradle
@@ -0,0 +1,171 @@
+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
+   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.
+==================================================================== */
+
+final String TEST9_SRC = 'src/test/java9'
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    test {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
+    }
+}
+
+configurations {
+    tests
+}
+
+
+dependencies {
+    testImplementation 'org.apache.ant:ant:1.10.9'
+    testImplementation 'org.apache.commons:commons-collections4:4.4'
+    testImplementation 'com.google.guava:guava:30.0-jre'
+
+    testImplementation project(':poi-ooxml')
+    testImplementation project(':poi-scratchpad')
+    testImplementation project(':poi-examples')
+    testImplementation project(path:':poi-examples', configuration:'archives')
+    testImplementation project(path:':poi', configuration:'tests')
+    testImplementation project(path:':poi-ooxml', configuration:'tests')
+    testImplementation project(path:':poi-scratchpad', configuration:'tests')
+    testImplementation project(path: ':poi-ooxml-lite-agent', configuration: 'archives')
+}
+
+final String MODULE_NAME = 'org.apache.poi.stress'
+final Pattern MODULE_NOT_REGEX = ~'((poi|poi-scratchpad|poi-ooxml)[/\\\\][^/\\\\]+$|batik-script)'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+
+final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-ooxml-lite-agent-${project.version}.jar"
+final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
+final String OOXML_LITE_JAR = "../build/dist/maven/poi-ooxml-lite/poi-ooxml-lite-${project.version}.jar"
+final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+task compileTest9(type: JavaCompile) {
+    dependsOn 'compileTestJava', ':poi-ooxml:testJar', ':poi-scratchpad:testJar', ':poi-examples:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(TEST9_OUT + VERSIONS9)
+    source = file(TEST9_SRC)
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(TEST_MODULE_PATH).asPath
+    ]
+    classpath = files()
+}
+
+
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+// 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) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
+
+    classifier 'tests'
+    // ignore second module-info.class from main
+    duplicatesStrategy = 'exclude'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }
+
+    from sourceSets.test.output + sourceSets.main.output
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+artifacts {
+    tests testJar
+}
+
+test {
+    // exclude these from the normal test-run
+    exclude '**/*FileHandler.class'
+
+    dependsOn { testJar }
+
+    useJUnitPlatform()
+
+    doFirst {
+        jvmArgs = [
+            '-Djava.io.tmpdir=build',
+            '-DPOI.testdata.path=../test-data',
+            '-Djava.awt.headless=true',
+            '-Djava.locale.providers=JRE,CLDR',
+            '-Duser.language=en',
+            '-Duser.country=US',
+            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
+            "-Dversion.id=${project.version}",
+            '-ea',
+            "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
+
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3'
+            // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
+        ]
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            jvmArgs += [
+                '-Dsun.reflect.debugModuleAccessChecks=true',
+                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
+                '--illegal-access=warn',
+
+                '--add-modules', MODULE_NAME,
+
+                // 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=ALL-UNNAMED',
+                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                '--module-path', '../build/dist/maven/poi-integration-tests:' + files(TEST_MODULE_PATH).asPath,
+            ]
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/integrationtest/build.xml b/poi-integration/build.xml
index f1b139a940..f1b139a940 100644
--- a/integrationtest/build.xml
+++ b/poi-integration/build.xml
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
index 01a4ebc82d..01a4ebc82d 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/AbstractFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java b/poi-integration/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java
index 5d63d1f5a1..5d63d1f5a1 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/BaseIntegrationTest.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java b/poi-integration/src/test/java/org/apache/poi/stress/ExcInfo.java
index c9241cb0f7..c9241cb0f7 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/ExcInfo.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/ExcInfo.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/FileHandler.java
index 62e5d81ced..62e5d81ced 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/FileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/FileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java b/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerFactory.java
index 8be52b35a6..8be52b35a6 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerFactory.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerFactory.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java b/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
index aa3c827f1f..aa3c827f1f 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/FileHandlerKnown.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HDGFFileHandler.java
index 1d2ca65d4c..1d2ca65d4c 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HDGFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HDGFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HMEFFileHandler.java
index 34cf9ee5b9..34cf9ee5b9 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HMEFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HMEFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
index 419840d696..419840d696 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HPBFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
index 088f77ef45..088f77ef45 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HPSFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
index fc82b6612d..fc82b6612d 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HSLFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HSMFFileHandler.java
index 8a21781bc4..8a21781bc4 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HSMFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HSMFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HSSFFileHandler.java
index 9ee54b4790..9ee54b4790 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HSSFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HSSFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/HWPFFileHandler.java
index da07a9b87b..da07a9b87b 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HWPFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HWPFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java b/poi-integration/src/test/java/org/apache/poi/stress/HeapDump.java
index 7928975f56..7928975f56 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/HeapDump.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/HeapDump.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/OPCFileHandler.java
index c4f5485806..c4f5485806 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/OPCFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/OPCFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/OWPFFileHandler.java
index 7ad20d0585..7ad20d0585 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/OWPFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/OWPFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
index b92f91f5f9..b92f91f5f9 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/POIFSFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
index 930c904a77..930c904a77 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/POIXMLDocumentHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
index 9a1defbf21..9a1defbf21 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/SlideShowHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/SlideShowHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
index dcee603bf2..dcee603bf2 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/SpreadsheetHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/StressMap.java b/poi-integration/src/test/java/org/apache/poi/stress/StressMap.java
index f69fbfbf4f..f69fbfbf4f 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/StressMap.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/StressMap.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
index 55777d12ee..55777d12ee 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/TestAllFiles.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/XDGFFileHandler.java
index d588e4b496..d588e4b496 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/XDGFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XDGFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/XSLFFileHandler.java
index 7a5aebd4c4..7a5aebd4c4 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/XSLFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XSLFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
index 1bc23c49ed..1bc23c49ed 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XSSFBFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
index beb3a8edf8..beb3a8edf8 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XSSFFileHandler.java
diff --git a/integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java b/poi-integration/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
index 0970d4fa1a..0970d4fa1a 100644
--- a/integrationtest/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
+++ b/poi-integration/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
diff --git a/poi-integration/src/test/java9/module-info.class b/poi-integration/src/test/java9/module-info.class
new file mode 100644
index 0000000000..8703347af7
--- /dev/null
+++ b/poi-integration/src/test/java9/module-info.class
diff --git a/integrationtest/src/test/java9/module-info.java b/poi-integration/src/test/java9/module-info.java
index 782edf74db..782edf74db 100644
--- a/integrationtest/src/test/java9/module-info.java
+++ b/poi-integration/src/test/java9/module-info.java
diff --git a/integrationtest/src/test/resources/log4j2-test.xml b/poi-integration/src/test/resources/log4j2-test.xml
index 637a19d420..637a19d420 100644
--- a/integrationtest/src/test/resources/log4j2-test.xml
+++ b/poi-integration/src/test/resources/log4j2-test.xml
diff --git a/poi-ooxml-full/build.gradle b/poi-ooxml-full/build.gradle
new file mode 100644
index 0000000000..cc9fc88b53
--- /dev/null
+++ b/poi-ooxml-full/build.gradle
@@ -0,0 +1,179 @@
+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
+   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.
+==================================================================== */
+
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String MODULE_NAME = 'org.apache.poi.ooxml.schemas'
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String VERSIONS9 = 'META-INF/versions/9'
+final String BEANS_SRC = "${buildDir}/generated-sources"
+final String BEANS_RES = "${buildDir}/generated-resources"
+
+sourceSets {
+    main {
+        // TypeSystemHolder.class is in the resources
+        output.dir(BEANS_RES, builtBy: 'generate_beans')
+        compileClasspath += files(BEANS_RES)
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+        java {
+            srcDirs = [BEANS_SRC]
+        }
+    }
+}
+
+dependencies {
+    api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+//    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+    runtimeOnly "org.apache.logging.log4j:log4j-core:${log4jVersion}"
+}
+
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+
+compileJava {
+    dependsOn 'generate_beans'
+    sourceCompatibility = 8
+    targetCompatibility = 8
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(JAVA9_OUT + VERSIONS9)
+    source = file(JAVA9_SRC)
+    classpath = files()
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.asPath}",
+        '--module-path', files(MAIN_MODULE_PATH).asPath
+    ]
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+task copy_xsds(type: Copy) {
+    from ('src/main/xmlschema/org/apache/poi/xdgf')
+    from ('src/main/xmlschema/org/apache/poi/schemas') {
+        include 'XAdES*.xsd', '*.xsdconfig', 'xmldsig*.xsd', 'ooxmlSchemas.xsdconfig', 'markup-compatibility.xsd', 'vmlDrawing.xsd'
+        exclude '*.zip'
+    }
+    from ('src/main/xmlschema/org/apache/poi/poifs/crypt') {
+        include 'signatureInfo.xsd'
+    }
+    from (zipTree('src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip'))
+    from (zipTree('src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip')) {
+        include 'opc-digSig.xsd', 'opc-relationships.xsd'
+    }
+    into 'build/xsds'
+}
+
+task generate_beans(dependsOn: copy_xsds) {
+    // incremental feature is not working ...
+    inputs.files fileTree(dir: 'build/xsds', include: '*.xsd')
+    outputs.file 'build/generated-resources/org/apache/poi/schemas/ooxml/system/ooxml/TypeSystemHolder.class'
+
+    doLast {
+        ant.uptodate(
+            property: 'xmlbeans_uptodate',
+            targetfile: 'build/generated-resources/org/apache/poi/schemas/ooxml/system/ooxml/TypeSystemHolder.class'
+        ) {
+            srcFiles(dir: 'build/xsds', includes: '*.xsd')
+        }
+
+        ant.taskdef(
+            name: 'xmlbean',
+            classname: 'org.apache.xmlbeans.impl.tool.XMLBean',
+            classpath: sourceSets.main.runtimeClasspath.asPath
+        )
+
+        if (!ant.properties.xmlbeans_uptodate) {
+            ant.xmlbean(
+                schema: 'build/xsds',
+                srcgendir: 'build/generated-sources',
+                classgendir: 'build/generated-resources',
+                destfile: 'build/xsds.jar',
+                srconly: true,
+                failonerror: true,
+                fork: true,
+                memoryMaximumSize: '1536m',
+                typesystemname: 'ooxml',
+                repackage: 'org.apache.xmlbeans.metadata:org.apache.poi.schemas.ooxml'
+            ) {
+                classpath = sourceSets.main.runtimeClasspath.asPath
+            }
+        }
+    }
+}
+
+tasks.withType(Jar) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+}
+
+task sourceJar(type: Jar) {
+    classifier 'sources'
+    from sourceSets.main.allJava
+}
+
+jar {
+    dependsOn 'sourceJar'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes ('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+publishing {
+    publications {
+        POI(MavenPublication) {
+            artifactId "${project.archivesBaseName}"
+
+            from components.java
+            artifact tasks.sourceJar
+
+            pom {
+                name = 'Apache POI - OOXML schemas (full)'
+                description =
+                    'XmlBeans generated from the Ecma supplied xsds (since POI 5.0.0, the 5th edition is used):\n' +
+                    '    https://www.ecma-international.org/publications/standards/Ecma-376.htm'
+            }
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/poi-ooxml-full/src/main/java9/module-info.class b/poi-ooxml-full/src/main/java9/module-info.class
new file mode 100644
index 0000000000..34e3970b88
--- /dev/null
+++ b/poi-ooxml-full/src/main/java9/module-info.class
diff --git a/ooxml-schema/src/ooxml-lite/java9/module-info.java b/poi-ooxml-full/src/main/java9/module-info.java
index 2559d369d8..f8e193e41e 100644
--- a/ooxml-schema/src/ooxml-lite/java9/module-info.java
+++ b/poi-ooxml-full/src/main/java9/module-info.java
@@ -29,6 +29,7 @@ open module org.apache.poi.ooxml.schemas {
     exports com.microsoft.schemas.office.excel;
     exports com.microsoft.schemas.office.office;
     exports com.microsoft.schemas.office.visio.x2012.main;
+    exports com.microsoft.schemas.office.word;
     exports com.microsoft.schemas.office.x2006.digsig;
     exports com.microsoft.schemas.vml;
     exports org.apache.poi.schemas.ooxml.system.ooxml;
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
index 7423c85de0..7423c85de0 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
index 73a27fa50a..73a27fa50a 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd
index 5b08560c3a..5b08560c3a 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
index c9474a0f3a..c9474a0f3a 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd
index 79ae888a0e..79ae888a0e 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
index 3a2bb2c8e9..3a2bb2c8e9 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd
index f7019f13f5..f7019f13f5 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/poifs/crypt/signatureInfo.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
index c416a662fa..c416a662fa 100755
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Strict.zip
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
index d6dcf4fbb9..d6dcf4fbb9 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OfficeOpenXML-XMLSchema-Transitional.zip
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
index 5c4f52cea7..5c4f52cea7 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/OpenPackagingConventions-XMLSchema.zip
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd
index 4b74692f85..4b74692f85 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdES.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd
index 8cb527978b..8cb527978b 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/XAdESv141.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd
index 6be17c06be..6be17c06be 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/markup-compatibility.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
index a567df5816..a567df5816 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/ooxmlSchemas.xsdconfig
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd
index ec37e6eaf6..ec37e6eaf6 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/vmlDrawing.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd
index df126b30e6..df126b30e6 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/schemas/xmldsig-core-schema.xsd
diff --git a/ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd
index eec0b68c09..eec0b68c09 100644
--- a/ooxml-schema/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd
+++ b/poi-ooxml-full/src/main/xmlschema/org/apache/poi/xdgf/visio.xsd
diff --git a/poi-ooxml-lite-agent/build.gradle b/poi-ooxml-lite-agent/build.gradle
new file mode 100644
index 0000000000..7b9204c8f3
--- /dev/null
+++ b/poi-ooxml-lite-agent/build.gradle
@@ -0,0 +1,89 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+}
+
+dependencies {
+    api 'net.bytebuddy:byte-buddy:1.10.19'
+    api 'net.bytebuddy:byte-buddy-agent:1.10.19'
+    api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+}
+
+final MODULE_NAME = 'org.apache.poi.ooxml_lite'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(JAVA9_OUT + VERSIONS9)
+    source = file(JAVA9_SRC)
+    classpath = files()
+    doFirst {
+        options.compilerArgs = [
+            '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
+            '--module-path', sourceSets.main.compileClasspath.asPath
+        ]
+    }
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes (
+            'Automatic-Module-Name' : MODULE_NAME,
+            'Multi-Release': 'true',
+            'Premain-Class' : 'org.apache.poi.ooxml.lite.OOXMLLiteAgent'
+        )
+    }
+}
+
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java b/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
index 64cec25ac6..64cec25ac6 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
+++ b/poi-ooxml-lite-agent/src/main/java/org/apache/poi/ooxml/lite/OOXMLLiteAgent.java
diff --git a/poi-ooxml-lite-agent/src/main/java9/module-info.class b/poi-ooxml-lite-agent/src/main/java9/module-info.class
new file mode 100644
index 0000000000..4623f875fc
--- /dev/null
+++ b/poi-ooxml-lite-agent/src/main/java9/module-info.class
diff --git a/ooxml/src/ooxml-lite-agent/java9/module-info.java b/poi-ooxml-lite-agent/src/main/java9/module-info.java
index 85184ca2b2..85184ca2b2 100644
--- a/ooxml/src/ooxml-lite-agent/java9/module-info.java
+++ b/poi-ooxml-lite-agent/src/main/java9/module-info.java
diff --git a/poi-ooxml-lite/build.gradle b/poi-ooxml-lite/build.gradle
new file mode 100644
index 0000000000..da40c6d1e8
--- /dev/null
+++ b/poi-ooxml-lite/build.gradle
@@ -0,0 +1,133 @@
+import java.util.function.Function
+import java.util.regex.Pattern
+import java.util.stream.Collectors
+
+/* ====================================================================
+   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.
+==================================================================== */
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+        resources {
+            srcDirs += project(':poi-ooxml-full').sourceSets.main.output.findAll{it =~ /.*(classes\/java\/main|generated-resources)$/}
+        }
+    }
+}
+
+dependencies {
+    api "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
+    implementation project(':poi-ooxml-full')
+    implementation project(path:':poi-integration', configuration:'tests')
+}
+
+final MODULE_NAME = 'org.apache.poi.ooxml.schemas'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
+
+task compileOoxmlLite() {
+    dependsOn ':poi-ooxml:build', ':poi-integration:build', ':poi-excelant:build'
+
+    File fileIn = file("${OOXML_LITE_REPORT}.clazz")
+    File fileOut = file("src/main/java9/module-info.java")
+
+    outputs.upToDateWhen{
+        ant.uptodate(property: "ooxmlLiteUnchanged", srcfile: fileIn.path, targetfile: fileOut.path)
+        ant.properties.ooxmlLiteUnchanged
+    }
+
+    doLast {
+        String header = fileOut.collect().findAll { !(it =~ /exports|}/) }.join('\n')
+
+        // generate module-info based on exported classes
+        String exports = fileIn.
+            collect { "    exports ${it.replaceAll('[/\\\\][^/\\\\]+$', '').replaceAll('[/\\\\]', '.')};" }.
+            findAll { !(it =~ /\.impl;$/) }.unique().sort().join('\n')
+
+        String content = header + '\n' + exports + '\n}'
+        if (fileOut.text != content) {
+            fileOut.write content
+        }
+    }
+}
+
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+compileJava.dependsOn 'compileOoxmlLite'
+
+task compileJava9(type: JavaCompile, dependsOn: 'compileJava') {
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(JAVA9_OUT + VERSIONS9)
+    source = file(JAVA9_SRC)
+    classpath = files()
+    doFirst {
+        options.compilerArgs = [
+            '--patch-module', "${MODULE_NAME}=${project(':poi-ooxml-full').sourceSets.main.output.asPath}",
+            '--module-path', files(MAIN_MODULE_PATH).asPath
+        ]
+    }
+}
+
+task cacheJava9(type: Copy, dependsOn: 'compileJava9') {
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+jar {
+    File clazzFile = file("${OOXML_LITE_REPORT}.clazz")
+    File xsbsFile = file("${OOXML_LITE_REPORT}.xsb")
+    if (clazzFile.exists() && xsbsFile.exists()) {
+        List clazz = clazzFile.collect { "${it}.class" }
+        List clazzInner = clazzFile.collect { "${it}\$*.class" }
+        List xsbs = xsbsFile.collect { "org/apache/poi/schemas/ooxml/system/ooxml/${it}.xsb" }
+        includes = clazz + clazzInner + xsbs + ['META-INF/versions/**', 'org/apache/poi/schemas/ooxml/element/**']
+    }
+
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    // ignore second module-info.class from poi-ooxml-full
+    // duplicatesStrategy = 'exclude'
+    includeEmptyDirs = false
+
+    manifest {
+        attributes('Automatic-Module-Name' : MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
diff --git a/poi-ooxml-lite/src/main/java9/module-info.class b/poi-ooxml-lite/src/main/java9/module-info.class
new file mode 100644
index 0000000000..34e3970b88
--- /dev/null
+++ b/poi-ooxml-lite/src/main/java9/module-info.class
diff --git a/ooxml-schema/src/ooxml-full/java9/module-info.java b/poi-ooxml-lite/src/main/java9/module-info.java
index 4600c9082a..f8e193e41e 100644
--- a/ooxml-schema/src/ooxml-full/java9/module-info.java
+++ b/poi-ooxml-lite/src/main/java9/module-info.java
@@ -22,42 +22,33 @@ open module org.apache.poi.ooxml.schemas {
     requires transitive org.apache.xmlbeans;
     requires java.xml;
 
-    exports org.apache.poi.schemas.ooxml.system.ooxml;
+
+
 
     exports com.microsoft.schemas.compatibility;
     exports com.microsoft.schemas.office.excel;
     exports com.microsoft.schemas.office.office;
-    exports com.microsoft.schemas.office.powerpoint;
     exports com.microsoft.schemas.office.visio.x2012.main;
     exports com.microsoft.schemas.office.word;
+    exports com.microsoft.schemas.office.x2006.digsig;
     exports com.microsoft.schemas.vml;
+    exports org.apache.poi.schemas.ooxml.system.ooxml;
+    exports org.apache.poi.schemas.vmldrawing;
+    exports org.etsi.uri.x01903.v13;
     exports org.openxmlformats.schemas.drawingml.x2006.chart;
-    exports org.openxmlformats.schemas.drawingml.x2006.chartDrawing;
-    exports org.openxmlformats.schemas.drawingml.x2006.diagram;
-    exports org.openxmlformats.schemas.drawingml.x2006.lockedCanvas;
     exports org.openxmlformats.schemas.drawingml.x2006.main;
     exports org.openxmlformats.schemas.drawingml.x2006.picture;
     exports org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing;
     exports org.openxmlformats.schemas.drawingml.x2006.wordprocessingDrawing;
-    exports org.openxmlformats.schemas.officeDocument.x2006.bibliography;
-    exports org.openxmlformats.schemas.officeDocument.x2006.characteristics;
     exports org.openxmlformats.schemas.officeDocument.x2006.customProperties;
-    exports org.openxmlformats.schemas.officeDocument.x2006.customXml;
     exports org.openxmlformats.schemas.officeDocument.x2006.docPropsVTypes;
     exports org.openxmlformats.schemas.officeDocument.x2006.extendedProperties;
     exports org.openxmlformats.schemas.officeDocument.x2006.math;
     exports org.openxmlformats.schemas.officeDocument.x2006.relationships;
+    exports org.openxmlformats.schemas.officeDocument.x2006.sharedTypes;
     exports org.openxmlformats.schemas.presentationml.x2006.main;
-    exports org.openxmlformats.schemas.schemaLibrary.x2006.main;
     exports org.openxmlformats.schemas.spreadsheetml.x2006.main;
     exports org.openxmlformats.schemas.wordprocessingml.x2006.main;
-
-    exports com.microsoft.schemas.office.x2006.digsig;
-    exports org.etsi.uri.x01903.v13;
-    exports org.etsi.uri.x01903.v14;
     exports org.openxmlformats.schemas.xpackage.x2006.digitalSignature;
-    exports org.openxmlformats.schemas.xpackage.x2006.relationships;
     exports org.w3.x2000.x09.xmldsig;
-
-    exports org.apache.poi.schemas.vmldrawing;
 }
\ No newline at end of file
diff --git a/poi-ooxml/build.gradle b/poi-ooxml/build.gradle
new file mode 100644
index 0000000000..5571000b27
--- /dev/null
+++ b/poi-ooxml/build.gradle
@@ -0,0 +1,284 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+import java.util.regex.Pattern
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String TEST9_SRC = 'src/test/java9'
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+    test {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
+    }
+}
+
+configurations {
+    all {
+        exclude group: 'xalan', module: 'xalan'
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            exclude group: 'xml-apis', module: 'xml-apis'
+        }
+    }
+
+    broken
+
+    tests
+}
+
+dependencies {
+    api project(':poi')
+    api project(':poi-ooxml-full')
+    api project(path: ':poi', configuration: 'archives')
+    api project(path: ':poi-ooxml-full', configuration: 'archives')
+
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    api "org.apache.commons:commons-compress:${commonsCompressVersion}"
+    api 'org.apache.santuario:xmlsec:2.2.1'
+    api "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
+    api 'com.github.virtuald:curvesapi:1.06'
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+
+    implementation "org.apache.xmlgraphics:batik-svggen:${batikVersion}"
+    implementation "org.apache.xmlgraphics:batik-bridge:${batikVersion}"
+    implementation "org.apache.xmlgraphics:batik-codec:${batikVersion}"
+    implementation "org.apache.xmlgraphics:batik-svgrasterizer:${batikVersion}"
+
+    api 'de.rototor.pdfbox:graphics2d:0.30'
+
+
+    testImplementation project(':poi-scratchpad')
+    testImplementation project(path:':poi', configuration:'tests')
+    testImplementation project(path:':poi-ooxml-lite-agent', configuration: 'archives')
+    testImplementation project(path:':poi-scratchpad', configuration:'tests')
+    testImplementation 'org.xmlunit:xmlunit-core:2.8.0'
+    testImplementation 'org.reflections:reflections:0.9.12'
+    testImplementation 'org.openjdk.jmh:jmh-core:1.26'
+    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
+    testImplementation 'com.google.guava:guava:30.0-jre'
+
+    broken "org.apache.xmlgraphics:batik-script:${batikVersion}"
+}
+
+final String MODULE_NAME = 'org.apache.poi.ooxml'
+final Pattern MODULE_NOT_REGEX = ~'(poi[/\\\\][^/\\\\]+$|batik-script)'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique() + files("build/brokenJars")
+
+final String OOXML_LITE_AGENT = "../build/dist/maven/poi-ooxml-lite-agent/poi-ooxml-lite-agent-${project.version}.jar"
+final String OOXML_LITE_REPORT = '../build/ooxml-lite-report'
+final String OOXML_LITE_INCLUDES = "^(com/microsoft/schemas|org/(etsi|openxmlformats|w3/)|org/apache/poi/schemas)"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
+
+
+compileJava {
+    dependsOn 'fixBatik'
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava', ':poi:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    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
+    ]
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+task compileTest9(type: JavaCompile) {
+    dependsOn 'compileTestJava', ':poi:testJar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(TEST9_OUT + VERSIONS9)
+    source = file(TEST9_SRC)
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(TEST_MODULE_PATH).asPath
+    ]
+    classpath = files()
+}
+
+
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+// 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) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
+
+    classifier 'tests'
+    // ignore second module-info.class from main
+    duplicatesStrategy = 'exclude'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }
+
+    from sourceSets.test.output + sourceSets.main.output
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+
+sourcesJar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+    exclude 'META-INF/services/**'
+}
+
+// based on https://github.com/moditect/moditect-gradle-plugin/issues/12
+task fixBatik(type: Zip) {
+    ant.mkdir(dir: "${buildDir}/brokenJars")
+    archiveFileName = "batik-script-${batikVersion}.jar"
+    destinationDirectory = file("${buildDir}/brokenJars")
+    from zipTree(configurations.broken.files.find{ f -> f.name.startsWith("batik-script") })
+    filesMatching("**/org.apache.batik.script.InterpreterFactory") {
+        it.filter{ it2 -> it2.contains("Rhino") ? "#" + it2 : it2 }
+    }
+}
+
+javadoc {
+//    fails currently, need to fix the sources
+    failOnError = false
+//    if(JavaVersion.current().isJava9Compatible()) {
+//        options.addBooleanOption('html5', true)
+//    }
+}
+
+artifacts {
+    tests testJar
+}
+
+test {
+    // for some reason catching the OOM does not work when run from Gradle
+    exclude '**/MemoryUsage.class'
+
+    dependsOn 'testJar'
+
+    useJUnitPlatform()
+
+    doFirst {
+        jvmArgs = [
+            '-Djava.io.tmpdir=build',
+            '-DPOI.testdata.path=../test-data',
+            '-Djava.awt.headless=true',
+            '-Djava.locale.providers=JRE,CLDR',
+            '-Duser.language=en',
+            '-Duser.country=US',
+            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
+            "-Dversion.id=${project.version}",
+            '-ea',
+            "-javaagent:${OOXML_LITE_AGENT}=${OOXML_LITE_REPORT}|${OOXML_LITE_INCLUDES}",
+
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3'
+            // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
+        ]
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            jvmArgs += [
+                '-Dsun.reflect.debugModuleAccessChecks=true',
+                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
+                '--illegal-access=warn',
+
+                '--add-modules', MODULE_NAME,
+
+                // 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=ALL-UNNAMED',
+                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                '--module-path', '../build/dist/maven/poi-ooxml-tests:' + files(TEST_MODULE_PATH).asPath,
+            ]
+        }
+    }
+}
+
+publishing {
+    publications {
+        POI(MavenPublication) {
+            artifactId project.archivesBaseName
+
+            from components.java
+
+            pom {
+                name = 'Apache POI - API based on OPC and OOXML schemas'
+                description = 'Apache POI - Java API To Access Microsoft Format Files'
+            }
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java
index 216ff803e6..216ff803e6 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocument.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
index 4696e71de9..4696e71de9 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLDocumentPart.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java
index d002fa0e84..d002fa0e84 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLException.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java
index 0e91da3be9..0e91da3be9 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java
index ca28affdbf..ca28affdbf 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
index 5bf576d4e0..5bf576d4e0 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
index 4a7a2b1b7b..4a7a2b1b7b 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/POIXMLTypeLoader.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java
index b585be4b00..b585be4b00 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLLister.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
index fd48c05462..fd48c05462 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
index e56e91957d..e56e91957d 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/CommandLineTextExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
index 8cad08609d..8cad08609d 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLExtractorFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
index 6df03370e2..6df03370e2 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLPropertiesTextExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
index eb235fa6aa..eb235fa6aa 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/extractor/POIXMLTextExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java
index f5a2b13996..f5a2b13996 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/DocumentHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java
index 8634862bb7..8634862bb7 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/IdentifierManager.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java
index d6e020bcc0..d6e020bcc0 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/POIXMLUnits.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
index d357ab1f7f..d357ab1f7f 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java
index 1d6b7e515d..1d6b7e515d 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/SAXHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java
index c3f00bd034..c3f00bd034 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/TransformerHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java
index 6677f01fb9..6677f01fb9 100644
--- a/ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/XPathHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
index 0cf0cfbc19..0cf0cfbc19 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidFormatException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
index 7a8338ed81..7a8338ed81 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
index bd6c6378ba..bd6c6378ba 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/NotOfficeXmlFileException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
index 61d8c8cd95..61d8c8cd95 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/ODFNotOfficeXmlFileException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
index 2f82d1100a..2f82d1100a 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OLE2NotOfficeXmlFileException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
index 4c7430df5b..4c7430df5b 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
index 40086aa9fc..40086aa9fc 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/OpenXML4JRuntimeException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
index e469ace568..e469ace568 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
index cd7b456941..cd7b456941 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/CertificateEmbeddingOption.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
index 14c0f1b985..14c0f1b985 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ContentTypes.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
index 6e11336bf5..6e11336bf5 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java
index 2568822285..2568822285 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageAccess.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
index d1adc519fc..d1adc519fc 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageNamespaces.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
index 81519ff2a5..81519ff2a5 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePart.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
index a9d7b4589c..a9d7b4589c 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartCollection.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
index d2d38b06d5..d2d38b06d5 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagePartName.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java
index 6d832090cd..6d832090cd 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
index bec1d00025..bec1d00025 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
index 07f8b98a3c..07f8b98a3c 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipCollection.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
index c328849e08..c328849e08 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackageRelationshipTypes.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
index bd1bce1b7e..bd1bce1b7e 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
index 87c424df54..87c424df54 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/RelationshipSource.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java
index af31eb3ab3..af31eb3ab3 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/StreamHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java
index 59f45f5386..59f45f5386 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/TargetMode.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
index 67e7c44567..67e7c44567 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackage.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
index 3e1e977f2b..3e1e977f2b 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/ZipPackagePart.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
index 2e186be949..2e186be949 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
index 143e958749..5b356843c8 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ContentTypeManager.java
@@ -79,7 +79,7 @@ public abstract class ContentTypeManager {
     /**
      * Default content type tree. <Extension, ContentType>
      */
-    private final TreeMap<String, String> defaultContentType;
+    private TreeMap<String, String> defaultContentType;
 
     /**
      * Override content type tree.
@@ -286,7 +286,7 @@ public abstract class ContentTypeManager {
             throw new IllegalArgumentException("contentType");
         }
 
-        return (this.defaultContentType.containsValue(contentType) ||
+        return (this.defaultContentType.containsValue(contentType) || 
                 (this.overrideContentType != null && this.overrideContentType.containsValue(contentType)));
     }
 
@@ -353,9 +353,9 @@ public abstract class ContentTypeManager {
          */
         if (this.container != null && this.container.getPart(partName) != null) {
             throw new OpenXML4JRuntimeException(
-                "Rule M2.4 exception : Part '"
+                "Rule M2.4 exception : Part \'"
                 + partName
-                + "' not found - this error should NEVER happen!\n"
+                + "\' not found - this error should NEVER happen!\n"
                 + "Check that your code is closing the open resources in the correct order prior to filing a bug report.\n"
                 + "If you can provide the triggering file, then please raise a bug at https://bz.apache.org/bugzilla/enter_bug.cgi?product=POI and attach the file that triggers it, thanks!");
         }
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
index 44e3766eb1..44e3766eb1 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
index f2d8c31151..f2d8c31151 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
index cf809d6678..cf809d6678 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePartOutputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
index 34e66326b5..34e66326b5 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
index e30d71783a..e30d71783a 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartMarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
index b3f74323f3..b3f74323f3 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
index 597335efc4..597335efc4 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipContentTypeManager.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
index 8208c545ad..8208c545ad 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
index 970768cb30..970768cb30 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/DefaultMarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
index 459cbef831..459cbef831 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/PackagePropertiesMarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
index f24a74015c..f24a74015c 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPackagePropertiesMarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
index 384ad7687e..384ad7687e 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
index 278bffd9a1..278bffd9a1 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/PackagePropertiesUnmarshaller.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
index d19133f2cb..d19133f2cb 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/unmarshallers/UnmarshallContext.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
index 0709fd9021..0709fd9021 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveFakeEntry.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
index 5bcfd8f1c0..5bcfd8f1c0 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipArchiveThresholdInputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
index 00961dffd4..00961dffd4 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipEntrySource.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
index 0dafb13443..0dafb13443 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipFileZipEntrySource.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
index 57103d2906..57103d2906 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipInputStreamZipEntrySource.java
diff --git a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
index 290b5fbd8c..290b5fbd8c 100644
--- a/ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/openxml4j/util/ZipSecureFile.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
index ba1909a62f..ba1909a62f 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DSigRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
index f8ad4a33e5..f8ad4a33e5 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/DigestOutputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
index e7a4eba080..e7a4eba080 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/KeyInfoKeySelector.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
index d38088c68c..d38088c68c 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
index 98cb1933a3..98cb1933a3 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
index 8f43ef150a..8f43ef150a 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
index 06067ea531..06067ea531 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureLine.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
index 2c7ccdabe9..2c7ccdabe9 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalDefaultListener.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
index 43fd335836..43fd335836 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureMarshalListener.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
index 0ba11fbd34..0ba11fbd34 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignatureOutputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
index 1fd4151eb7..1fd4151eb7 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/SignaturePart.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
index 6baebff972..6baebff972 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/EnvelopedSignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
index d59f4c9acb..d59f4c9acb 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/KeyInfoSignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
index 6f5061aac9..6f5061aac9 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/OOXMLSignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
index f9ea3a9662..f9ea3a9662 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/Office2010SignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
index cc1a803ce6..cc1a803ce6 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
index e60771f563..e60771f563 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/SignatureFacetHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
index d18af54e46..d18af54e46 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESSignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
index 18f28f4837..18f28f4837 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/facets/XAdESXLSignatureFacet.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
index d8fc9d4ceb..d8fc9d4ceb 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RelationshipTransformService.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
index aa40675322..aa40675322 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationData.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
index ed5ce29918..ed5ce29918 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/RevocationDataService.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
index 56fd9ba232..56fd9ba232 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/SignaturePolicyService.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
index 945cf9f709..945cf9f709 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TSPTimeStampService.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
index 72561af9bd..72561af9bd 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampService.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
index 0ea5bbdc1d..0ea5bbdc1d 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampServiceValidator.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
index 2fb1749d4b..2fb1749d4b 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/AesZipFileZipEntrySource.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
index e1ea120e09..e1ea120e09 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/EncryptedTempData.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
index 4ca8b864ee..4ca8b864ee 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
index ea6a0519aa..ea6a0519aa 100644
--- a/ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/temp/SheetDataWriterWithDecorator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java
index 9f08483b60..9f08483b60 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/Angles.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
index 9767064fe4..9767064fe4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/BlackWhiteMode.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java
index b241e44a6a..b241e44a6a 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/CompoundLine.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
index 8a664b6054..8a664b6054 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/HasShapeProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java
index f8885bc81c..f8885bc81c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineCap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java
index aed43f85f3..aed43f85f3 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndLength.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java
index e3e03580ea..e3e03580ea 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
index 096d358c4b..096d358c4b 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/LineEndWidth.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java
index 4ab3cf1f04..4ab3cf1f04 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PathShadeType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java
index 1414564ed0..1414564ed0 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PenAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java
index 1adccfedfb..1adccfedfb 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
index 8e0e466288..8e0e466288 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetGeometry.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
index 5febf1aa9f..5febf1aa9f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetLineDash.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java
index fe54fa5f17..fe54fa5f17 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/PresetPattern.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
index 9020a448d6..9020a448d6 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/RectangleAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java
index ce574c74a8..ce574c74a8 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/SchemeColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java
index ecb075d9de..ecb075d9de 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/SystemColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
index f540459856..f540459856 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/TileFlipMode.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
index c9ebc717f0..c9ebc717f0 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandlePolar.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
index 608af4ba0e..608af4ba0e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFAdjustHandleXY.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java
index 4c71b77cdc..4c71b77cdc 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
index 3eea2d6279..3eea2d6279 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorHsl.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
index 5ec7d07e1e..5ec7d07e1e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorPreset.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
index 01cb6f2c07..01cb6f2c07 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbBinary.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
index 4e0563e1a8..4e0563e1a8 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorRgbPercent.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
index 46c379c445..46c379c445 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSchemeBased.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
index 202e7db076..202e7db076 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFColorSystemDefined.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
index 0f7a4a29fd..0f7a4a29fd 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFConnectionSite.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
index 8da645b5fc..8da645b5fc 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFCustomGeometry2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
index d79c245dbe..d79c245dbe 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFDashStop.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
index 97e09b963c..97e09b963c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectContainer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
index 884dc91c25..884dc91c25 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFEffectList.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
index c74ab07b30..c74ab07b30 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFExtensionList.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
index f880e276fc..f880e276fc 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
index 04cc94c8f7..04cc94c8f7 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryGuide.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
index e696314c67..e696314c67 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGeometryRectangle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
index ab05448eec..ab05448eec 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
index ba7c088ed4..ba7c088ed4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGradientStop.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
index 52edb95c84..52edb95c84 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFGroupFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
index deedaf4929..deedaf4929 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineEndProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
index a6c9a9e097..a6c9a9e097 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinBevelProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
index 3317e1c6a1..3317e1c6a1 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinMiterProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
index e1b53ca21f..e1b53ca21f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
index 6de28cf361..6de28cf361 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineJoinRoundProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
index f1aaea4ce7..f1aaea4ce7 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLineProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
index 0c3e54a245..0c3e54a245 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFLinearShadeProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
index a379399b55..a379399b55 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFNoFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java
index 67c760e87a..67c760e87a 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPath.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
index 8d5892fda6..8d5892fda6 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPathShadeProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
index bf34c7a893..bf34c7a893 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPatternFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
index 873107a932..873107a932 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPicture.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
index 2999d51e26..2999d51e26 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPictureFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
index cdd4a03f85..cdd4a03f85 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPoint2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
index a8989311b9..a8989311b9 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPositiveSize2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
index f60e314e86..f60e314e86 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetGeometry2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
index 81a9942de2..81a9942de2 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFPresetLineDash.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
index 44d19bfd0a..44d19bfd0a 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFRelativeRectangle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
index 48f61cd643..48f61cd643 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFScene3D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
index eb0e80ce17..eb0e80ce17 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShape3D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
index 9182f26ba8..9182f26ba8 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFShapeProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
index 1272cb50c4..1272cb50c4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFSolidFillProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
index 0630200942..0630200942 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFStretchInfoProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
index 59542330d1..59542330d1 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTileInfoProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
index 258f47a35d..258f47a35d 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/XDDFTransform2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
index cd509cb9ce..cd509cb9ce 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrossBetween.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
index 772a671ebc..772a671ebc 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisCrosses.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
index 7be31ce03c..7be31ce03c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisLabelAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
index cb83f084a4..cb83f084a4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisOrientation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
index c601836e3e..c601836e3e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisPosition.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
index 2d5823d000..2d5823d000 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickLabelPosition.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
index 457cc34f96..457cc34f96 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/AxisTickMark.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
index c3d0747617..c3d0747617 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarDirection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
index bb606fde33..bb606fde33 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/BarGrouping.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
index 7f822abbb8..7f822abbb8 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ChartTypes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
index 043bf21b11..043bf21b11 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/DisplayBlanks.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
index f90e43185d..f90e43185d 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorBarType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
index bd06b4bfdb..bd06b4bfdb 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorDirection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
index f46bdb363b..f46bdb363b 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ErrorValueType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
index 516477343e..516477343e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Grouping.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
index 425dd2202e..425dd2202e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutMode.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
index 1ed359f6df..1ed359f6df 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LayoutTarget.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
index 88f67cd001..88f67cd001 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/LegendPosition.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
index 3d6724720f..3d6724720f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/MarkerStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
index 6b8d9854b6..6b8d9854b6 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/RadarStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
index 29b986cfd8..29b986cfd8 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/ScatterStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java
index ad9ea25931..ad9ea25931 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/Shape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
index ebc0ee6305..ebc0ee6305 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFArea3DChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
index e09121225c..e09121225c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFAreaChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
index 3f6984f6e4..3f6984f6e4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBar3DChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
index 9ff0bc0d94..9ff0bc0d94 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFBarChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
index bbdccedb13..bbdccedb13 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryAxis.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
index 6bdc8cf911..6bdc8cf911 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFCategoryDataSource.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
index 7b29b33a28..7b29b33a28 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
index c04e066ed2..c04e066ed2 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartAxis.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
index 365d3f37fd..365d3f37fd 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
index 9e593edfbb..9e593edfbb 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartExtensionList.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
index d7a77f568b..d7a77f568b 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFChartLegend.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
index 01c8660090..01c8660090 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataPoint.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
index ea99a34b12..ea99a34b12 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSource.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
index 4cd3bc876f..4cd3bc876f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDataSourcesFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
index 00722ea02a..00722ea02a 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDateAxis.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
index 23020f842a..23020f842a 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFDoughnutChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
index 108793d0ce..108793d0ce 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFErrorBars.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
index 257931a5d4..257931a5d4 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLayout.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
index 526c1ebf19..526c1ebf19 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLegendEntry.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
index 2f2e6fa738..2f2e6fa738 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLine3DChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
index 34bad10619..34bad10619 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFLineChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
index 856a530fbc..856a530fbc 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFManualLayout.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
index 95ef676462..95ef676462 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFNumericalDataSource.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
index d2a5059847..d2a5059847 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPie3DChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
index 6a3a28c576..6a3a28c576 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFPieChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
index f7f2edac6d..f7f2edac6d 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFRadarChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
index bb500cd20f..bb500cd20f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFScatterChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
index df0297e288..df0297e288 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSeriesAxis.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
index 982a104632..982a104632 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurface3DChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
index 25e8fad31c..25e8fad31c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFSurfaceChartData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
index fedd3f3d50..fedd3f3d50 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFTitle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
index 9189a65f74..9189a65f74 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFValueAxis.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
index 4bfe1e10b6..4bfe1e10b6 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/chart/XDDFView3D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
index 43575a6c4f..43575a6c4f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AnchorType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
index 71eb95aac5..71eb95aac5 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/AutonumberScheme.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java
index b6dc261095..b6dc261095 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/CapsType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
index 79327f769e..79327f769e 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/FontAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
index 68544ec032..68544ec032 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/StrikeType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
index d3a8e768f9..d3a8e768f9 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TabAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
index 67f0a88e3d..67f0a88e3d 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
index a8c89d02f5..a8c89d02f5 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/TextContainer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
index 453ce20d35..453ce20d35 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/UnderlineType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
index e9be9708b3..e9be9708b3 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFAutoFit.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
index 80d6f019bf..80d6f019bf 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBodyProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
index c1a4cb9e13..c1a4cb9e13 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSize.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
index 098de23617..098de23617 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizeFollowText.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
index b1eefa90f7..b1eefa90f7 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePercent.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
index 0845087b7c..0845087b7c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletSizePoints.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
index 0358881371..0358881371 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
index c5996057a0..c5996057a0 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleAutoNumbered.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
index 6f133715c5..6f133715c5 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleCharacter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
index 9c6da47d9c..9c6da47d9c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStyleNone.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
index 173a4e0539..173a4e0539 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFBulletStylePicture.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
index e0f0b42528..e0f0b42528 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFFont.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
index 46d4dcdcec..46d4dcdcec 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFHyperlink.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
index 16070a471b..16070a471b 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNoAutoFit.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
index ada34afe94..ada34afe94 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFNormalAutoFit.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
index 3e3249d3bd..3e3249d3bd 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphBulletProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
index 456e1d54d9..456e1d54d9 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFParagraphProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
index aae476e125..aae476e125 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFRunProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
index 0721313e6c..0721313e6c 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFShapeAutoFit.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
index 39da4a4c36..39da4a4c36 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacing.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
index 70c099e725..70c099e725 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPercent.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
index ea1a771f7f..ea1a771f7f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFSpacingPoints.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
index a843002dd1..a843002dd1 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTabStop.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
index 2c97837ab2..2c97837ab2 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextBody.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
index 7fa888b05f..7fa888b05f 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextParagraph.java
diff --git a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
index 0817f23592..0817f23592 100644
--- a/ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xddf/usermodel/text/XDDFTextRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java
index 7d1a19e553..7d1a19e553 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/exceptions/XDGFException.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
index 7ffbf62b63..7ffbf62b63 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/extractor/XDGFVisioExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java
index a96071a3bb..a96071a3bb 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineCollector.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java
index dd4bfc20ed..dd4bfc20ed 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/geom/SplineRenderer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
index 9559cce58b..9559cce58b 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFBaseContents.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
index e4bdfcd8a5..e4bdfcd8a5 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
index cc24a41fca..cc24a41fca 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFConnection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
index 924dec552b..924dec552b 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFDocument.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
index 6cd39cb785..6cd39cb785 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
index b1edbcb277..b1edbcb277 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMaster.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
index efe0512efa..efe0512efa 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
index da79bc4e1a..da79bc4e1a 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
index 54d44af122..54d44af122 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPage.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
index 658c2ca985..658c2ca985 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
index 1d27969fed..1d27969fed 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
index dbdf7aaa4d..dbdf7aaa4d 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
index 29b55ef7c2..29b55ef7c2 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
index 2f22ab805f..2f22ab805f 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
index ef363efc8e..ef363efc8e 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
index 50f61842b0..50f61842b0 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFStyleSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
index c823bb343d..c823bb343d 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFText.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
index 40de1aaf72..40de1aaf72 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
index e98d08296f..e98d08296f 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CharacterSection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
index 2d6f251bb4..2d6f251bb4 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/CombinedIterable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
index b0ecf2051e..b0ecf2051e 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GenericSection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
index 7dd4641107..7dd4641107 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometryRowTypes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
index b9da05f1f5..b9da05f1f5 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/GeometrySection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
index c6340456a2..c6340456a2 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
index 35af8d52be..35af8d52be 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/XDGFSectionTypes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
index 4547229d4a..4547229d4a 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/ArcTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
index 8f509f9607..8f509f9607 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/Ellipse.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
index 2ec09f6b6b..2ec09f6b6b 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/EllipticalArcTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
index 8ffaef26f4..8ffaef26f4 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/GeometryRow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
index c7383f3cc2..c7383f3cc2 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/InfiniteLine.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
index 808080920b..808080920b 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/LineTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
index c324d916a4..c324d916a4 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/MoveTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
index 1b9f0f9556..1b9f0f9556 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/NURBSTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
index b64518138b..b64518138b 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/PolyLineTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
index 847dce06b7..847dce06b7 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelCubBezTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
index 9e11bb31a6..9e11bb31a6 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelEllipticalArcTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
index e6a9731b66..e6a9731b66 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelLineTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
index b7e56bf9bd..b7e56bf9bd 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelMoveTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
index e6037279ea..e6037279ea 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/RelQuadBezTo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
index bd006ac60e..bd006ac60e 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineKnot.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
index c6e0332d6c..c6e0332d6c 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/section/geometry/SplineStart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
index 57c9cdec93..57c9cdec93 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDataAcceptor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
index 062f987ab3..062f987ab3 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeDebuggerRenderer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
index a6a76642d9..a6a76642d9 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeRenderer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
index 9a0f28cf54..9a0f28cf54 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeTextVisitor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
index 2e4d89647d..2e4d89647d 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
index e50ce11eab..e50ce11eab 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/ShapeVisitorAcceptor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
index 2a33c43407..2a33c43407 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisiting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
index eb9e4a6203..eb9e4a6203 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/shape/exceptions/StopVisitingThisBranch.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
index eb37159ba4..eb37159ba4 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/HierarchyPrinter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java
index 80ab4a2cc6..80ab4a2cc6 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/Util.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java
index e8c96c3355..e8c96c3355 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/util/VsdxToPng.java
diff --git a/ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java b/poi-ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
index 51409a40de..51409a40de 100644
--- a/ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/xml/XDGFXMLDocumentPart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
index ac357759fc..ac357759fc 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGImageRenderer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
index b2b40f9163..b2b40f9163 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGPOIGraphics2D.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
index 35536714ed..35536714ed 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/draw/SVGRenderExtension.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
index fbdeede6a3..fbdeede6a3 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/extractor/XSLFExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
index beb8c5a431..beb8c5a431 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/CharacterPropertyFetcher.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
index 7cce4c64a7..7cce4c64a7 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/ParagraphPropertyFetcher.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java
index eb157e82e3..eb157e82e3 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/PropertyFetcher.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
index 2c0cfef0b8..2c0cfef0b8 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/model/TextBodyPropertyFetcher.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
index 729057b13b..729057b13b 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/SlideLayout.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
index 1f81dc34ee..1f81dc34ee 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XMLSlideShow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
index a69af0e0e7..a69af0e0e7 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFAutoShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
index add51e6566..add51e6566 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java
index c54cba50c8..c54cba50c8 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFChart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
index c939383488..c939383488 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java
index ab925b2f0c..ab925b2f0c 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
index 01b98099d1..01b98099d1 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFCommentAuthors.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
index 00fa47d5f1..00fa47d5f1 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFComments.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
index cd15e7d852..cd15e7d852 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFConnectorShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
index dca6fed131..dca6fed131 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
index e6b27e62ea..e6b27e62ea 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
index 8b2cb09ebc..8b2cb09ebc 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
index 1e7462113e..1e7462113e 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFontInfo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
index 593a4ee1ca..593a4ee1ca 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
index 3938295e11..3938295e11 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGradientPaint.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
index 59109b7e32..59109b7e32 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
index 5cf47873f3..5cf47873f3 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
index e4c417c464..e4c417c464 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFHyperlink.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
index 9c279b6aa7..9c279b6aa7 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFLineBreak.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
index 3d06e46c4e..3d06e46c4e 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFMetroShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
index 19b42c119f..19b42c119f 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
index 6ebe185531..6ebe185531 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFNotesMaster.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
index 09125fe585..09125fe585 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
index 8ee5017d1f..8ee5017d1f 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFObjectShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
index 11f94477f3..11f94477f3 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
index 9c4fc5902e..9c4fc5902e 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
index ce75a19f61..ce75a19f61 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPlaceholderDetails.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
index bc1aee7850..bc1aee7850 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPropertiesDelegate.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
index 5139e6278c..5139e6278c 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
index 9ec4e3e6bc..9ec4e3e6bc 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
index 5a267595e2..5a267595e2 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
index ddf832d3d9..ddf832d3d9 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFShapeContainer.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
index 1364cd7228..1364cd7228 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
index f7424d1807..f7424d1807 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
index c126afdd7a..c126afdd7a 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
index 17f66bec0a..17f66bec0a 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideLayout.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
index 7a20d04d1d..7a20d04d1d 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
index 4b30679d41..4b30679d41 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
index 929b000bbb..929b000bbb 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFSlideShowFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
index 3d699af3ab..3d699af3ab 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTabStop.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
index e640ba82ae..e640ba82ae 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
index d30bfa5521..d30bfa5521 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
index db67222c21..db67222c21 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableRow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
index 6d4372c21a..6d4372c21a 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
index e2100e81fd..e2100e81fd 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
index e3e30d18c6..e3e30d18c6 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextBox.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
index a30571f16e..a30571f16e 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
index ea1c179d66..ea1c179d66 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
index a147758403..a147758403 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
index 655be92305..655be92305 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTexturePaint.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
index 8744b80690..8744b80690 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java
index a33a85344b..a33a85344b 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/BitmapFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
index f3dfe26d72..f3dfe26d72 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java
index db6e09abfb..db6e09abfb 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/DummyGraphics2d.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java
index 761c819612..761c819612 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/EMFHandler.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java
index 5a02c63695..5a02c63695 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/MFProxy.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java
index cfa8df2c83..cfa8df2c83 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/OutputFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java
index 73c48ed049..73c48ed049 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFontMapper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
index 1b71fb3f7b..1b71fb3f7b 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
index 79d676ddc0..79d676ddc0 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTHandler.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
index 27f053dc85..27f053dc85 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PPTX2PNG.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java
index 1725aa4f10..1725aa4f10 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/SVGFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java
index b97a9e8931..b97a9e8931 100644
--- a/ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/util/WMFHandler.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java
index 6834d81001..6834d81001 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/XLSBUnsupportedException.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
index 6e3d0c0c9f..6e3d0c0c9f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellHeader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
index d090002a28..d090002a28 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCellRange.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java
index ed3b918f33..ed3b918f33 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBComment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
index 057f61ee20..057f61ee20 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBCommentsTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
index 674ed4410b..674ed4410b 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
index a0e01832de..a0e01832de 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHeaderFooters.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
index ca76fb0332..ca76fb0332 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java
index 7098bbe26e..7098bbe26e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParseException.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
index 398d53bc92..398d53bc92 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBParser.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
index e54f5a5a72..e54f5a5a72 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRecordType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java
index 94599bc5aa..94599bc5aa 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
index 7e18a1a4dc..7e18a1a4dc 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichStr.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
index 990dd41de2..990dd41de2 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
index 791a77c828..791a77c828 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSharedStringsTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
index b726545daf..b726545daf 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBSheetHandler.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
index 34ad623c3c..34ad623c3c 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBStylesTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java
index 6f1dd70bd3..6f1dd70bd3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBUtils.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
index 080048af45..080048af45 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFHyperlinkRecord.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java
index 7efaeaae7b..7efaeaae7b 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/package-info.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
index bcc30c3f59..bcc30c3f59 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
index 6d4c2eb0b3..6d4c2eb0b3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
index d31c489e81..d31c489e81 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
index 1cbb4d4fc3..1cbb4d4fc3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFSheetXMLHandler.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
index 817ed64a1e..817ed64a1e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
index 35fcb58685..35fcb58685 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
index 43c9dcf101..43c9dcf101 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
index d918ae1a65..d918ae1a65 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
index 4605ee04e0..4605ee04e0 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
index 58933cdd1e..58933cdd1e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CalculationChain.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
index 1341de6561..1341de6561 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Comments.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
index c31de3e345..c31de3e345 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/CommentsTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
index b267123e48..b267123e48 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ExternalLinksTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
index 10f81c8632..10f81c8632 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/MapInfo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
index 00f40f790c..00f40f790c 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ParagraphPropertyFetcher.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java
index 82f5bfb371..82f5bfb371 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SharedStrings.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java
index f1d59a14bb..f1d59a14bb 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SharedStringsTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
index 1ea7eb2824..1ea7eb2824 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/SingleXmlCells.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java
index 135581c7d0..135581c7d0 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Styles.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
index a007608e26..a007608e26 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/StylesTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java
index 7e0f427d7a..7e0f427d7a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/Themes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
index 0e68bceacf..0e68bceacf 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/model/ThemesTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
index 43bfdf9f83..43bfdf9f83 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/AutoSizeColumnTracker.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
index edd1d04497..edd1d04497 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
index fb21c779c8..fb21c779c8 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/DeferredSXSSFWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
index ce2da084e9..ce2da084e9 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/GZIPSheetDataWriter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
index b8253c054d..b8253c054d 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcOutputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
index 573d580e37..573d580e37 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/OpcZipArchiveOutputStream.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
index b3d9511372..b3d9511372 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/RowGeneratorFunction.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
index 4eb67ea8a5..4eb67ea8a5 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
index d18177c032..d18177c032 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFCreationHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
index dbaf370e30..dbaf370e30 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFDrawing.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
index aaafa87609..aaafa87609 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
index f47b051d24..f47b051d24 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
index 7039c1b35f..7039c1b35f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFEvaluationWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
index 67fe562aac..67fe562aac 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFFormulaEvaluator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
index a39eb590c8..a39eb590c8 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFPicture.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
index 8d6e903d9d..8d6e903d9d 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFRow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
index 04e0c0e735..04e0c0e735 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
index a4a9a439e5..a4a9a439e5 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SXSSFWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
index f72b6a2ff3..f72b6a2ff3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/SheetDataWriter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
index ef5e6c3438..ef5e6c3438 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/StreamingSheetWriter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java
index 5dfc49008a..5dfc49008a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/streaming/Zip64Impl.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
index 79f003eb9c..79f003eb9c 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFEvaluationWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
index bbad20e518..bbad20e518 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
index 05d442db75..05d442db75 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/CustomIndexedColorMap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
index 0d2980b4b1..0d2980b4b1 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/DefaultIndexedColorMap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
index eac3a037ed..eac3a037ed 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/IndexedColorMap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
index 5108813b28..5108813b28 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/ListAutoNumber.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java
index b93a885c20..b93a885c20 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAlign.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java
index 6e01b134fd..6e01b134fd 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextAutofit.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java
index 9202e92b42..9202e92b42 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextCap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java
index f91fcca7a8..f91fcca7a8 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextDirection.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
index 96417980c4..96417980c4 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextFontAlign.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
index b1fe0c18d3..b1fe0c18d3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextHorizontalOverflow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
index 87d3e40189..87d3e40189 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/TextVerticalOverflow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
index de855787be..de855787be 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAnchor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
index d363ab31ab..d363ab31ab 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFAutoFilter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
index 4afbcb123e..4afbcb123e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBorderFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
index 2ba065b766..2ba065b766 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFBuiltinTableStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
index d2d135b3e2..d2d135b3e2 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index c7d1f85f32..c7d1f85f32 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java
index e5646a41d6..e5646a41d6 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
index 883e33a58e..883e33a58e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChartSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
index ff727adb2a..ff727adb2a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFChildAnchor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
index 428a06ddf1..428a06ddf1 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFClientAnchor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
index a8507cd92e..a8507cd92e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
index 31f5f28373..31f5f28373 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFColorScaleFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
index 441f242f4a..441f242f4a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFComment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
index 59bfb94067..59bfb94067 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionFilterData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
index eff8e375b4..eff8e375b4 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
index 829acbbd30..829acbbd30 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingRule.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
index f868f14a2b..f868f14a2b 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConditionalFormattingThreshold.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
index 78d4e402e4..78d4e402e4 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFConnector.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
index fedbc8d3dd..fedbc8d3dd 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCreationHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
index fecd4f0221..fecd4f0221 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataBarFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
index 8c867ab566..8c867ab566 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
index ca451a5d33..ca451a5d33 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
index b62a38e0a5..b62a38e0a5 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
index 9e62aa07e7..9e62aa07e7 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDataValidationHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
index bb81b5ff50..bb81b5ff50 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDialogsheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
index c781ca7285..c781ca7285 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
index c68f16eb09..c68f16eb09 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFDxfStyleProvider.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
index 221154b331..221154b331 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
index 18b663c2b3..18b663c2b3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
index 2c13f82668..2c13f82668 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
index 8234793c3e..8234793c3e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
index dfd9d179b8..dfd9d179b8 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFEvenHeader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
index b931154d9a..b931154d9a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
index 4bccf9ef1e..4bccf9ef1e 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
index 4cb2254d2f..4cb2254d2f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFirstHeader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java
index b6d4465ecc..b6d4465ecc 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFont.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
index 6b359a2988..6b359a2988 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
index ccd1799955..ccd1799955 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFFormulaEvaluator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
index 4a46f641a4..4a46f641a4 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFGraphicFrame.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
index af3f8c29fc..af3f8c29fc 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHeaderFooterProperties.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
index 1d13e688c5..1d13e688c5 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFHyperlink.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
index 29062ee06f..29062ee06f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFIconMultiStateFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
index 99596992b9..99596992b9 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFLineBreak.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java
index 17c12c195b..17c12c195b 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFMap.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
index 21300d47e3..21300d47e3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFName.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
index 16d04085f2..16d04085f2 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFObjectData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
index 1e2239d8d3..1e2239d8d3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
index 1cce6e59be..1cce6e59be 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFOddHeader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
index 0f191c28f2..0f191c28f2 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
index 86f3bd917b..86f3bd917b 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
index ecdb1de04c..ecdb1de04c 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
index 2f5888976a..2f5888976a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCache.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
index 540494c35f..540494c35f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheDefinition.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
index d45f6c6a18..d45f6c6a18 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotCacheRecords.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
index 8ace06e95a..8ace06e95a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPivotTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
index e626790d88..e626790d88 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPrintSetup.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
index 50248fae81..50248fae81 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRangeCopier.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
index ee502b1b39..ee502b1b39 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
index d71641b7de..d71641b7de 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
index 2e285dc747..2e285dc747 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFRow.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java
index 8f7489434c..8f7489434c 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
index 96c7c9bcd3..96c7c9bcd3 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFShapeGroup.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index 571d4fb766..571d4fb766 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
index 9967a2cf79..9967a2cf79 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
index 478bca9626..478bca9626 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSignatureLine.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
index dfc7a69466..dfc7a69466 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
index 62f6158deb..62f6158deb 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
index 7d1f4661cd..7d1f4661cd 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableColumn.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
index 852f91c62d..852f91c62d 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
index fc515e6edb..fc515e6edb 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTableStyleInfo.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
index 74c26b9306..74c26b9306 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextBox.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
index 0d33e0c4f6..0d33e0c4f6 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextParagraph.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
index 1809e16cd5..1809e16cd5 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFTextRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
index b5efa0951a..b5efa0951a 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVBAPart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
index 59aa229853..59aa229853 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFVMLDrawing.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
index f64ed3c4cd..f64ed3c4cd 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbook.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
index 3ac689f372..3ac689f372 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
index 917d3d6daa..917d3d6daa 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFWorkbookType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
index 15837ca575..15837ca575 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
index 31ed2a2203..31ed2a2203 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
index dd9dca7d16..dd9dca7d16 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
index 2ab58f6fa0..2ab58f6fa0 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/extensions/XSSFHeaderFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
index f65856ea69..f65856ea69 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/ColumnHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
index e4731dae11..e4731dae11 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/HeaderFooterHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
index 2acc8955f1..2acc8955f1 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFColumnShifter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
index 926e2a2d87..926e2a2d87 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFFormulaUtils.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
index 2fd4218ca6..2fd4218ca6 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFIgnoredErrorHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
index 167cee14ff..167cee14ff 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFPasswordHelper.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
index 298fa3f48f..298fa3f48f 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowColShifter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
index ffbc570796..ffbc570796 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
index 79cc921a34..79cc921a34 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFSingleXmlCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
index 08e9ca05c1..08e9ca05c1 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
index ef8e526a43..ef8e526a43 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/util/CTColComparator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java
index 0a853cc7c8..0a853cc7c8 100644
--- a/ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/util/NumericRanges.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
index 578d6f2828..578d6f2828 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
index 6a29cd3898..6a29cd3898 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFCommentsDecorator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
index 3c956be237..3c956be237 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFHeaderFooterPolicy.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
index 46636c3ef2..46636c3ef2 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/model/XWPFParagraphDecorator.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/package-info.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/package-info.java
index 0d425b0979..0d425b0979 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/package-info.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/package-info.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
index d93ba9d0b6..d93ba9d0b6 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyElementType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java
index ebf6a4d188..ebf6a4d188 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BodyType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
index d77e7f088f..d77e7f088f 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Borders.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java
index 895c143b0c..895c143b0c 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakClear.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
index aea132db97..aea132db97 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/BreakType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
index 0bd4175f9b..0bd4175f9b 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/Document.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
index 1f3d60d93a..1f3d60d93a 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/FootnoteEndnoteIdManager.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java
index 3c8be00a0f..3c8be00a0f 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBody.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
index 2585459215..2585459215 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IBodyElement.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java
index c89f939600..c89f939600 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ICell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java
index c221990409..c221990409 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunBody.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
index 9c87820fab..9c87820fab 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/IRunElement.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
index d0c185e888..d0c185e888 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContent.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
index 66922b8376..66922b8376 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ISDTContents.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
index 836069d0d5..836069d0d5 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/LineSpacingRule.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
index e3599032f8..e3599032f8 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/ParagraphAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
index 4cd688c205..4cd688c205 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/PositionInParagraph.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
index 74913cf815..74913cf815 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TOC.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
index 0345ecafa0..0345ecafa0 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowAlign.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
index 2a42c76baf..2a42c76baf 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableRowHeightRule.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
index bb779dfb27..bb779dfb27 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TableWidthType.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
index 6ed8dc00e4..6ed8dc00e4 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextAlignment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java
index 1cae3467f5..1cae3467f5 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/TextSegment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
index f863d79fbf..f863d79fbf 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/UnderlinePatterns.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
index 209e006dca..209e006dca 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/VerticalAlign.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
index ff509ecdc2..ff509ecdc2 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnoteEndnote.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
index d626350298..d626350298 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractFootnotesEndnotes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
index ac95c29ab2..ac95c29ab2 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractNum.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
index 434d857f2c..434d857f2c 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFAbstractSDT.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
index 495cde1bf9..495cde1bf9 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFChart.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
index f9ee63fc44..f9ee63fc44 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComment.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
index 3cf82b680c..3cf82b680c 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFComments.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
index 77679d2db7..77679d2db7 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultParagraphStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
index 24c235d0e0..24c235d0e0 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDefaultRunStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
index fcf58ed692..fcf58ed692 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
index f18c1c118a..f18c1c118a 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnote.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
index 1df57f6d56..1df57f6d56 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFEndnotes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
index fd5eca0014..fd5eca0014 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFactory.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
index 1f1559b3a0..1f1559b3a0 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFieldRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
index 07375a223b..07375a223b 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
index 77459ecc87..77459ecc87 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnote.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
index 8f7c591c5a..8f7c591c5a 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFFootnotes.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
index fe12c8df70..fe12c8df70 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
index 4f09eb64de..4f09eb64de 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
index c00f75a890..c00f75a890 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlink.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
index 7a5ad06b89..7a5ad06b89 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFHyperlinkRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
index 3122840dd8..3122840dd8 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFLatentStyles.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
index 9fa8ab38da..9fa8ab38da 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNum.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
index 581c0128a4..581c0128a4 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFNumbering.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
index bbf59867d1..bbf59867d1 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
index f46d2cd158..f46d2cd158 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPicture.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
index 548c614661..548c614661 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
index d67a8303b9..d67a8303b9 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRelation.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
index ee741bace4..ee741bace4 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFRun.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
index 82aa024623..82aa024623 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDT.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
index 5589287263..5589287263 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
index eaaf94d873..eaaf94d873 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContent.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
index 8432b39d28..8432b39d28 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSDTContentCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
index 8df9e3f806..8df9e3f806 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSettings.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
index 95b88bac04..95b88bac04 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFSignatureLine.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
index 05f59189a5..05f59189a5 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyle.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
index 93b05ab901..93b05ab901 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFStyles.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
index e95057f342..e95057f342 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
index 4c4cfd7820..4c4cfd7820 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
diff --git a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
index c01643ec0d..c01643ec0d 100644
--- a/ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFTableRow.java
diff --git a/poi-ooxml/src/main/java9/module-info.class b/poi-ooxml/src/main/java9/module-info.class
new file mode 100644
index 0000000000..a07707c5b7
--- /dev/null
+++ b/poi-ooxml/src/main/java9/module-info.class
diff --git a/ooxml/src/main/java9/module-info.java b/poi-ooxml/src/main/java9/module-info.java
index 317a9d9ca9..317a9d9ca9 100644
--- a/ooxml/src/main/java9/module-info.java
+++ b/poi-ooxml/src/main/java9/module-info.java
diff --git a/ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index bb22aa1dbb..bb22aa1dbb 100644
--- a/ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index f5f7bb9556..f5f7bb9556 100644
--- a/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
index f4251abe27..f4251abe27 100644
--- a/ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
+++ b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
diff --git a/ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
index 48b893240d..48b893240d 100644
--- a/ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
+++ b/poi-ooxml/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
diff --git a/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx b/poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx
index ababa93791..ababa93791 100644
--- a/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx
+++ b/poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/empty.pptx
diff --git a/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml b/poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml
index 0a8db65bd8..0a8db65bd8 100644
--- a/ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml
+++ b/poi-ooxml/src/main/resources/org/apache/poi/xslf/usermodel/notesMaster.xml
diff --git a/ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml b/poi-ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml
index f83f2e33c1..f83f2e33c1 100644
--- a/ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml
+++ b/poi-ooxml/src/main/resources/org/apache/poi/xssf/usermodel/presetTableStyles.xml
diff --git a/ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java b/poi-ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java
index c1cf799c25..c1cf799c25 100644
--- a/ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/benchmark/AddImageBench.java
diff --git a/ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java b/poi-ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
index b94a3454de..b94a3454de 100644
--- a/ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/extractor/ooxml/TestExtractorFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
index 13e46c5222..13e46c5222 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestDetectAsOOXML.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
index e41193a3c8..e41193a3c8 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestEmbedded.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
index 86179eeaae..86179eeaae 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestNecessaryOOXMLClasses.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
index 2104a418a8..2104a418a8 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLDocument.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
index 57306d1637..57306d1637 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestPOIXMLProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
index 7745125ea4..7745125ea4 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
diff --git a/ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
index c077e15085..c077e15085 100644
--- a/ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ooxml/TestXMLPropertiesTextExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
index 1c6b942a58..1c6b942a58 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
index 7847507017..7847507017 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestContentType.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
index 7a5d012fed..7a5d012fed 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestFileHelper.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
index 481ce98620..481ce98620 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestListParts.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
index 9f297f66c6..9f297f66c6 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackage.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
index 317d1009a0..317d1009a0 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageCoreProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
index 2572aadfad..2572aadfad 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagePartName.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
index e68a92d200..e68a92d200 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackageThumbnail.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
index 714d81180b..714d81180b 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestPackagingURIHelper.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
index d80c88ae12..d80c88ae12 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
index fcc6e3cff8..fcc6e3cff8 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/ZipFileAssert.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
index 3ebd4041a3..3ebd4041a3 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
index e81605fc26..e81605fc26 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
index edfe0fea3e..edfe0fea3e 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePartName.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
index aab917ec63..aab917ec63 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/TestContentTypeManager.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
index 3b9b03aed4..3b9b03aed4 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/internal/marshallers/TestZipPackagePropertiesMarshaller.java
diff --git a/ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java
index d80a44a1d8..d80a44a1d8 100644
--- a/ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/openxml4j/util/TestZipSecureFile.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
index 61eddc0d6e..61eddc0d6e 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureConfig.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
index d7fc0b4471..d7fc0b4471 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
index 14e6debbf4..14e6debbf4 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestAgileEncryptionParameters.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
index fed15e2f3c..fed15e2f3c 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
index 879bf2d2a6..879bf2d2a6 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptionInfo.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
index ed2ee87e02..ed2ee87e02 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestEncryptor.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
index bf5aebb590..bf5aebb590 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestHxxFEncryption.java
diff --git a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
index 7dbbbe3d2a..7dbbbe3d2a 100644
--- a/ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestSecureTempZip.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java
index 3c3d243db8..3c3d243db8 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/SLCommonUtils.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java
index bd5d190d69..bd5d190d69 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestFonts.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java
index bd0d0ccb85..bd0d0ccb85 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestHeadersFooters.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
index bda636d2ad..bda636d2ad 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestOleShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
index eb066e4688..eb066e4688 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestSlide.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
index cedb11eed0..cedb11eed0 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/TestTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
index 9f5568c4c4..9f5568c4c4 100644
--- a/ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/sl/tests/draw/TestDrawPictureShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
index 200407e3ef..200407e3ef 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/TestWorkbookFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
index ca3ec7d1fe..ca3ec7d1fe 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/extractor/TestEmbeddedExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java
index 8514542080..8514542080 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/format/TestCellFormatPart.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java
index 5d1c7d8e31..5d1c7d8e31 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestFormulaParser.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
index f169e7b69d..f169e7b69d 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/TestStructuredReferences.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
index 114f70a13e..114f70a13e 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
index 902de11a80..902de11a80 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestCountifs.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
index c1a80cb5a4..c1a80cb5a4 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestProper.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
index 2beafffd13..2beafffd13 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestSumifsXSSF.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
index 753e2046d2..753e2046d2 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/functions/TestVlookup.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
index f43609c392..f43609c392 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXCell.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
index 744f342694..744f342694 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXRow.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
index ae68cace8c..ae68cace8c 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
index 49ea01f697..49ea01f697 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/BaseTestXWorkbook.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
index 4e6257c650..4e6257c650 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestConditionalFormattingEval.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
index 001ea8ebce..001ea8ebce 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
index d191c7ab7c..d191c7ab7c 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFBorderStyle.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
index 3ee318abdf..3ee318abdf 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestXSSFRangeCopier.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
index 0e2511f36d..0e2511f36d 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestSXSSFCellUtil.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
index 40f16dbe61..40f16dbe61 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
diff --git a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
index c6f9f59cc0..c6f9f59cc0 100644
--- a/ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFPropertyTemplate.java
diff --git a/ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java b/poi-ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java
index 71fe575c67..71fe575c67 100644
--- a/ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/util/tests/TestIdentifierManager.java
diff --git a/ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java b/poi-ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java
index 678280e7b1..678280e7b1 100644
--- a/ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/util/tests/TestTempFileThreaded.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
index bc235f51b5..bc235f51b5 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestNecessaryOOXMLClasses.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java
index 7eb01c29a7..7eb01c29a7 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/TestXDDFColor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
index 45ff5d7747..45ff5d7747 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
index f4bd59ec9a..f4bd59ec9a 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartExtensionList.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
index ca5c40aaf1..ca5c40aaf1 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
index 0cbb10b0f2..0cbb10b0f2 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFDataSourcesFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
index 1d98b42e44..1d98b42e44 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextBodyProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
index 90c7759e6b..90c7759e6b 100644
--- a/ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/text/TestXDDFTextRun.java
diff --git a/ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
index adc76e554a..adc76e554a 100644
--- a/ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java b/poi-ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
index 5679c28cd9..5679c28cd9 100644
--- a/ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xdgf/usermodel/section/TestCombinedIterator.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
index 307348f011..307348f011 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestNecessaryOOXMLClasses.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
index acbf365046..acbf365046 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
index 1d948dc6ee..1d948dc6ee 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
index 72ed16f94b..72ed16f94b 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/XSLFTestDataSamples.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
index 5e5f0ed4cb..5e5f0ed4cb 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
index 4226b28095..4226b28095 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
index 520f62fb04..520f62fb04 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
index 330f6629e7..330f6629e7 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
index 907a37a80d..907a37a80d 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFBackground.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
index c9608359bb..c9608359bb 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
index a872ecca1b..a872ecca1b 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFColor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
index d7afa7ef0b..d7afa7ef0b 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
index 02640c0efe..02640c0efe 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFExamples.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
index 6f57d11790..6f57d11790 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
index 547da5f71c..547da5f71c 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
index 90fcf71568..90fcf71568 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
index 526abab2c9..526abab2c9 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFNotes.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
index 0df21b2720..0df21b2720 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
index 116eddac13..116eddac13 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
index 2f5b57161f..2f5b57161f 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
index cd467554e3..cd467554e3 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
index c25e822538..c25e822538 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
index 3b83355369..3b83355369 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlide.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
index 7e47a24b0a..7e47a24b0a 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
index 89436fcbf0..89436fcbf0 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
index c36035244c..c36035244c 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
index 4c1109e519..4c1109e519 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableRow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
index f1232de7cd..f1232de7cd 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
index 04fa9551d1..04fa9551d1 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
index 749a8faeca..749a8faeca 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
index 783e8abe4d..783e8abe4d 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextRun.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
index 372e0216f4..372e0216f4 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTextShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
index 54f66f6b8b..54f66f6b8b 100644
--- a/ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
index 56c5efda1f..56c5efda1f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/DeferredSXSSFITestDataProvider.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
index 90de9c5977..90de9c5977 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/SXSSFITestDataProvider.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
index db2a96a844..db2a96a844 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestNecessaryOOXMLClasses.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
index f3459af7dc..f3459af7dc 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
index 11c4ff20d7..11c4ff20d7 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestWorkbookProtection.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java
index b3c2896fd8..b3c2896fd8 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFCloneSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
index bb9859998c..bb9859998c 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFMemoryLeak.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java
index b39c33bce0..b39c33bce0 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/TestXSSFOffset.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
index e0ba6617ca..e0ba6617ca 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFITestDataProvider.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
index b981b9994e..b981b9994e 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/XSSFTestDataSamples.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
index 7a56829584..7a56829584 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSharedStringsTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
index 6fd654df31..6fd654df31 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/binary/TestXSSFBSheetHyperlinkManager.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
index 3d59980c05..3d59980c05 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
index 2d6e57e049..2d6e57e049 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFBReader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
index 766ebeb0ef..766ebeb0ef 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
index 377918ec1f..377918ec1f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFSheetXMLHandler.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
index 8cd773a2e9..8cd773a2e9 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
index 0de3611bc1..0de3611bc1 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
index 3dd4b83039..3dd4b83039 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
index 2068a4a993..2068a4a993 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
index 4ef8030119..4ef8030119 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
index 5a6afb7e20..5a6afb7e20 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
index 7e526810e8..7e526810e8 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFImportFromXML.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
index 3d74eba030..3d74eba030 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
index 8f89223e73..8f89223e73 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCalculationChain.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
index a02da05778..a02da05778 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestCommentsTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java
index 045a03601b..045a03601b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
index 290e5fcd0c..290e5fcd0c 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestMapInfo.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
index ae9d6398d4..ae9d6398d4 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestSharedStringsTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
index a18313b577..a18313b577 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestStylesTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java
index b50d691185..b50d691185 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestThemesTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
index 68398310f0..68398310f0 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TempFileRecordingSXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
index f7161fd0e9..f7161fd0e9 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestAutoSizeColumnTracker.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
index 74df887a50..74df887a50 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestDeferredSXSSFWorkbook.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
index 2132956a66..2132956a66 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
index a1377a3b5d..a1377a3b5d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFCell.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
index a344cb115f..a344cb115f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFDataValidation.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
index 3600479f31..3600479f31 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFEvaluationSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
index b007d9b905..b007d9b905 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFFormulaEvaluation.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
index a29d0166e3..a29d0166e3 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
index 59a18bc7e5..59a18bc7e5 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFRow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
index 2d483e6185..2d483e6185 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
index cfb520e508..cfb520e508 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFSheetAutoSizeColumn.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
index aba3a2f376..aba3a2f376 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFUnicodeSurrogates.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
index e065b26adb..e065b26adb 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
index b1fa40fe69..b1fa40fe69 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbookWithCustomZipEntrySource.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
index 864ec3bc0d..864ec3bc0d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSheetDataWriter.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
index dfc129a47f..dfc129a47f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/BaseTestXSSFPivotTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
index 600ce5c31d..600ce5c31d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
index b7f32acd67..b7f32acd67 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMatrixFormulasFromXMLSpreadsheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
index bac2e49688..bac2e49688 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMissingWorkbookOnXSSF.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
index 4c458ea42b..4c458ea42b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
index aeea648a29..aeea648a29 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
index 38ff1fc352..38ff1fc352 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSXSSFSheetAutosizeColumn.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
index f6b4e632b4..f6b4e632b4 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestSheetHiding.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java
index e83cb1cd83..e83cb1cd83 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestTableStyles.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
index 4c9baa3a04..4c9baa3a04 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestUnfixedBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 562fa9f246..562fa9f246 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
index f677b5cc0f..f677b5cc0f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCell.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
index cefac9bb24..cefac9bb24 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
index 7f6978683f..7f6978683f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChart.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
index a97ca36e94..a97ca36e94 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFChartSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
index 227dc3627b..227dc3627b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColGrouping.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
index 88c54d7386..88c54d7386 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFColor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
index aea85b4cc1..aea85b4cc1 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFComment.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
index 30d92dda2f..30d92dda2f 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFConditionalFormatting.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
index b9e2474309..b9e2474309 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataFormat.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
index 18f4d51d5d..18f4d51d5d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidation.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
index 79d340ebe2..79d340ebe2 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
index f85f0411ed..f85f0411ed 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDialogSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
index c072013404..c072013404 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
index 431f585b60..431f585b60 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvaluationSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
index 7c119fa851..7c119fa851 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenFooter.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
index d717a699ea..d717a699ea 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFEvenHeader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
index 219b8423cc..219b8423cc 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFExternalFunctions.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
index 1914f49d54..1914f49d54 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstFooter.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
index 8a67d6aa3b..8a67d6aa3b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFirstHeader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
index 6ec3eb8aaa..6ec3eb8aaa 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
index 9a391019f5..9a391019f5 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFForkedEvaluator.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
index 887e23ae11..887e23ae11 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
index 7b56cf8965..7b56cf8965 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
index 654bf75b31..654bf75b31 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHeaderFooterProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
index 203fbba80c..203fbba80c 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
index 0792ddc655..0792ddc655 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFName.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
index 4113de6225..4113de6225 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddFooter.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
index 4f88009127..4f88009127 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFOddHeader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
index b544f916ac..b544f916ac 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPicture.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
index 5f8514c87b..5f8514c87b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
index fc001229ce..fc001229ce 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableName.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
index 29ddf4b7ea..29ddf4b7ea 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPivotTableRef.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
index f0507e3590..f0507e3590 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPrintSetup.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
index 9a0215e1b0..9a0215e1b0 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRichTextString.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
index 4e6899dfc2..4e6899dfc2 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFRow.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java
index 67486d6f64..67486d6f64 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
index 1ca51d3dcc..1ca51d3dcc 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheet.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
index c9aacd2aa3..c9aacd2aa3 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetAutosizeColumn.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
index 1cce6eb861..1cce6eb861 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetMergeRegions.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
index b6dddc2c6d..b6dddc2c6d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetRowGrouping.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
index 92d5735ec5..92d5735ec5 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftColumns.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
index 06b15f7f4c..06b15f7f4c 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRows.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
index e31332027a..e31332027a 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
index 9217a2f431..9217a2f431 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSheetUpdateArrayFormulas.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
index db0bb77233..db0bb77233 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFSimpleShape.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
index 83763bec73..83763bec73 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
index 8d641ca4dc..8d641ca4dc 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTableColumn.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
index ec13f604be..ec13f604be 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextParagraph.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
index 74434b164b..74434b164b 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFTextRun.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
index 506e0dead8..506e0dead8 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFUnicodeSurrogates.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
index 3bd3012ef5..3bd3012ef5 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFVMLDrawing.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
index 78563bc32e..78563bc32e 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
index bbd1ee0981..bbd1ee0981 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFChartLegend.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
index 5954ffe7b3..5954ffe7b3 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXDDFManualLayout.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
index 9a4bcf5c1e..9a4bcf5c1e 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSF3DChartData.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
index 87d793958e..87d793958e 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFCategoryAxis.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
index e98bfc1296..e98bfc1296 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartAxis.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
index c69af22ce4..c69af22ce4 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFChartTitle.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
index 34acba6286..34acba6286 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFDateAxis.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
index 71ff251ede..71ff251ede 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
index 16f0fa68fe..16f0fa68fe 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
index bc1d6f2c50..bc1d6f2c50 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFValueAxis.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
index 5f905d8e7d..5f905d8e7d 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFBorder.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
index 735b0d5413..735b0d5413 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFCellFill.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
index 6238a41713..6238a41713 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/TestXSSFHeaderFooter.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
index d3d875fc25..d3d875fc25 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorderTest.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
index e3c15ed123..e3c15ed123 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestColumnHelper.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
index c8011af886..c8011af886 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestHeaderFooterHelper.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
index 57591916d4..57591916d4 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/helpers/TestXSSFColumnShifting.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
index e7ba523ded..e7ba523ded 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/MemoryUsage.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
index 2d64973ad5..2d64973ad5 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestCTColComparator.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
index 77a7e8be08..77a7e8be08 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestEvilUnclosedBRFixingInputStream.java
diff --git a/ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
index 856ea584bc..856ea584bc 100644
--- a/ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/util/TestNumericRanges.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
index 09355e810d..09355e810d 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestAllExtendedProperties.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
index 4aac209eb9..4aac209eb9 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestDocumentProtection.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
index 6840722c5d..6840722c5d 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestNecessaryOOXMLClasses.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
index 033c466cc6..033c466cc6 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
index 48b8d093da..48b8d093da 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/TestXWPFBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
index d7cb2c23ad..d7cb2c23ad 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/XWPFTestDataSamples.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java
index d7c5f1e4b3..d7c5f1e4b3 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestExternalEntities.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
index 6e5716549b..6e5716549b 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/extractor/TestXWPFWordExtractor.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
index d908d2c565..d908d2c565 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFDecorators.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
index d47d5ae944..d47d5ae944 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/model/TestXWPFHeaderFooterPolicy.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
index 39673c3bba..39673c3bba 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestChangeTracking.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java
index de8d9541b9..de8d9541b9 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestColumn.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
index e71c3a2413..e71c3a2413 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFAbstractNum.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
index 2974c879dc..2974c879dc 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFBugs.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
index eca90582e9..eca90582e9 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFChart.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
index 79ffa2d701..79ffa2d701 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
index dad5ab877b..dad5ab877b 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
index db1b969b58..db1b969b58 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
index e375d710fb..e375d710fb 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnote.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
index 7292553715..7292553715 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFEndnotes.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
index 9d8e563326..9d8e563326 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnote.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
index e73baa056c..e73baa056c 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFFootnotes.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
index 73d2eebe20..73d2eebe20 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
index 5e34741aed..5e34741aed 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFHeadings.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
index c1806c946a..c1806c946a 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFNumbering.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
index 73eb333e65..73eb333e65 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFParagraph.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
index 7deb6f22a6..7deb6f22a6 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
index 1de994a804..1de994a804 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
index 235c17d3ab..235c17d3ab 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSDT.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
index ffd9a5e02d..ffd9a5e02d 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFSmartTag.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
index 6c517f4c95..6c517f4c95 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
index 0feddb6819..0feddb6819 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTable.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
index 36d0277568..36d0277568 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableCell.java
diff --git a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
index 1c1fe03c88..1c1fe03c88 100644
--- a/ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java
diff --git a/poi-ooxml/src/test/java9/module-info.class b/poi-ooxml/src/test/java9/module-info.class
new file mode 100644
index 0000000000..48d64ad97b
--- /dev/null
+++ b/poi-ooxml/src/test/java9/module-info.class
diff --git a/ooxml/src/test/java9/module-info.java b/poi-ooxml/src/test/java9/module-info.java
index 152cab9e5c..152cab9e5c 100644
--- a/ooxml/src/test/java9/module-info.java
+++ b/poi-ooxml/src/test/java9/module-info.java
diff --git a/poi-scratchpad/build.gradle b/poi-scratchpad/build.gradle
new file mode 100644
index 0000000000..0bf5032038
--- /dev/null
+++ b/poi-scratchpad/build.gradle
@@ -0,0 +1,227 @@
+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
+   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.
+==================================================================== */
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String TEST9_SRC = 'src/test/java9'
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+configurations {
+    tests
+}
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+    test {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
+    }
+}
+
+dependencies {
+    api project(':poi')
+    api project(path:':poi', configuration: 'archives')
+    implementation "commons-codec:commons-codec:${commonsCodecVersion}"
+    implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+
+    testImplementation project(path: ':poi', configuration: 'tests')
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+final MODULE_NAME = 'org.apache.poi.scratchpad'
+final Pattern MODULE_NOT_REGEX = ~'(poi[/\\\\][^/\\\\]+$|batik-script)'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MAIN_MODULE_PATH = sourceSets.main.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX }.collect{ it.parent }.unique()
+final List TEST_MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava', ':poi:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    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
+    ]
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+task compileTest9(type: JavaCompile) {
+    dependsOn 'compileTestJava', ':poi:jar'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(TEST9_OUT + VERSIONS9)
+    source = file(TEST9_SRC)
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${(sourceSets.main.output.classesDirs + sourceSets.test.output.classesDirs).asPath}",
+        '--module-path', files(TEST_MODULE_PATH).asPath
+    ]
+    classpath = files()
+}
+
+
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+// 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) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
+
+    classifier 'tests'
+    // ignore second module-info.class from main
+    duplicatesStrategy = 'exclude'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }
+
+    from sourceSets.test.output + sourceSets.main.output
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+sourcesJar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+    exclude 'META-INF/services/**'
+}
+
+artifacts {
+    tests testJar
+}
+
+test {
+    dependsOn 'testJar'
+
+    useJUnitPlatform()
+
+   doFirst {
+        jvmArgs = [
+            '-Djava.io.tmpdir=build',
+            '-DPOI.testdata.path=../test-data',
+            '-Djava.awt.headless=true',
+            '-Djava.locale.providers=JRE,CLDR',
+            '-Duser.language=en',
+            '-Duser.country=US',
+            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
+            "-Dversion.id=${project.version}",
+            '-ea',
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3',
+            // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
+        ]
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            jvmArgs += [
+                '-Dsun.reflect.debugModuleAccessChecks=true',
+                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
+                '--illegal-access=warn',
+
+                '--add-modules', MODULE_NAME,
+
+                // 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=ALL-UNNAMED',
+                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                '--module-path', '../build/dist/maven/poi-scratchpad-tests:' + files(TEST_MODULE_PATH).asPath,
+            ]
+        }
+    }
+}
+
+javadoc {
+//    fails currently, need to fix the sources
+    failOnError = false
+//    if(JavaVersion.current().isJava9Compatible()) {
+//        options.addBooleanOption('html5', true)
+//    }
+}
+
+publishing {
+    publications {
+        POI(MavenPublication) {
+            artifactId project.archivesBaseName
+
+            from components.java
+
+            pom {
+                name = 'Apache POI'
+                description = 'Apache POI - Java API To Access Microsoft Format Files (Scratchpad)'
+            }
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/scratchpad/models/poi-hdf.zargo b/poi-scratchpad/models/poi-hdf.zargo
index dde1132850..dde1132850 100644
--- a/scratchpad/models/poi-hdf.zargo
+++ b/poi-scratchpad/models/poi-hdf.zargo
diff --git a/scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
index 70da34747b..70da34747b 100644
--- a/scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/extractor/ole2/OLE2ScratchpadExtractorFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
index 4f578c58f7..4f578c58f7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFDiagram.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
index 9879eee028..9879eee028 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZW.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
index 9a8a7559a1..9a8a7559a1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/HDGFLZWCompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
index 6ccc5a6797..6ccc5a6797 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/Chunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
index 76b5937338..76b5937338 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
index f5493ac643..f5493ac643 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeader.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
index 3dc1e8113e..3dc1e8113e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV11.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
index b4eb9d83d7..b4eb9d83d7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV4V5.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
index 2a221a7028..2a221a7028 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkHeaderV6.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
index ee009db15e..ee009db15e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkSeparator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
index 92160abb8e..92160abb8e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/chunks/ChunkTrailer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
index a82e914edd..a82e914edd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/dev/VSDDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
index c893bd2dfb..c893bd2dfb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/exceptions/HDGFException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
index 570eaacf4c..570eaacf4c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/extractor/VisioTextExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
index 06db8781b0..06db8781b0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/Pointer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
index bb1d064369..bb1d064369 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java
index d276b909de..d276b909de 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV5.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
index 9983c4ccd4..9983c4ccd4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/pointers/PointerV6.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
index b977483473..b977483473 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/ChunkStream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
index a8bea5ccd8..a8bea5ccd8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/CompressedStreamStore.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
index e7f3cf39d4..e7f3cf39d4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/PointerContainingStream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
index abd7f19e2c..abd7f19e2c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/Stream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
index fa577ad2e9..fa577ad2e9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StreamStore.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
index ac6386adc4..ac6386adc4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/StringsStream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
index 9e772c2f18..9e772c2f18 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/TrailerStream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
index e08d7f93c7..e08d7f93c7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hdgf/streams/UnknownStream.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java
index 5ec47cc054..5ec47cc054 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfDrawProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
index 113f8ede25..113f8ede25 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfGraphics.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
index 95d3b7e70a..95d3b7e70a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/draw/HemfImageRenderer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java
index 443a7ee4de..443a7ee4de 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfComment.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java
index 02366a5b8d..02366a5b8d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfDraw.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
index 803fb98855..803fb98855 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFill.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java
index c7f189f1d5..c7f189f1d5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfFont.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java
index d8d3d34c7c..d8d3d34c7c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfHeader.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java
index 996a44f08e..996a44f08e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfMisc.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java
index 607e30244e..607e30244e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPalette.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java
index 041f39423f..041f39423f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfPenStyle.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java
index fe6a6ccf68..fe6a6ccf68 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
index afdcaa533f..afdcaa533f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java
index 0066c8c16a..0066c8c16a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfRecordType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java
index 9a8f629afc..9a8f629afc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfText.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java
index 46e28209f8..46e28209f8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/HemfWindowing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
index 6a2fb0e6c9..6a2fb0e6c9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emf/UnimplementedHemfRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
index 71ade3fdb3..71ade3fdb3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusBrush.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
index b52e44b833..b52e44b833 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusDraw.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
index 857a8e93f5..857a8e93f5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusFont.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
index 2d8f3b0e45..2d8f3b0e45 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusGDIImageRenderer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
index a271e77de1..a271e77de1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusHeader.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
index 840b752f37..840b752f37 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusImage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
index eaaf0a88f1..eaaf0a88f1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusMisc.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
index 1e04c5524e..1e04c5524e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusObject.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
index a69f4954e1..a69f4954e1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPath.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
index cd00d453cc..cd00d453cc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusPen.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
index 99210ad7ab..99210ad7ab 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
index 032ef0a86c..032ef0a86c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
index acbba48668..acbba48668 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRecordType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
index 9ccfb5ff6a..9ccfb5ff6a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/HemfPlusRegion.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
index 74c8e6c458..74c8e6c458 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/record/emfplus/UnimplementedHemfPlusRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
index 1b02478861..1b02478861 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfEmbeddedIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java
index e5964ae871..e5964ae871 100644
--- a/scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hemf/usermodel/HemfPicture.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
index 1e164dbaae..1e164dbaae 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/Attachment.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
index c3e2ab0c38..c3e2ab0c38 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/CompressedRTF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
index 6997cbf87b..6997cbf87b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/HMEFMessage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
index 0533705c2e..0533705c2e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
index 59d7be584d..59d7be584d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIDateAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
index 295a022db8..295a022db8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIRtfAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
index 9ad7a09997..9ad7a09997 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/MAPIStringAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
index 547bad8e11..547bad8e11 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
index 1c64dbe3c1..1c64dbe3c1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFDateAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
index 9bf6d4073f..9bf6d4073f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFMAPIAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
index e90c910470..e90c910470 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFProperty.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
index d42feaa51a..d42feaa51a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/attribute/TNEFStringAttribute.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
index d0019cebf4..d0019cebf4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/dev/HMEFDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
index 4c95ecb19f..4c95ecb19f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hmef/extractor/HMEFContentsExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
index 1f600977c3..1f600977c3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/HPBFDocument.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
index a638ba9e77..a638ba9e77 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/HPBFDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
index 3c222d51b2..3c222d51b2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/dev/PLCDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
index ac7ed74153..ac7ed74153 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
index 3f4784ac4a..3f4784ac4a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherDelayStm.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
index 47b16b7d4e..47b16b7d4e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherPart.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
index 07cd4c66ac..07cd4c66ac 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/EscherStm.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
index ae6e8fdad7..ae6e8fdad7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/HPBFPart.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
index d1c5e3ff61..d1c5e3ff61 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/MainContents.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
index 6d5b67173a..6d5b67173a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/QuillContents.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
index dddbdde5bb..dddbdde5bb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCBit.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
index 57146192ff..57146192ff 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCPLCBit.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
index cc153708bb..cc153708bb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/QCTextBit.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
index 64dae7ba11..64dae7ba11 100644
--- a/scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hpbf/model/qcbits/UnknownQCBit.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
index bb5904da55..bb5904da55 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Bitmap.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
index 1840d55409..1840d55409 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/DIB.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
index e6bf60da16..e6bf60da16 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/EMF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
index cf90746d6b..cf90746d6b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/JPEG.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
index ea855d460e..ea855d460e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/Metafile.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
index a6c2765ec7..a6c2765ec7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PICT.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
index 197cb3d828..197cb3d828 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/PNG.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
index 55b74bdb6f..55b74bdb6f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/blip/WMF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
index d44204331a..d44204331a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPDrawingTextListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
index 4e431976a3..4e431976a3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/PPTXMLDump.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
index ff42ce0a45..ff42ce0a45 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
index bb53698f7c..bb53698f7c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SLWTTextListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
index a4ed6d28b6..a4ed6d28b6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideAndNotesAtomListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
index e80cbc18ec..e80cbc18ec 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideIdListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
index 230892e61f..230892e61f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
index cff59a70c5..cff59a70c5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/SlideShowRecordDumper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
index 8df3ef0f01..8df3ef0f01 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/TextStyleListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
index 116582e7f3..116582e7f3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/dev/UserEditAndPersistListing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
index 3c61039483..3c61039483 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/CorruptPowerPointFileException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
index de9d534777..de9d534777 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
index f534d9ce0d..f534d9ce0d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/HSLFException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
index fbb2f6d5f9..fbb2f6d5f9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/exceptions/OldPowerPointFormatException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
index 926aada0ec..926aada0ec 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/ImageExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
index 1c2a0e6d79..1c2a0e6d79 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/extractor/QuickButCruddyTextExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
index f8c02deac7..f8c02deac7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/ActiveXShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java
index 54495aab2a..54495aab2a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HSLFMetroShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
index 64b6dc6a35..64b6dc6a35 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/HeadersFooters.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
index ee00ae73ab..ee00ae73ab 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/MovieShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
index 061e89555c..061e89555c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/Polygon.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
index 17d5ea5610..17d5ea5610 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/BitMaskTextProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
index 4b7046626e..4b7046626e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/CharFlagsTextProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
index b1bf586199..b1bf586199 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/FontAlignmentProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
index a8db55e521..a8db55e521 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStop.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
index 247077404b..247077404b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/HSLFTabStopPropCollection.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
index e62b4b9b63..e62b4b9b63 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/IndentProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
index 0ffc38e5b3..0ffc38e5b3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/ParagraphFlagsTextProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
index 96c0694208..96c0694208 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextAlignmentProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
index 927cbe553d..927cbe553d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPFException9.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
index ba4eb1ecd0..ba4eb1ecd0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
index 9155731dcd..9155731dcd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/TextPropCollection.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
index 27d0d5d9e4..27d0d5d9e4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/model/textproperties/WrapFlagsTextProp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
index 9bf2bf789f..9bf2bf789f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfo.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
index f89e188f14..f89e188f14 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/AnimationInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
index 79d8d9da7d..79d8d9da7d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/BinaryTagDataBlob.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
index 329915f93e..329915f93e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CString.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
index 8625245844..8625245844 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ColorSchemeAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
index 69c8d2181f..69c8d2181f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
index 00c3cdef01..00c3cdef01 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Comment2000Atom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
index ebb3fc01b9..ebb3fc01b9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/CurrentUserAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java
index a43e475034..a43e475034 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocInfoListContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
index 73489a9d2f..73489a9d2f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Document.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
index 273c3a6a2c..273c3a6a2c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
index bb498f2088..bb498f2088 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DocumentEncryptionAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
index db7a0cb943..db7a0cb943 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyPositionSensitiveRecordWithChildren.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
index cc99aa2f98..cc99aa2f98 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/DummyRecordWithChildren.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
index a8bebeaeaa..a8bebeaeaa 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Environment.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
index 28dff25ce9..28dff25ce9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherPlaceholder.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
index 7cfe763f98..7cfe763f98 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/EscherTextboxWrapper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
index 62a5c4bbe3..62a5c4bbe3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExAviMovie.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
index 58be5715ee..58be5715ee 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
index 58d27ef340..58d27ef340 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExControlAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
index f9443b85d0..f9443b85d0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbed.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
index f3c3a48f43..f3c3a48f43 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExEmbedAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
index 945a8df41b..945a8df41b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlink.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
index ba63ac5da6..ba63ac5da6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExHyperlinkAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
index 81654dfded..81654dfded 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMCIMovie.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
index 486b976f66..486b976f66 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExMediaAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
index bee803a21b..bee803a21b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjList.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
index 5fab662c42..5fab662c42 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjListAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java
index a1e3d168c8..a1e3d168c8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExObjRefAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
index 321f09cb41..321f09cb41 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
index 4fc8a838e0..4fc8a838e0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExOleObjStg.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
index c6935e84dd..c6935e84dd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ExVideoContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
index 665824fcc8..665824fcc8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontCollection.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java
index b9acb2e3bf..b9acb2e3bf 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEmbeddedData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
index 0d576f6a6a..0d576f6a6a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/FontEntityAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
index af0e0a5ec5..af0e0a5ec5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
index 36ed8229c2..36ed8229c2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HSLFEscherRecordFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
index 42f8d017ca..42f8d017ca 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
index 2c1bd86229..2c1bd86229 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/HeadersFootersContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
index 38b0c6ecc9..38b0c6ecc9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfo.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
index 3543010612..3543010612 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/InteractiveInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
index e771fcf57d..e771fcf57d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MainMaster.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
index 1e3cf364a4..1e3cf364a4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/MasterTextPropAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
index 4854426283..4854426283 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Notes.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
index 655898adb8..655898adb8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/NotesAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
index af3595fecb..af3595fecb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OEPlaceholderAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
index e521c74383..e521c74383 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/OutlineTextRefAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
index 396fbc06f4..396fbc06f4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
index 6ff8b4577f..6ff8b4577f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PPDrawingGroup.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
index b2d84373cb..b2d84373cb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/ParentAwareRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
index 1ee2403cf7..1ee2403cf7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistPtrHolder.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
index 339331865c..339331865c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PersistRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
index 844c14d45d..844c14d45d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
index dce90a981d..dce90a981d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
index fdd61d9cf2..fdd61d9cf2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/PositionDependentRecordContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
index be3bde7aab..be3bde7aab 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Record.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
index 4de227a2c2..4de227a2c2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
index 635ad85b28..635ad85b28 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
index c57003c89b..c57003c89b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RecordTypes.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
index 283c65ba43..283c65ba43 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/RoundTripHFPlaceholder12.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
index 7bd098f92b..7bd098f92b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SSSlideInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
index 08c05c46af..08c05c46af 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SheetContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
index cf8d2466c0..cf8d2466c0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Slide.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
index 5728bacf4c..5728bacf4c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java
index e91bc7ddb4..e91bc7ddb4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideAtomLayout.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
index d0298a5be2..d0298a5be2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlideListWithText.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
index d52552ab7b..d52552ab7b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SlidePersistAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
index 2df455bd9e..2df455bd9e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/Sound.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
index 3fda587c6e..3fda587c6e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundCollection.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
index 0989052c56..0989052c56 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/SoundData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
index 20317e3074..20317e3074 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextProp9Atom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
index de2b28c311..de2b28c311 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/StyleTextPropAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
index 81a503b95c..81a503b95c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextBytesAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
index 768aaba6ef..768aaba6ef 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextCharsAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
index 187e2f4bce..187e2f4bce 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextHeaderAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
index 5de317cc0c..5de317cc0c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextRulerAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
index b26e9cb04b..b26e9cb04b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java
index 9c890a2b56..9c890a2b56 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TextSpecInfoRun.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
index f5896aa817..f5896aa817 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxInteractiveInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
index a396cd95bf..a396cd95bf 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/TxMasterStyleAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
index 886a0dd20f..886a0dd20f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
index b89da4a98c..b89da4a98c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/UserEditAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java
index 4607bb6141..4607bb6141 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoAtom.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java
index 043cea2286..043cea2286 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/record/VBAInfoContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
index c02561d8c7..c02561d8c7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFAutoShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java
index 8f477f9562..8f477f9562 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFBackground.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java
index 0548fca452..0548fca452 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFComment.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
index d87f24b01b..d87f24b01b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFConnectorShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
index bb2c52b214..bb2c52b214 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFill.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
index 3b509276ca..3b509276ca 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfo.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
index d2dc44095e..d2dc44095e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFontInfoPredefined.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
index 0a3bcc91bb..0a3bcc91bb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
index cfa09db8a4..cfa09db8a4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
index 5575d16bb7..5575d16bb7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFHyperlink.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java
index 1e42326f26..1e42326f26 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFLine.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
index 5c424cc8a7..5c424cc8a7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFMasterSheet.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java
index 9377bfa439..9377bfa439 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFNotes.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java
index 60f864188d..60f864188d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
index 344e038374..344e038374 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFObjectShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java
index 7f9b54eb09..7f9b54eb09 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
index 6aba4b23ff..6aba4b23ff 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
index 4b13300590..4b13300590 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholder.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
index 906e51c44b..906e51c44b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFPlaceholderDetails.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
index 8fed381c38..8fed381c38 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
index 47c895e0e3..47c895e0e3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeContainer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
index b13789f843..b13789f843 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
index dc32a2d109..dc32a2d109 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
index 9a010661c5..9a010661c5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSheet.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
index cc9932a61c..cc9932a61c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSimpleShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java
index 7d1b6711ee..7d1b6711ee 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlide.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
index 2f258e6eb6..2f258e6eb6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideMaster.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
index 5e2e5d9ebc..5e2e5d9ebc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShow.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
index 42682f550d..42682f550d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
index 936eae064e..936eae064e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowFactory.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
index f697e859ce..f697e859ce 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java
index dda143735a..dda143735a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFSoundData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java
index 6218e1e5ed..6218e1e5ed 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java
index 0956e6f31d..0956e6f31d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTableCell.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java
index 485389dcdd..485389dcdd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextBox.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
index 3f1e48c6af..3f1e48c6af 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java
index 2ffd690264..2ffd690264 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextRun.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
index 9a60a2e8ae..9a60a2e8ae 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTextShape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
index 59b0e3f287..59b0e3f287 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/usermodel/HSLFTitleMaster.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
index 10b566a8be..10b566a8be 100644
--- a/scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hslf/util/SystemTimeUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
index 6e36712276..6e36712276 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/MAPIMessage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
index 83e5159813..83e5159813 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/AttachmentChunks.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
index ab5ca3a84e..ab5ca3a84e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
index ce977b83b1..ce977b83b1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ByteChunkDeferred.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
index 5073771fc3..5073771fc3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
index ac3dfe7521..ac3dfe7521 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkBasedPropertyValue.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
index 273950b28c..273950b28c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroup.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
index e29d01b804..e29d01b804 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/ChunkGroupWithProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
index 041ab37556..041ab37556 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Chunks.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
index 2b42db7209..2b42db7209 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/DirectoryChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
index 81c431b2b7..81c431b2b7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MAPIProperty.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
index e93446e294..e93446e294 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessagePropertiesChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
index f1ef43c766..f1ef43c766 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/MessageSubmissionChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
index 6af621e26f..6af621e26f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/NameIdChunks.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
index 6cf92111a6..6cf92111a6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertiesChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
index 1d809cba8d..1d809cba8d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/PropertyValue.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
index 8b37806fdc..8b37806fdc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/RecipientChunks.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
index 50b393d21b..50b393d21b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StoragePropertiesChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
index 8e63bddd23..8e63bddd23 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/StringChunk.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
index 4c92da4f0f..4c92da4f0f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/datatypes/Types.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
index 002792d191..002792d191 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/HSMFDump.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
index 6cb05b30fb..6cb05b30fb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/dev/TypesLister.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
index 9f00435369..9f00435369 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/exceptions/ChunkNotFoundException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
index a818d03280..a818d03280 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/extractor/OutlookTextExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
index 086a653086..086a653086 100644
--- a/scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hsmf/parsers/POIFSChunkParser.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
index 6f5ab29bb4..6f5ab29bb4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
index aa8863f841..aa8863f841 100644
--- a/scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/AbstractExcelUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
index 50cf5427b2..50cf5427b2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToFoConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
index 0110c71ec9..0110c71ec9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
index 63e71d9b98..63e71d9b98 100644
--- a/scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hssf/converter/ExcelToHtmlUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
index f0993b24da..f0993b24da 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfDrawProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
index 701ab2d54e..701ab2d54e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphics.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
index e04046f4c2..e04046f4c2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfGraphicsState.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
index 9a44028f07..9a44028f07 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfImageRenderer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
index 85cba2371a..85cba2371a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP2Composite.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
index 6cac2a5dca..6cac2a5dca 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/draw/HwmfROP3Composite.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
index 5325931dbe..5325931dbe 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBinaryRasterOp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java
index cc103b2c06..cc103b2c06 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmap16.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java
index 91597803e1..91597803e1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBitmapDib.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java
index 2d2c74577c..2d2c74577c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfBrushStyle.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java
index 6cb4c41def..6cb4c41def 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfColorRef.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java
index 1c99601642..1c99601642 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfDraw.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java
index 82baf52036..82baf52036 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfEscape.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java
index 90fe33881e..90fe33881e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFill.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
index ff64eee42d..ff64eee42d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfFont.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java
index addf32d652..addf32d652 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHatchStyle.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java
index 2f1ada526b..2f1ada526b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfHeader.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java
index 2e09606bdd..2e09606bdd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMapMode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
index b4ecc2fc3c..b4ecc2fc3c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfMisc.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
index 0aad3d6d16..0aad3d6d16 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfObjectTableEntry.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java
index efaa774497..efaa774497 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPalette.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java
index fced0a24a5..fced0a24a5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPenStyle.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
index 82aba4b12d..82aba4b12d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfPlaceableHeader.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java
index b68af18460..b68af18460 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecord.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java
index 297808debd..297808debd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRecordType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java
index 903cc39eee..903cc39eee 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfRegionMode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
index 2f79af4087..2f79af4087 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfTernaryRasterOp.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java
index 6f72d28650..6f72d28650 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfText.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java
index d323f86106..d323f86106 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/record/HwmfWindowing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
index 1897278420..1897278420 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfCharsetAware.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
index 2bb9187988..2bb9187988 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbedded.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
index 19fda80509..19fda80509 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
index e9e96edb1c..e9e96edb1c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfEmbeddedType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
index 0fb9637f6a..0fb9637f6a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwmf/usermodel/HwmfPicture.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
index 6571c650af..6571c650af 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocument.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
index 66c3b51bcc..66c3b51bcc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFDocumentCore.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
index a5a3d441cb..a5a3d441cb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/HWPFOldDocument.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
index cfa97bc70e..cfa97bc70e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/OldWordFileFormatException.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
index 743cc40c2b..743cc40c2b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/QuickTest.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
index 1ff262d456..1ff262d456 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
index 1f633c5767..1f633c5767 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/AbstractWordUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
index b9845fd348..b9845fd348 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/DefaultFontReplacer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
index b9c449be63..b9c449be63 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FoDocumentFacade.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
index a8b07c085a..a8b07c085a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/FontReplacer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
index fe75ad1499..fe75ad1499 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/HtmlDocumentFacade.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
index 4a69de63c5..4a69de63c5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/NumberFormatter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
index e8bb2e2c5a..e8bb2e2c5a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/PicturesManager.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
index c92b3d56a3..c92b3d56a3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/TextDocumentFacade.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
index d91708424c..d91708424c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
index 32cf161a5c..32cf161a5c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToFoUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
index a60d504405..a60d504405 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
index 484d367788..484d367788 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToHtmlUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
index cebc55b743..cebc55b743 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/converter/WordToTextConverter.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
index 1c15980b90..1c15980b90 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/FieldIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
index 6d487487bc..6d487487bc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/HWPFLister.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
index 6ecb5c33df..6ecb5c33df 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/dev/RecordUtil.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
index 526d21be35..526d21be35 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/Word6Extractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
index 1cd5d0d654..1cd5d0d654 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/extractor/WordExtractor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
index 0de0daf226..0de0daf226 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarkFirstDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
index 1ffdbc635d..1ffdbc635d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BookmarksTables.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
index 9ad54d7d9c..9ad54d7d9c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/BytePropertyNode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
index 178186bd35..178186bd35 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPBinTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
index 349f39b634..349f39b634 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPFormattedDiskPage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
index 27d60ad833..27d60ad833 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CHPX.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
index 2ab1735cdd..2ab1735cdd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/CharIndexTranslator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
index 7ae494fb05..7ae494fb05 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Colorref.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
index 7dc6081cc5..7dc6081cc5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ComplexFileTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
index f292643fb1..f292643fb1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/DocumentProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
index a33e5af350..a33e5af350 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
index b12fe40691..b12fe40691 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FFDataBase.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
index 227df337c0..227df337c0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FIBFieldHandler.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
index 3688914061..3688914061 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPA.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
index 287b64d932..287b64d932 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPADocumentPart.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
index 5da742096d..5da742096d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FSPATable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
index 532318d739..532318d739 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Ffn.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
index 8f505b9588..8f505b9588 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibBase.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
index d6bb805dd5..d6bb805dd5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
index f2834eff39..f2834eff39 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw95.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
index 933afd0ca0..933afd0ca0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgLw97.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
index c3b0f6bd9c..c3b0f6bd9c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FibRgW97.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
index 58e55a46cd..58e55a46cd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
index 0a3de3030e..0a3de3030e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsDocumentPart.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
index 595078e47f..595078e47f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FieldsTables.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
index 0fb355cc4a..0fb355cc4a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FileInformationBlock.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
index 8fba06f82b..8fba06f82b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FontTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
index 6c21ff2fd7..6c21ff2fd7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FootnoteReferenceDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
index 4c82d2db25..4c82d2db25 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/FormattedDiskPage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
index 802530745c..802530745c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/GenericPropertyNode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
index f627289a48..f627289a48 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Grfhic.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
index ac391ba780..ac391ba780 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Hyphenation.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
index edc069964a..edc069964a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFO.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
index 2f22afdd51..2f22afdd51 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
index 3a50a7c2f3..3a50a7c2f3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LFOLVLBase.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
index 9e00ffed40..9e00ffed40 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LSTF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
index 38192d263d..38192d263d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/LVLF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
index a6d817a72f..a6d817a72f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
index 8f23eeb5cb..8f23eeb5cb 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListFormatOverrideLevel.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
index f13e9a3884..f13e9a3884 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListLevel.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
index e163b2f005..e163b2f005 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ListTables.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
index 3377c8cd9c..3377c8cd9c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NilPICFAndBinData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
index 8168e96ae3..8168e96ae3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NoteType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
index 92fa5287f0..92fa5287f0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/NotesTables.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
index 35436bf75a..35436bf75a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OfficeArtContent.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
index 04fdd322a2..04fdd322a2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldCHPBinTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java
index 25510c89e9..25510c89e9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldComplexFileTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java
index 38c0d53cab..38c0d53cab 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFfn.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java
index d4935a1ba6..d4935a1ba6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldFontTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
index 0f7c90d529..0f7c90d529 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldPAPBinTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
index 684d3bd8b5..684d3bd8b5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldSectionTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java
index b14c38223d..b14c38223d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPiece.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java
index e6a0887f32..e6a0887f32 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/OldTextPieceTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
index 675b62e8be..675b62e8be 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPBinTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
index e9c56cc558..e9c56cc558 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPFormattedDiskPage.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
index 2825f45db4..2825f45db4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PAPX.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
index 44ab74078b..44ab74078b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICF.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
index fb34604169..fb34604169 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PICFAndOfficeArtData.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
index 4f966badd7..4f966badd7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/ParagraphHeight.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
index e01f6ff0e1..e01f6ff0e1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PicturesTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
index 4d4d3ade78..4d4d3ade78 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PieceDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
index 658cb60c9e..658cb60c9e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfCps.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
index 15793b7a4e..15793b7a4e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlexOfField.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
index b2adc51ef1..b2adc51ef1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PlfLfo.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
index a2e0bd2ff3..a2e0bd2ff3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyModifier.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
index 7784e41255..7784e41255 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/PropertyNode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
index 2c4bd5521c..2c4bd5521c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/RevisionMarkAuthorTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
index f9a5fd64c2..f9a5fd64c2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SEPX.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
index b6a5796a3d..b6a5796a3d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByEntry.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
index e8eff88eb1..e8eff88eb1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SavedByTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
index 36832e6c45..36832e6c45 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
index 547960c185..547960c185 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SectionTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
index 6622cc7d10..6622cc7d10 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SinglentonTextPiece.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
index 395d129b3a..395d129b3a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfBase.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
index b0eaede7a1..b0eaede7a1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StdfPost2000.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
index bb1cced65a..bb1cced65a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Stshif.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
index 85343ee242..85343ee242 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Sttb.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
index 850d40d509..850d40d509 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SttbUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
index 05b2c04677..05b2c04677 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleDescription.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
index ac37396657..ac37396657 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/StyleSheet.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
index 89d16d2e02..89d16d2e02 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/SubdocumentType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
index 01c04b120e..01c04b120e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TabDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
index 0c606cbf03..0c606cbf03 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPiece.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
index cd885b9556..cd885b9556 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/TextPieceTable.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
index 5de2fe5248..5de2fe5248 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UPX.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
index 89d5c492fd..89d5c492fd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/UnhandledDataStructure.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
index 769786afb8..769786afb8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xst.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
index 34acfb99dc..34acfb99dc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/Xstz.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
index 1d1b403439..1d1b403439 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/io/HWPFFileSystem.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
index 660f4f5824..660f4f5824 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/BKFAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
index e18a3e724b..e18a3e724b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/CHPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
index 6ba7a30183..6ba7a30183 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/DOPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
index 33557615f6..33557615f6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FFDataBaseAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
index 3da59198d9..3da59198d9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FLDAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
index 1c75451897..1c75451897 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FRDAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
index 8d7df40e36..8d7df40e36 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FSPAAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
index de588af3d9..de588af3d9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibBaseAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
index 45b97641d5..45b97641d5 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw95AbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
index 48bfcebfd6..48bfcebfd6 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgLw97AbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
index 21d2e4ae13..21d2e4ae13 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/FibRgW97AbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
index a6433f8597..a6433f8597 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/GrfhicAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
index d4e410e2a3..d4e410e2a3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/HRESIAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
index 7f37e95a27..7f37e95a27 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
index 81bc72a117..81bc72a117 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LFOLVLBaseAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
index 2565e1e306..2565e1e306 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LSTFAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
index 79ade79b26..79ade79b26 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/LVLFAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
index 220a6aff63..220a6aff63 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PAPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
index 22d4b22dbe..22d4b22dbe 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/PICFAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
index f74a1afab4..f74a1afab4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SEPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
index 985ddbe633..985ddbe633 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHD80AbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
index c31f5a9a93..c31f5a9a93 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/SHDAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
index 8282e38933..8282e38933 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfBaseAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
index 26e5fd68fc..26e5fd68fc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StdfPost2000AbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
index 5b72d2e5c8..5b72d2e5c8 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/StshifAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
index ffed2cbcc1..ffed2cbcc1 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TAPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
index f167ebf398..f167ebf398 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TBDAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
index e02d6a1939..e02d6a1939 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TCAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
index 6d0e426989..6d0e426989 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/model/types/TLPAbstractType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
index 7abe46e8ec..7abe46e8ec 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmCompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
index bad4429041..bad4429041 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/CharacterSprmUncompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
index 65112c748d..65112c748d 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmCompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
index d1d41919fc..d1d41919fc 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/ParagraphSprmUncompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
index fe2480fdc4..fe2480fdc4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmCompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
index 68375bb443..68375bb443 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SectionSprmUncompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
index 201d069742..201d069742 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmBuffer.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
index dd4ba7962f..dd4ba7962f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
index 705de1f1c9..705de1f1c9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmOperation.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
index ef2e117ead..ef2e117ead 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUncompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
index 8563749a64..8563749a64 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/SprmUtils.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
index 9c76e2ec13..9c76e2ec13 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmCompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
index 9feb5057a3..9feb5057a3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/sprm/TableSprmUncompressor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
index 1836d8906c..1836d8906c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmark.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
index c4dae5e9db..c4dae5e9db 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Bookmarks.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
index 7c9d7ad9d7..7c9d7ad9d7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BookmarksImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
index 9f2c1ab466..9f2c1ab466 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/BorderCode.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
index 71e98888e0..71e98888e0 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
index 96fb227dd9..96fb227dd9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/CharacterRun.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
index 38c4a2895c..38c4a2895c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DateAndTime.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
index c5589f0d52..c5589f0d52 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/DropCapSpecifier.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
index de7ebcd3fe..de7ebcd3fe 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Field.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
index 37131c3e15..37131c3e15 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
index 2db551e5e2..2db551e5e2 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Fields.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
index b57d70ebd7..b57d70ebd7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/FieldsImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
index 2f100bb658..2f100bb658 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HWPFList.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
index b15757ae03..b15757ae03 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/HeaderStories.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
index 8849f8aa75..8849f8aa75 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/LineSpacingDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
index d7158fac75..d7158fac75 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ListEntry.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
index 9e6cf567f3..9e6cf567f3 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Notes.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
index 16c8ada155..16c8ada155 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/NotesImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
index c672134ec4..c672134ec4 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectPoolImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
index d9f39d7543..d9f39d7543 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ObjectsPool.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
index 4bed04e495..4bed04e495 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawing.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
index 58661aa8dd..58661aa8dd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawings.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
index ec5477725a..ec5477725a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
index e5d1395f75..e5d1395f75 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Paragraph.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
index f1c78be1d9..f1c78be1d9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ParagraphProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
index 913b4950ae..913b4950ae 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Picture.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
index 8f7de73d7c..8f7de73d7c 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureRunMapper.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
index e630925dcd..e630925dcd 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/PictureType.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
index 0b6cbcb644..0b6cbcb644 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Range.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
index ac0e6f25af..ac0e6f25af 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Section.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
index 72f688ad3a..72f688ad3a 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/SectionProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
index 5274645f51..5274645f51 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
index aefd3feb9f..aefd3feb9f 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/ShadingDescriptor80.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
index 40ef0d4219..40ef0d4219 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/Table.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
index 8893c4da2b..8893c4da2b 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableAutoformatLookSpecifier.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
index 3dca841c89..3dca841c89 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCell.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
index e7e99373c7..e7e99373c7 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableCellDescriptor.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
index b2b11d288e..b2b11d288e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableIterator.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
index eec31c4815..eec31c4815 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableProperties.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
index 9e70662ead..9e70662ead 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/usermodel/TableRow.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java
index 5d55711ed9..5d55711ed9 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/DoubleByteUtil.java
diff --git a/scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
index 27f796c11e..27f796c11e 100644
--- a/scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
+++ b/poi-scratchpad/src/main/java/org/apache/poi/hwpf/util/LittleEndianCP950Reader.java
diff --git a/poi-scratchpad/src/main/java9/module-info.class b/poi-scratchpad/src/main/java9/module-info.class
new file mode 100644
index 0000000000..038e9583cb
--- /dev/null
+++ b/poi-scratchpad/src/main/java9/module-info.class
diff --git a/scratchpad/src/main/java9/module-info.java b/poi-scratchpad/src/main/java9/module-info.java
index 1e90ca572d..1e90ca572d 100644
--- a/scratchpad/src/main/java9/module-info.java
+++ b/poi-scratchpad/src/main/java9/module-info.java
diff --git a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index b4c821cdb6..b4c821cdb6 100644
--- a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index c3149c3aa9..c3149c3aa9 100644
--- a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
index 1fcb1ec7c7..1fcb1ec7c7 100644
--- a/scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
+++ b/poi-scratchpad/src/main/resources/META-INF/services/org.apache.poi.sl.usermodel.SlideShowProvider
diff --git a/scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl b/poi-scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl
index 7cb715abd6..7cb715abd6 100644
--- a/scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl
+++ b/poi-scratchpad/src/main/resources/org/apache/poi/hdgf/chunks_parse_cmds.tbl
diff --git a/scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt b/poi-scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt
index 3978b10340..3978b10340 100644
--- a/scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt
+++ b/poi-scratchpad/src/main/resources/org/apache/poi/hslf/data/empty.ppt
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
index 9c78ba3b61..9c78ba3b61 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFCore.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
index 86163afe33..86163afe33 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/TestHDGFLZW.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
index 3b97b03b50..3b97b03b50 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/chunks/TestChunks.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
index 302eacc928..302eacc928 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/dev/TestVSDDumper.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
index dc747a07a5..dc747a07a5 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
index 3beedf60c0..3beedf60c0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/pointers/TestPointerFactory.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
index 1e18b98478..1e18b98478 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/StreamTest.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
index 847eaa05d1..847eaa05d1 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBasics.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
index 47f33d0a15..47f33d0a15 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamBugs.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
index e65121ffaf..e65121ffaf 100644
--- a/scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hdgf/streams/TestStreamComplex.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
index af9a80c799..af9a80c799 100644
--- a/scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hemf/hemfplus/extractor/TestHemfPlusExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java b/poi-scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
index 6d39586729..6d39586729 100644
--- a/scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hemf/usermodel/TestHemfPicture.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
index bdcc28df7d..bdcc28df7d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestAttachments.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
index 704c85ef97..704c85ef97 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestBugs.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
index 3d0b3412f9..3d0b3412f9 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestCompressedRTF.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
index d0359a6d2e..d0359a6d2e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/TestHMEFMessage.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
index 2ece5a0a3a..2ece5a0a3a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestMAPIAttributes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
index c103bbc9e0..c103bbc9e0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/attribute/TestTNEFAttributes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
index a24901a96d..a24901a96d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/dev/TestHMEFDumper.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
index 4a786f5bca..4a786f5bca 100644
--- a/scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hmef/extractor/TestHMEFContentsExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
index eccb4ce8ec..eccb4ce8ec 100644
--- a/scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/TestHPBFDocument.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
index 13fae5982f..13fae5982f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/extractor/TestPublisherTextExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
index c96fdbda80..c96fdbda80 100644
--- a/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestEscherParts.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
index 8fd5a6bf3b..8fd5a6bf3b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hpbf/model/TestQuillContents.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
index 0ec92bb6a2..0ec92bb6a2 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/HSLFTestDataSamples.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
index 64e61a4c14..64e61a4c14 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestEncryptedFile.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
index 774b1fb91b..774b1fb91b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestPOIDocumentScratchpad.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
index 5aec58964a..5aec58964a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWrite.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
index 200966fd7a..200966fd7a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestReWriteSanity.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
index 5c8463ca3e..5c8463ca3e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/TestRecordCounts.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
index 6722f00f41..6722f00f41 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/BaseTestPPTIterating.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
index 206db2b20a..206db2b20a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPDrawingTextListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java
index c0572750b6..c0572750b6 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestPPTXMLDump.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
index 8ee2010fa7..8ee2010fa7 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java
index c61dd00b24..c61dd00b24 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSLWTTextListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
index ea37f7d159..ea37f7d159 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideAndNotesAtomListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java
index b75bec5178..b75bec5178 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideIdListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java
index 51b9ee5d69..51b9ee5d69 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowDumper.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
index 4392ec603a..4392ec603a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestSlideShowRecordDumper.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java
index 5a5d826ef1..5a5d826ef1 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestTextStyleListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
index c284ce1ba3..c284ce1ba3 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/dev/TestUserEditAndPersistListing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
index 71e1258d1e..71e1258d1e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
index bd8d634b12..bd8d634b12 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
index 8016278617..8016278617 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestFreeform.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
index dfcb4d339b..dfcb4d339b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHeadersFooters.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
index 8d31b900bf..8d31b900bf 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestHyperlink.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
index 0384b19043..0384b19043 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestLine.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
index a90c591190..a90c591190 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestMovieShape.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
index 9c561fb18e..9c561fb18e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestOleEmbedding.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
index 7045751956..7045751956 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestPPFont.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
index 9ab28fa66c..9ab28fa66c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSetBoldItalic.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
index 774fe06468..774fe06468 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestShapes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
index 50fada2805..50fada2805 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSheet.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
index 7557a8bc17..7557a8bc17 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideChangeNotes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
index a50958ff79..a50958ff79 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlideMaster.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
index c539a09b03..c539a09b03 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestSlides.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
index 1777ffed2c..1777ffed2c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
index f6f7fe6f7c..f6f7fe6f7c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/model/TestTextRunReWrite.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
index 21d25007db..21d25007db 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestAnimationInfoAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
index a117037832..a117037832 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCString.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
index 768ca20623..768ca20623 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestColorSchemeAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
index 19a12a95a2..19a12a95a2 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
index 0568afaef5..0568afaef5 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestComment2000Atom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
index 030b954d3c..030b954d3c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestCurrentUserAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
index 949a0c1ac4..949a0c1ac4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocument.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
index 06bca9df9b..06bca9df9b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
index 55944a5246..55944a5246 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
index ac837fc582..ac837fc582 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryptionAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
index c7bd84e116..c7bd84e116 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExControl.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
index 13fea4a83a..13fea4a83a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlink.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
index fb8072bd44..fb8072bd44 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExHyperlinkAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
index 5b961d5816..5b961d5816 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExMediaAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
index 0301b61463..0301b61463 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjList.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
index 9256b01b9f..9256b01b9f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExObjListAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
index 4c7771cac8..4c7771cac8 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
index fcdadfe211..fcdadfe211 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExOleObjStg.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
index 2534fddd18..2534fddd18 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestExVideoContainer.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
index f5b64da586..f5b64da586 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestFontCollection.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
index 3edfadb3de..3edfadb3de 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
index f6a25739b2..f6a25739b2 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestHeadersFootersContainer.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
index 7da5ee6f5c..7da5ee6f5c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfo.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
index 7f9bcde86e..7f9bcde86e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestInteractiveInfoAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
index e2852088dc..e2852088dc 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestNotesAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
index dccb8f2cad..dccb8f2cad 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordContainer.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
index 869dc427d7..869dc427d7 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestRecordTypes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
index ef3c7b84b4..ef3c7b84b4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlideAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
index 2a638d5a9a..2a638d5a9a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSlidePersistAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
index 4bfbc23526..4bfbc23526 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestSound.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
index 887814ab43..887814ab43 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestStyleTextPropAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
index 44f2dc4617..44f2dc4617 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextBytesAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
index 4c1a71daa0..4c1a71daa0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextCharsAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
index 4935940afb..4935940afb 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextHeaderAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
index e50419c410..e50419c410 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextRulerAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
index 578c6eef89..578c6eef89 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTextSpecInfoAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
index 12874ec041..12874ec041 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxInteractiveInfoAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
index 93f37305a9..93f37305a9 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestTxMasterStyleAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
index c09e1e55b3..c09e1e55b3 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestUserEditAtom.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
index 35e5880406..35e5880406 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestAddingSlides.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java
index 38bc03bb28..38bc03bb28 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBackground.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
index 17ddfa4a8a..17ddfa4a8a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestBugs.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
index d4dce2b13f..d4dce2b13f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestCounts.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
index b3d6785aec..b3d6785aec 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestFontRendering.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
index e1f453327d..e1f453327d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShow.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
index d82c659d71..d82c659d71 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestHSLFSlideShowFactory.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
index d96201b89f..d96201b89f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
index 69863e5685..69863e5685 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNotesText.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
index 6591a13ac7..6591a13ac7 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
index 6e49fd10d7..6e49fd10d7 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList2.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
index 6aa90ff6d9..6aa90ff6d9 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestNumberedList3.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java
index 55a50be321..55a50be321 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPicture.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
index a196ed685b..a196ed685b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestPictures.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
index 0b9255050b..0b9255050b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
index 0eba4ae56e..0eba4ae56e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRecordSetup.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
index 8081528a9f..8081528a9f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestRichTextRun.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
index a2c0469bc1..a2c0469bc1 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSheetText.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
index 0a5df4dde3..0a5df4dde3 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
index 3ac70bd00d..3ac70bd00d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestSoundData.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
index 1176003e7a..1176003e7a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
index 6fc4dc6030..6fc4dc6030 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextRun.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java
index 1b577eb273..1b577eb273 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/usermodel/TestTextShape.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java b/poi-scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
index 6572ade892..6572ade892 100644
--- a/scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hslf/util/TestSystemTimeUtils.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java
index deecb942ab..deecb942ab 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/Test7BitCodepage.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
index ce219e3e04..ce219e3e04 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBasics.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
index 8b9e162bae..8b9e162bae 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestBlankFileRead.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
index 4f0322b806..4f0322b806 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestExtractEmbeddedMSG.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
index 1d8cc9f98a..1d8cc9f98a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFileWithAttachmentsRead.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
index 04131f3a23..04131f3a23 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestFixedSizedProperties.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
index 7426a44482..7426a44482 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunk.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
index eab6b64d6c..eab6b64d6c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestMessageSubmissionChunkY2KRead.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java
index dfb7a765e5..dfb7a765e5 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestNameIdChunks.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
index c406b76057..c406b76057 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestOutlook30FileRead.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
index ecbb8f2550..ecbb8f2550 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/TestSimpleFileRead.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
index d61ec49805..d61ec49805 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestChunkData.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
index d9f0a110c6..d9f0a110c6 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestMAPIProperty.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
index 4951b535d4..4951b535d4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestSorters.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
index 468e569383..468e569383 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/datatypes/TestTypes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
index bb3c4b3cd0..bb3c4b3cd0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/extractor/TestOutlookTextExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
index f2070fcdb3..f2070fcdb3 100644
--- a/scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hsmf/parsers/TestPOIFSChunkParser.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java b/poi-scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
index 67ccae0cb4..67ccae0cb4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hssf/converter/TestExcelConverterSuite.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java b/poi-scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java
index dff936b099..dff936b099 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwmf/TestHwmfParsing.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java b/poi-scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java
index 840202da75..840202da75 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwmf/TestRasterOp.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
index ea2a93cc12..ea2a93cc12 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFDocFixture.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
index 937bb5367d..937bb5367d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestCase.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
index 142ad026e4..142ad026e4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/HWPFTestDataSamples.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
index 1e1b5b3841..1e1b5b3841 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestFieldsTables.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
index 9a9b942a25..9a9b942a25 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFPictures.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
index d7d7ed6249..d7d7ed6249 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/TestHWPFRangeParts.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
index f666517e51..f666517e51 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestAbstractWordUtils.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
index bb28ff5196..bb28ff5196 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestNumberFormatter.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
index fcae380bbf..fcae380bbf 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToConverterSuite.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
index 62c1c955e0..62c1c955e0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToFoConverter.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
index a7e8b1fec7..a7e8b1fec7 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToHtmlConverter.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
index 9ffea802cf..9ffea802cf 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/converter/TestWordToTextConverter.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
index 3a94a3efb4..3a94a3efb4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/dev/TestHWPFLister.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
index 1574c3410a..1574c3410a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestDifferentRoutes.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
index f250b5daa4..f250b5daa4 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractor.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
index 5575a09291..5575a09291 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
index 7685525e16..7685525e16 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestBookmarksTables.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
index ea68fde323..ea68fde323 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestCHPBinTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
index 0a33bab46a..0a33bab46a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestDocumentProperties.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
index b35a8d3c01..b35a8d3c01 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFileInformationBlock.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
index dcda989a01..dcda989a01 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestFontTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
index b04b17b897..b04b17b897 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestListTables.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
index 3aff17d62a..3aff17d62a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestNotesTables.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
index b65843ab63..b65843ab63 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPAPBinTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
index 23a4c28777..23a4c28777 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlexOfCps.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java
index a18902ad8d..a18902ad8d 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestPlfLfo.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
index 9ffebae0cd..9ffebae0cd 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestRevisionMarkAuthorTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
index 0ae2e4a87a..0ae2e4a87a 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSavedByTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
index 63ab183e75..63ab183e75 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestSectionTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
index dfffa2c4b8..dfffa2c4b8 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestStyleSheet.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
index 9150631f67..9150631f67 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/TestTextPieceTable.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
index aa986a558f..aa986a558f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLFOLVLBaseAbstractType.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
index d48fa9e4f5..d48fa9e4f5 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/model/types/TestLVLFAbstractType.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
index e403786fbe..e403786fbe 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TableSprmUncompressorTest.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
index 65c5dac5a8..65c5dac5a8 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/sprm/TestSprms.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
index 8c998ebd62..8c998ebd62 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBorderCode.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
index a886141f2f..a886141f2f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug46610.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
index f0e17acf76..f0e17acf76 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug47563.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
index 5028a85e6b..5028a85e6b 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug49820.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
index 12b70fb446..12b70fb446 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBug50075.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
index be98329282..be98329282 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestBugs.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
index c34b31982e..c34b31982e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFOldDocument.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
index 3f0f8b7ce0..3f0f8b7ce0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHWPFWrite.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
index 72f0c86df0..72f0c86df0 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestHeaderStories.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
index 28fb2a6568..28fb2a6568 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestLists.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
index c8974d4d15..c8974d4d15 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestOfficeDrawings.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
index 61e4ced097..61e4ced097 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestPictures.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
index 9732b77bda..9732b77bda 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestProblems.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
index 7d6c72fc6e..7d6c72fc6e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRange.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
index 1b49b3883f..1b49b3883f 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeDelete.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
index e8a9259460..e8a9259460 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeInsertion.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
index 21514bd246..21514bd246 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeProperties.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
index 2cecbe8bd6..2cecbe8bd6 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeReplacement.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
index 32898c2b8e..32898c2b8e 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestRangeSymbols.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
index 84f1009afa..84f1009afa 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/usermodel/TestTableRow.java
diff --git a/scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
index 5ff823779c..5ff823779c 100644
--- a/scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
+++ b/poi-scratchpad/src/test/java/org/apache/poi/hwpf/util/TestLittleEndianCP950Reader.java
diff --git a/poi-scratchpad/src/test/java9/module-info.class b/poi-scratchpad/src/test/java9/module-info.class
new file mode 100644
index 0000000000..43ba0ddeec
--- /dev/null
+++ b/poi-scratchpad/src/test/java9/module-info.class
diff --git a/scratchpad/src/test/java9/module-info.java b/poi-scratchpad/src/test/java9/module-info.java
index aa1e3d76c8..aa1e3d76c8 100644
--- a/scratchpad/src/test/java9/module-info.java
+++ b/poi-scratchpad/src/test/java9/module-info.java
diff --git a/poi/build.gradle b/poi/build.gradle
new file mode 100644
index 0000000000..4ff4342e77
--- /dev/null
+++ b/poi/build.gradle
@@ -0,0 +1,230 @@
+/* ====================================================================
+   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.
+==================================================================== */
+
+import java.util.regex.Pattern
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'java-library'
+}
+
+final String JAVA9_SRC = 'src/main/java9'
+final String JAVA9_OUT = "${buildDir}/classes/java9/main/"
+final String TEST9_SRC = 'src/test/java9'
+final String TEST9_OUT = "${buildDir}/classes/java9/test/"
+final String VERSIONS9 = 'META-INF/versions/9'
+
+configurations {
+    tests
+}
+
+sourceSets {
+    main {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(JAVA9_OUT, builtBy: 'cacheJava9')
+        }
+    }
+    test {
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            output.dir(TEST9_OUT, builtBy: 'cacheTest9')
+        }
+    }
+}
+
+dependencies {
+    api "commons-codec:commons-codec:${commonsCodecVersion}"
+    api 'org.apache.commons:commons-collections4:4.4'
+    api "org.apache.commons:commons-math3:${commonsMathVersion}"
+    api 'com.zaxxer:SparseBitSet:1.2'
+    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
+    implementation 'javax.activation:activation:1.1.1'
+
+    testImplementation 'org.reflections:reflections:0.9.12'
+    testImplementation 'org.apache.ant:ant:1.10.9'
+
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+final String MODULE_NAME = 'org.apache.poi.poi'
+final Pattern MODULE_NOT_REGEX = ~'(poi[/\\\\][^/\\\\]+$|batik-script)'
+final Pattern MODULE_REGEX = ~'\\.jar$'
+final List MODULE_PATH = sourceSets.test.runtimeClasspath.findAll{ it.path =~ MODULE_REGEX && !(it.path =~ MODULE_NOT_REGEX) }.collect{ it.parent }.unique()
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    withJavadocJar()
+    withSourcesJar()
+}
+
+
+task compileJava9(type: JavaCompile) {
+    dependsOn 'compileJava'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    destinationDirectory = file(JAVA9_OUT + VERSIONS9)
+    source = file(JAVA9_SRC)
+    classpath = files()
+    options.compilerArgs = [
+        '--patch-module', "${MODULE_NAME}=${sourceSets.main.output.classesDirs.asPath}",
+        '--module-path', sourceSets.main.compileClasspath.asPath
+    ]
+}
+
+task cacheJava9(type: Copy) {
+    dependsOn 'compileJava9'
+
+    from(file(JAVA9_OUT + VERSIONS9))
+    into(JAVA9_SRC)
+}
+
+task compileTest9(type: JavaCompile) {
+    dependsOn 'compileTestJava'
+
+    sourceCompatibility = 9
+    targetCompatibility = 9
+    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_PATH).asPath
+    ]
+    classpath = files()
+}
+
+
+task cacheTest9(type: Copy) {
+    dependsOn 'compileTest9'
+
+    from(file(TEST9_OUT + VERSIONS9))
+    into(TEST9_SRC)
+}
+
+
+jar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from JAVA9_SRC include '*.class'
+        }
+    }
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+// 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) {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}-tests")
+
+    classifier 'tests'
+    // ignore second module-info.class from main
+    duplicatesStrategy = 'exclude'
+
+    if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+        into('META-INF/versions/9') {
+            from TEST9_SRC include '*.class'
+        }
+    }
+
+    from sourceSets.test.output + sourceSets.main.output
+
+    manifest {
+        attributes('Automatic-Module-Name': MODULE_NAME, 'Multi-Release': 'true')
+    }
+}
+
+sourcesJar {
+    destinationDirectory = file("../build/dist/maven/${project.archivesBaseName}")
+    exclude 'META-INF/services/**'
+}
+
+test {
+    dependsOn 'testJar'
+
+    useJUnitPlatform()
+
+    doFirst {
+        jvmArgs = [
+            '-Djava.io.tmpdir=build',
+            '-DPOI.testdata.path=../test-data',
+            '-Djava.awt.headless=true',
+            '-Djava.locale.providers=JRE,CLDR',
+            '-Duser.language=en',
+            '-Duser.country=US',
+            '-Djavax.xml.stream.XMLInputFactory=com.sun.xml.internal.stream.XMLInputFactoryImpl',
+            "-Dversion.id=${project.version}",
+            '-ea',
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=fixed',
+            '-Djunit.jupiter.execution.parallel.config.fixed.parallelism=3'
+            // -Xjit:verbose={compileStart|compileEnd},vlog=build/jit.log${no.jit.sherlock}   ... if ${isIBMVM}
+        ]
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            jvmArgs += [
+                '-Dsun.reflect.debugModuleAccessChecks=true',
+                '-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize=true',
+                '--illegal-access=warn',
+
+                '--add-modules', MODULE_NAME,
+                // 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=ALL-UNNAMED',
+                '--add-exports','org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED',
+
+                '--module-path', '../build/dist/maven/poi-tests:' + files(MODULE_PATH).asPath,
+            ]
+        }
+    }
+}
+
+javadoc {
+//    fails currently, need to fix the sources
+    failOnError = false
+//    if(JavaVersion.current().isJava9Compatible()) {
+//        options.addBooleanOption('html5', true)
+//    }
+}
+
+artifacts {
+    tests testJar
+}
+
+publishing {
+    publications {
+        POI(MavenPublication) {
+            artifactId project.archivesBaseName
+
+            from components.java
+
+            pom {
+                name = 'Apache POI'
+                description = 'Apache POI - Java API To Access Microsoft Format Files'
+            }
+        }
+    }
+}
+
+generatePomFileForPOIPublication.destination = "../build/dist/maven/${project.archivesBaseName}/${project.archivesBaseName}-${project.version}.pom"
diff --git a/main/models/BlockClassDiagram.pgml b/poi/models/BlockClassDiagram.pgml
index 11d979ad4e..11d979ad4e 100644
--- a/main/models/BlockClassDiagram.pgml
+++ b/poi/models/BlockClassDiagram.pgml
diff --git a/main/models/HSSFOperationalUseCases.pgml b/poi/models/HSSFOperationalUseCases.pgml
index fe331fdffd..fe331fdffd 100644
--- a/main/models/HSSFOperationalUseCases.pgml
+++ b/poi/models/HSSFOperationalUseCases.pgml
diff --git a/main/models/HSSFSerializerClassDiagram.pgml b/poi/models/HSSFSerializerClassDiagram.pgml
index 474a2bfb06..474a2bfb06 100644
--- a/main/models/HSSFSerializerClassDiagram.pgml
+++ b/poi/models/HSSFSerializerClassDiagram.pgml
diff --git a/main/models/HSSFSerializerUseCases.pgml b/poi/models/HSSFSerializerUseCases.pgml
index e7dfc3f10b..e7dfc3f10b 100644
--- a/main/models/HSSFSerializerUseCases.pgml
+++ b/poi/models/HSSFSerializerUseCases.pgml
diff --git a/main/models/HSSFUseCases.pgml b/poi/models/HSSFUseCases.pgml
index 0bca884080..0bca884080 100644
--- a/main/models/HSSFUseCases.pgml
+++ b/poi/models/HSSFUseCases.pgml
diff --git a/main/models/POIFSAddDocument.pgml b/poi/models/POIFSAddDocument.pgml
index 2117546230..2117546230 100644
--- a/main/models/POIFSAddDocument.pgml
+++ b/poi/models/POIFSAddDocument.pgml
diff --git a/main/models/POIFSClassDiagram.pgml b/poi/models/POIFSClassDiagram.pgml
index 0f20959a3d..0f20959a3d 100644
--- a/main/models/POIFSClassDiagram.pgml
+++ b/poi/models/POIFSClassDiagram.pgml
diff --git a/main/models/POIFSInitialization.pgml b/poi/models/POIFSInitialization.pgml
index 3c487567b5..3c487567b5 100644
--- a/main/models/POIFSInitialization.pgml
+++ b/poi/models/POIFSInitialization.pgml
diff --git a/main/models/POIFSLifeCycle.pgml b/poi/models/POIFSLifeCycle.pgml
index 88c4315881..88c4315881 100644
--- a/main/models/POIFSLifeCycle.pgml
+++ b/poi/models/POIFSLifeCycle.pgml
diff --git a/main/models/POIFSPropertyTablePreWrite.pgml b/poi/models/POIFSPropertyTablePreWrite.pgml
index dba9bb2e87..dba9bb2e87 100644
--- a/main/models/POIFSPropertyTablePreWrite.pgml
+++ b/poi/models/POIFSPropertyTablePreWrite.pgml
diff --git a/main/models/POIFSRootPropertyPreWrite.pgml b/poi/models/POIFSRootPropertyPreWrite.pgml
index 829e8d36d1..829e8d36d1 100644
--- a/main/models/POIFSRootPropertyPreWrite.pgml
+++ b/poi/models/POIFSRootPropertyPreWrite.pgml
diff --git a/main/models/POIFSWriteFilesystem.pgml b/poi/models/POIFSWriteFilesystem.pgml
index 1a0196527b..1a0196527b 100644
--- a/main/models/POIFSWriteFilesystem.pgml
+++ b/poi/models/POIFSWriteFilesystem.pgml
diff --git a/main/models/POIUseCases.pgml b/poi/models/POIUseCases.pgml
index ee5a002863..ee5a002863 100644
--- a/main/models/POIUseCases.pgml
+++ b/poi/models/POIUseCases.pgml
diff --git a/main/models/PropertyTableClassDiagram.pgml b/poi/models/PropertyTableClassDiagram.pgml
index de6ae19bbf..de6ae19bbf 100644
--- a/main/models/PropertyTableClassDiagram.pgml
+++ b/poi/models/PropertyTableClassDiagram.pgml
diff --git a/main/models/analysismain.pgml b/poi/models/analysismain.pgml
index 5e2ca17bd3..5e2ca17bd3 100644
--- a/main/models/analysismain.pgml
+++ b/poi/models/analysismain.pgml
diff --git a/main/models/poi.argo b/poi/models/poi.argo
index 80c189b5b3..80c189b5b3 100644
--- a/main/models/poi.argo
+++ b/poi/models/poi.argo
diff --git a/main/models/poi.xmi b/poi/models/poi.xmi
index 5feadacece..5feadacece 100644
--- a/main/models/poi.xmi
+++ b/poi/models/poi.xmi
diff --git a/main/models/poifsAnalysisClasses.pgml b/poi/models/poifsAnalysisClasses.pgml
index 91ae564329..91ae564329 100644
--- a/main/models/poifsAnalysisClasses.pgml
+++ b/poi/models/poifsAnalysisClasses.pgml
diff --git a/main/models/projectmain.pgml b/poi/models/projectmain.pgml
index e385871f91..e385871f91 100644
--- a/main/models/projectmain.pgml
+++ b/poi/models/projectmain.pgml
diff --git a/main/models/readFileFromFilesystemSequenceDiagram.pgml b/poi/models/readFileFromFilesystemSequenceDiagram.pgml
index e2af7401f3..e2af7401f3 100644
--- a/main/models/readFileFromFilesystemSequenceDiagram.pgml
+++ b/poi/models/readFileFromFilesystemSequenceDiagram.pgml
diff --git a/main/models/readFileSystemDirectorySequenceDiagram.pgml b/poi/models/readFileSystemDirectorySequenceDiagram.pgml
index 5456e960d3..5456e960d3 100644
--- a/main/models/readFileSystemDirectorySequenceDiagram.pgml
+++ b/poi/models/readFileSystemDirectorySequenceDiagram.pgml
diff --git a/main/models/readFilesystemSequenceDiagram.pgml b/poi/models/readFilesystemSequenceDiagram.pgml
index 5c72dad5a7..5c72dad5a7 100644
--- a/main/models/readFilesystemSequenceDiagram.pgml
+++ b/poi/models/readFilesystemSequenceDiagram.pgml
diff --git a/main/models/utilClasses.pgml b/poi/models/utilClasses.pgml
index d70dec548a..d70dec548a 100644
--- a/main/models/utilClasses.pgml
+++ b/poi/models/utilClasses.pgml
diff --git a/main/models/writeFilesystemSequenceDiagram.pgml b/poi/models/writeFilesystemSequenceDiagram.pgml
index fc5746c266..fc5746c266 100644
--- a/main/models/writeFilesystemSequenceDiagram.pgml
+++ b/poi/models/writeFilesystemSequenceDiagram.pgml
diff --git a/main/src/main/java/org/apache/poi/EmptyFileException.java b/poi/src/main/java/org/apache/poi/EmptyFileException.java
index 5abbcd0fe6..5abbcd0fe6 100644
--- a/main/src/main/java/org/apache/poi/EmptyFileException.java
+++ b/poi/src/main/java/org/apache/poi/EmptyFileException.java
diff --git a/main/src/main/java/org/apache/poi/EncryptedDocumentException.java b/poi/src/main/java/org/apache/poi/EncryptedDocumentException.java
index 4ac6123e4b..4ac6123e4b 100644
--- a/main/src/main/java/org/apache/poi/EncryptedDocumentException.java
+++ b/poi/src/main/java/org/apache/poi/EncryptedDocumentException.java
diff --git a/main/src/main/java/org/apache/poi/OldFileFormatException.java b/poi/src/main/java/org/apache/poi/OldFileFormatException.java
index 3c01f5459e..3c01f5459e 100644
--- a/main/src/main/java/org/apache/poi/OldFileFormatException.java
+++ b/poi/src/main/java/org/apache/poi/OldFileFormatException.java
diff --git a/main/src/main/java/org/apache/poi/POIDocument.java b/poi/src/main/java/org/apache/poi/POIDocument.java
index e2f613af64..e2f613af64 100644
--- a/main/src/main/java/org/apache/poi/POIDocument.java
+++ b/poi/src/main/java/org/apache/poi/POIDocument.java
diff --git a/main/src/main/java/org/apache/poi/POIReadOnlyDocument.java b/poi/src/main/java/org/apache/poi/POIReadOnlyDocument.java
index 5f250704db..5f250704db 100644
--- a/main/src/main/java/org/apache/poi/POIReadOnlyDocument.java
+++ b/poi/src/main/java/org/apache/poi/POIReadOnlyDocument.java
diff --git a/main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java b/poi/src/main/java/org/apache/poi/UnsupportedFileFormatException.java
index b893639514..b893639514 100644
--- a/main/src/main/java/org/apache/poi/UnsupportedFileFormatException.java
+++ b/poi/src/main/java/org/apache/poi/UnsupportedFileFormatException.java
diff --git a/main/src/main/java/org/apache/poi/common/Duplicatable.java b/poi/src/main/java/org/apache/poi/common/Duplicatable.java
index d9a9eebca0..d9a9eebca0 100644
--- a/main/src/main/java/org/apache/poi/common/Duplicatable.java
+++ b/poi/src/main/java/org/apache/poi/common/Duplicatable.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java b/poi/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java
index 046d07610e..046d07610e 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/GenericRecord.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java b/poi/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java
index 708f08df5d..708f08df5d 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/Hyperlink.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java b/poi/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java
index 74fa7b6e5f..74fa7b6e5f 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/HyperlinkType.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/PictureType.java b/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java
index d3ed67fc2e..d3ed67fc2e 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/PictureType.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/PictureType.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
index 044765738f..044765738f 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontCharset.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
index 5fb16908cd..5fb16908cd 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontFacet.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
index b627e10af8..b627e10af8 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontFamily.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
index cdbaefe90f..cdbaefe90f 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontGroup.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
index 2589b16f17..2589b16f17 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontHeader.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
index b47b02e53b..b47b02e53b 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontInfo.java
diff --git a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
index 5d1d48e63e..5d1d48e63e 100644
--- a/main/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
+++ b/poi/src/main/java/org/apache/poi/common/usermodel/fonts/FontPitch.java
diff --git a/main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/poi/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
index 1fdf63380e..1fdf63380e 100644
--- a/main/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java b/poi/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
index 249e74cb2e..249e74cb2e 100644
--- a/main/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
+++ b/poi/src/main/java/org/apache/poi/ddf/DefaultEscherRecordFactory.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
index f2c555496e..f2c555496e 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherArrayProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherBSERecord.java
index 08f3a0c694..08f3a0c694 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherBSERecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherBSERecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java b/poi/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java
index f6d8aea45a..f6d8aea45a 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherBitmapBlip.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java
index c9e6d73e5c..c9e6d73e5c 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherBlipRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java
index d4d4062c8c..d4d4062c8c 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherBoolProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
index bf15c83047..bf15c83047 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherChildAnchorRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
index 5d182da247..5d182da247 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherClientAnchorRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java
index 80f4f9e7e4..80f4f9e7e4 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherClientDataRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherColorRef.java b/poi/src/main/java/org/apache/poi/ddf/EscherColorRef.java
index 0603329b18..0603329b18 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherColorRef.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherColorRef.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java
index 1f33cd735a..1f33cd735a 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherComplexProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
index bbe7efac65..bbe7efac65 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherContainerRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherDgRecord.java
index b290b3cf64..b290b3cf64 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherDgRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherDgRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherDggRecord.java
index b4705ad383..b4705ad383 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherDggRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherDggRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherDump.java b/poi/src/main/java/org/apache/poi/ddf/EscherDump.java
index 489b143eac..489b143eac 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherDump.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherDump.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java b/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
index 6713b5fc17..6713b5fc17 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherMetafileBlip.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherOptRecord.java
index 7d88fcdced..7d88fcdced 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherOptRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherOptRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherProperty.java
index 63a738cec1..63a738cec1 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java
index eff992c952..eff992c952 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyFactory.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java
index 99f5f6cb34..99f5f6cb34 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyMetaData.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java
index a48972faf3..a48972faf3 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyTypes.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
index 52760e8665..52760e8665 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherPropertyTypesHolder.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java
index 2662fb8b6b..2662fb8b6b 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherRGBProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java
index 85ebea3740..85ebea3740 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java b/poi/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java
index 401bbd08c3..401bbd08c3 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherRecordFactory.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java b/poi/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java
index c65169e001..c65169e001 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherRecordTypes.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java b/poi/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java
index dcc5eeeb80..dcc5eeeb80 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherSerializationListener.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java
index 0d0f422155..0d0f422155 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherShapePathProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java b/poi/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java
index 592d038fcf..592d038fcf 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherSimpleProperty.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherSpRecord.java
index acec08ed32..acec08ed32 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherSpRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherSpRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java
index eb98b8004a..eb98b8004a 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherSpgrRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
index aba46546c8..aba46546c8 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherSplitMenuColorsRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
index 28b7ca74fa..28b7ca74fa 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherTertiaryOptRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java b/poi/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java
index dced174318..dced174318 100644
--- a/main/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/EscherTextboxRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java b/poi/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java
index 28a8c94a6b..28a8c94a6b 100644
--- a/main/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java
+++ b/poi/src/main/java/org/apache/poi/ddf/NullEscherSerializationListener.java
diff --git a/main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java b/poi/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java
index 83de70c836..83de70c836 100644
--- a/main/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java
+++ b/poi/src/main/java/org/apache/poi/ddf/UnknownEscherRecord.java
diff --git a/main/src/main/java/org/apache/poi/ddf/package-info.java b/poi/src/main/java/org/apache/poi/ddf/package-info.java
index b748cf8175..b748cf8175 100644
--- a/main/src/main/java/org/apache/poi/ddf/package-info.java
+++ b/poi/src/main/java/org/apache/poi/ddf/package-info.java
diff --git a/main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java b/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
index a8d2f2d492..a8d2f2d492 100644
--- a/main/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
+++ b/poi/src/main/java/org/apache/poi/extractor/ExtractorFactory.java
diff --git a/main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java b/poi/src/main/java/org/apache/poi/extractor/ExtractorProvider.java
index 5669cd9fe7..5669cd9fe7 100644
--- a/main/src/main/java/org/apache/poi/extractor/ExtractorProvider.java
+++ b/poi/src/main/java/org/apache/poi/extractor/ExtractorProvider.java
diff --git a/main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java b/poi/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java
index d485f864ff..d485f864ff 100644
--- a/main/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java
+++ b/poi/src/main/java/org/apache/poi/extractor/MainExtractorFactory.java
diff --git a/main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java b/poi/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
index a389b71d0c..a389b71d0c 100644
--- a/main/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
+++ b/poi/src/main/java/org/apache/poi/extractor/POIOLE2TextExtractor.java
diff --git a/main/src/main/java/org/apache/poi/extractor/POITextExtractor.java b/poi/src/main/java/org/apache/poi/extractor/POITextExtractor.java
index cf88c57bae..cf88c57bae 100644
--- a/main/src/main/java/org/apache/poi/extractor/POITextExtractor.java
+++ b/poi/src/main/java/org/apache/poi/extractor/POITextExtractor.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Array.java b/poi/src/main/java/org/apache/poi/hpsf/Array.java
index 94af1369f8..94af1369f8 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Array.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Array.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Blob.java b/poi/src/main/java/org/apache/poi/hpsf/Blob.java
index 6c6e17c660..6c6e17c660 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Blob.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Blob.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/ClassID.java b/poi/src/main/java/org/apache/poi/hpsf/ClassID.java
index 42a960a4c7..42a960a4c7 100644
--- a/main/src/main/java/org/apache/poi/hpsf/ClassID.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/ClassID.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java b/poi/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java
index 61d6566c66..61d6566c66 100644
--- a/main/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/ClassIDPredefined.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/ClipboardData.java b/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java
index d92269a785..d92269a785 100644
--- a/main/src/main/java/org/apache/poi/hpsf/ClipboardData.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/ClipboardData.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/CodePageString.java b/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java
index 4ba9b0d063..4ba9b0d063 100644
--- a/main/src/main/java/org/apache/poi/hpsf/CodePageString.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/CodePageString.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Currency.java b/poi/src/main/java/org/apache/poi/hpsf/Currency.java
index 974887efcb..974887efcb 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Currency.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Currency.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/CustomProperties.java b/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java
index fa49246e80..fa49246e80 100644
--- a/main/src/main/java/org/apache/poi/hpsf/CustomProperties.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/CustomProperties.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/CustomProperty.java b/poi/src/main/java/org/apache/poi/hpsf/CustomProperty.java
index 60b5dc5da3..60b5dc5da3 100644
--- a/main/src/main/java/org/apache/poi/hpsf/CustomProperty.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/CustomProperty.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Date.java b/poi/src/main/java/org/apache/poi/hpsf/Date.java
index 984661ca37..984661ca37 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Date.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Date.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Decimal.java b/poi/src/main/java/org/apache/poi/hpsf/Decimal.java
index 608d8c21bb..608d8c21bb 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Decimal.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Decimal.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java b/poi/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
index 07c09a7579..07c09a7579 100644
--- a/main/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/DocumentSummaryInformation.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Filetime.java b/poi/src/main/java/org/apache/poi/hpsf/Filetime.java
index 98b2c27c6c..98b2c27c6c 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Filetime.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Filetime.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/GUID.java b/poi/src/main/java/org/apache/poi/hpsf/GUID.java
index a140a9cc46..a140a9cc46 100644
--- a/main/src/main/java/org/apache/poi/hpsf/GUID.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/GUID.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/HPSFException.java b/poi/src/main/java/org/apache/poi/hpsf/HPSFException.java
index abc3b8d9f7..abc3b8d9f7 100644
--- a/main/src/main/java/org/apache/poi/hpsf/HPSFException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/HPSFException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java b/poi/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
index a0a5d68fb8..a0a5d68fb8 100644
--- a/main/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/HPSFPropertiesOnlyDocument.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/poi/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java
index 984a316fc2..984a316fc2 100644
--- a/main/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/HPSFRuntimeException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java b/poi/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
index 3217af9580..3217af9580 100644
--- a/main/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/IllegalPropertySetDataException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java b/poi/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
index b71ff47032..b71ff47032 100644
--- a/main/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/IllegalVariantTypeException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java b/poi/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java
index f5bfc2aeab..f5bfc2aeab 100644
--- a/main/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/IndirectPropertyName.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java b/poi/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java
index 450c892abc..450c892abc 100644
--- a/main/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/MarkUnsupportedException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java b/poi/src/main/java/org/apache/poi/hpsf/MissingSectionException.java
index f3e81cad29..f3e81cad29 100644
--- a/main/src/main/java/org/apache/poi/hpsf/MissingSectionException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/MissingSectionException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java b/poi/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java
index 51f76c3486..51f76c3486 100644
--- a/main/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/NoFormatIDException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java b/poi/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
index 62738d42b4..62738d42b4 100644
--- a/main/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/NoPropertySetStreamException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java b/poi/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java
index 2309fe5612..2309fe5612 100644
--- a/main/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/NoSingleSectionException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Property.java b/poi/src/main/java/org/apache/poi/hpsf/Property.java
index 0e3e2cdea2..0e3e2cdea2 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Property.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Property.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/PropertySet.java b/poi/src/main/java/org/apache/poi/hpsf/PropertySet.java
index d110747d11..d110747d11 100644
--- a/main/src/main/java/org/apache/poi/hpsf/PropertySet.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/PropertySet.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java b/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
index d5e0c5c0c2..d5e0c5c0c2 100644
--- a/main/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/PropertySetFactory.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java b/poi/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
index cb16058a78..cb16058a78 100644
--- a/main/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/ReadingNotSupportedException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Section.java b/poi/src/main/java/org/apache/poi/hpsf/Section.java
index c404e49858..c404e49858 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Section.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Section.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java b/poi/src/main/java/org/apache/poi/hpsf/SummaryInformation.java
index 4c85b8fda8..4c85b8fda8 100644
--- a/main/src/main/java/org/apache/poi/hpsf/SummaryInformation.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/SummaryInformation.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Thumbnail.java b/poi/src/main/java/org/apache/poi/hpsf/Thumbnail.java
index 66f5f178fa..66f5f178fa 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Thumbnail.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Thumbnail.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java b/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
index 1b4f5c6489..1b4f5c6489 100644
--- a/main/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/TypedPropertyValue.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java b/poi/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
index 54efe0f44a..54efe0f44a 100644
--- a/main/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/UnexpectedPropertySetTypeException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/UnicodeString.java b/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java
index 866a2b2acd..866a2b2acd 100644
--- a/main/src/main/java/org/apache/poi/hpsf/UnicodeString.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/UnicodeString.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java b/poi/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
index 12afdcb4cb..12afdcb4cb 100644
--- a/main/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/UnsupportedVariantTypeException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Variant.java b/poi/src/main/java/org/apache/poi/hpsf/Variant.java
index f7b541b101..f7b541b101 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Variant.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Variant.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/VariantBool.java b/poi/src/main/java/org/apache/poi/hpsf/VariantBool.java
index 0f59164688..0f59164688 100644
--- a/main/src/main/java/org/apache/poi/hpsf/VariantBool.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/VariantBool.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/VariantSupport.java b/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java
index 5d49c8a28e..5d49c8a28e 100644
--- a/main/src/main/java/org/apache/poi/hpsf/VariantSupport.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/VariantSupport.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java b/poi/src/main/java/org/apache/poi/hpsf/VariantTypeException.java
index c2d2e8f66f..c2d2e8f66f 100644
--- a/main/src/main/java/org/apache/poi/hpsf/VariantTypeException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/VariantTypeException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/Vector.java b/poi/src/main/java/org/apache/poi/hpsf/Vector.java
index 465eabd829..465eabd829 100644
--- a/main/src/main/java/org/apache/poi/hpsf/Vector.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/Vector.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/VersionedStream.java b/poi/src/main/java/org/apache/poi/hpsf/VersionedStream.java
index 20d2d133a4..20d2d133a4 100644
--- a/main/src/main/java/org/apache/poi/hpsf/VersionedStream.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/VersionedStream.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java b/poi/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java
index d409999f78..d409999f78 100644
--- a/main/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/WritingNotSupportedException.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java b/poi/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
index fde938d258..fde938d258 100644
--- a/main/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/extractor/HPSFPropertiesExtractor.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/package-info.java b/poi/src/main/java/org/apache/poi/hpsf/package-info.java
index a07740c96f..a07740c96f 100644
--- a/main/src/main/java/org/apache/poi/hpsf/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java b/poi/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
index 6443c8c831..6443c8c831 100644
--- a/main/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/wellknown/PropertyIDMap.java
diff --git a/main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java b/poi/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java
index db9fae9b81..db9fae9b81 100644
--- a/main/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hpsf/wellknown/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java b/poi/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java
index e42e613d84..e42e613d84 100644
--- a/main/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java
+++ b/poi/src/main/java/org/apache/poi/hssf/OldExcelFormatException.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java b/poi/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
index 3fc3f5d3be..3fc3f5d3be 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/BiffDrawingToXml.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java b/poi/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java
index 10d59c869c..10d59c869c 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/BiffViewer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java b/poi/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java
index 6e01e09f7b..6e01e09f7b 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/EFBiffViewer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java b/poi/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java
index bc7cc9cc84..bc7cc9cc84 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/FormulaViewer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/ReSave.java b/poi/src/main/java/org/apache/poi/hssf/dev/ReSave.java
index 2f31eb48d8..2f31eb48d8 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/ReSave.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/ReSave.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java b/poi/src/main/java/org/apache/poi/hssf/dev/RecordLister.java
index fd6c8ef111..fd6c8ef111 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/RecordLister.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/RecordLister.java
diff --git a/main/src/main/java/org/apache/poi/hssf/dev/package-info.java b/poi/src/main/java/org/apache/poi/hssf/dev/package-info.java
index 74d4c09c9b..74d4c09c9b 100644
--- a/main/src/main/java/org/apache/poi/hssf/dev/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/dev/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java b/poi/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java
index 1924b476ba..1924b476ba 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventmodel/ERFListener.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java b/poi/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
index 9cc6791c5f..9cc6791c5f 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventmodel/EventRecordFactory.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
index 08e9c4f72a..08e9c4f72a 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/AbortableHSSFListener.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
index 0ef80530c0..0ef80530c0 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/EventWorkbookBuilder.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
index fcd4cdd2a3..fcd4cdd2a3 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
index 65c0c83115..65c0c83115 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFEventFactory.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
index cc47e416b0..cc47e416b0 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFListener.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
index 50cc728e95..50cc728e95 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFRequest.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
index a104c253c6..a104c253c6 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/HSSFUserException.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
index 83c7a18cac..83c7a18cac 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/MissingRecordAwareHSSFListener.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
index 008decd122..008decd122 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/DummyRecordBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
index b22dfd7cc7..b22dfd7cc7 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/LastCellOfRowDummyRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
index 5b799855c2..5b799855c2 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingCellDummyRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
index 7c13c48093..7c13c48093 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/dummyrecord/MissingRowDummyRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java
index 69b02c4daf..69b02c4daf 100644
--- a/main/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/eventusermodel/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java b/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
index a3239def70..a3239def70 100644
--- a/main/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/extractor/EventBasedExcelExtractor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java b/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
index 5fa855546f..5fa855546f 100644
--- a/main/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/extractor/ExcelExtractor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java b/poi/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
index e6a55f88ff..e6a55f88ff 100644
--- a/main/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java b/poi/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java
index 60808e797a..60808e797a 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/ConvertAnchor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java b/poi/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java
index 7502b4aee9..7502b4aee9 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/DrawingManager2.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java b/poi/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
index e2ed227155..e2ed227155 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/HSSFFormulaParser.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java b/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
index e1a96e15ce..e1a96e15ce 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/InternalSheet.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java b/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java
index 95e156618b..95e156618b 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/InternalWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/LinkTable.java b/poi/src/main/java/org/apache/poi/hssf/model/LinkTable.java
index a1fdb089c4..a1fdb089c4 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/LinkTable.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/LinkTable.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java b/poi/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java
index f1dd369a91..f1dd369a91 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/RecordOrderer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/RecordStream.java b/poi/src/main/java/org/apache/poi/hssf/model/RecordStream.java
index 02d85fda6a..02d85fda6a 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/RecordStream.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/RecordStream.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java b/poi/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java
index efad9d5a86..efad9d5a86 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/RowBlocksReader.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java b/poi/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java
index 2f97ed0163..2f97ed0163 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/WorkbookRecordList.java
diff --git a/main/src/main/java/org/apache/poi/hssf/model/package-info.java b/poi/src/main/java/org/apache/poi/hssf/model/package-info.java
index b2e8ffcc2d..b2e8ffcc2d 100644
--- a/main/src/main/java/org/apache/poi/hssf/model/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/model/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/package-info.java b/poi/src/main/java/org/apache/poi/hssf/package-info.java
index 43f8bcbe65..43f8bcbe65 100644
--- a/main/src/main/java/org/apache/poi/hssf/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
index 0132e276e3..0132e276e3 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java
index b3e2d7f234..b3e2d7f234 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ArrayRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
index cd981f73c8..cd981f73c8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BOFRecord.java
index 5f081c1bac..5f081c1bac 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BOFRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BOFRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BackupRecord.java
index 32e485cfbc..32e485cfbc 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BackupRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BackupRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java b/poi/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java
index 089dce6755..089dce6755 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BiffHeaderInput.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BlankRecord.java
index 8b0f54ca37..8b0f54ca37 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BlankRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BlankRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java
index db57a64616..db57a64616 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BookBoolRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java
index 94266db621..94266db621 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BoolErrRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java
index 8ef05a56df..8ef05a56df 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BottomMarginRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java
index 0640640f7e..0640640f7e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/BoundSheetRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java b/poi/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java
index 217ed37157..217ed37157 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFHeader12Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java b/poi/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java
index 0e4c41396c..0e4c41396c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFHeaderBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index fc837d1afb..fc837d1afb 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFHeaderRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java b/poi/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java
index e1a3fc5883..e1a3fc5883 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFRule12Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java b/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java
index 22ee40f54a..22ee40f54a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFRuleBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java
index c685da52fa..c685da52fa 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CFRuleRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java
index eb7d3f607d..eb7d3f607d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CRNCountRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CRNRecord.java
index dc52d0b19a..dc52d0b19a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CRNRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CRNRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java
index 3fec4a9b43..3fec4a9b43 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CalcCountRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java
index 1cac3134ac..1cac3134ac 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CalcModeRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CellRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CellRecord.java
index d3c8bdb6a0..d3c8bdb6a0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CellRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CellRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java b/poi/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
index c91a400d6a..c91a400d6a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CellValueRecordInterface.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java
index e37a42d346..e37a42d346 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CodepageRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
index 6cbdc79691..6cbdc79691 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
index 14d7c2f1f5..14d7c2f1f5 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java
index 0b44be5857..0b44be5857 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ContinueRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/CountryRecord.java
index edea68bbc1..edea68bbc1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/CountryRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/CountryRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java
index 15938de26b..15938de26b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DBCellRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
index e45d0c3cf4..e45d0c3cf4 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DConRefRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DSFRecord.java
index a75a019d68..a75a019d68 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DSFRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DSFRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DVALRecord.java
index 8fed47a429..8fed47a429 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DVALRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DVALRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DVRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DVRecord.java
index a81e67295e..a81e67295e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DVRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DVRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java b/poi/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java
index f1f4fd8ef9..f1f4fd8ef9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DateWindow1904Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
index 8c18ae1458..8c18ae1458 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
index a68bee910b..a68bee910b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java
index dd9a28809a..dd9a28809a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DeltaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java
index b12d008786..b12d008786 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DimensionsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
index 4dbbb70b58..4dbbb70b58 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DrawingGroupRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java
index b368008236..b368008236 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DrawingRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java b/poi/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
index 8c9743f4bd..8c9743f4bd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DrawingRecordForBiffViewer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
index 94b6ac83d6..94b6ac83d6 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/EOFRecord.java
index a067b2917d..a067b2917d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/EOFRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/EOFRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
index ab5d3874ef..ab5d3874ef 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java
index 498ce88b06..498ce88b06 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/EndSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
index ac6bc6bf5c..ac6bc6bf5c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/EscherAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java
index b8a9aed2c0..b8a9aed2c0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ExtSSTRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
index de42bfd8bf..de42bfd8bf 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ExtendedFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java
index 7883f988cf..7883f988cf 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ExternSheetRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java
index 41999c819e..41999c819e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ExternalNameRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java
index deb5daaa6a..deb5daaa6a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FeatHdrRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java
index f5850bfefa..f5850bfefa 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FeatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FeatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
index a7fccea0c9..a7fccea0c9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FilePassRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java
index 4249e72a83..4249e72a83 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FileSharingRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
index 63b4c603bd..63b4c603bd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FnGroupCountRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FontRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FontRecord.java
index aedb462a4e..aedb462a4e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FontRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FontRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FooterRecord.java
index 5aee71d1c8..5aee71d1c8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FooterRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FooterRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java
index 7b2714bc77..7b2714bc77 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
index 0b702b0128..0b702b0128 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FormulaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java b/poi/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
index 9eadacea83..9eadacea83 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FormulaSpecialCachedValue.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
index 529b9ec234..529b9ec234 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java
index 5cdb539fc1..5cdb539fc1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FtCfSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
index 7b980b11c6..7b980b11c6 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java
index b5cfd92055..b5cfd92055 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/GridsetRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
index 805bca3442..805bca3442 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/GutsRecord.java
index 165b502677..165b502677 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/GutsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/GutsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java
index 37ee0ff63f..37ee0ff63f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HCenterRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java b/poi/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
index e8edcd9beb..e8edcd9beb 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HSSFRecordTypes.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java b/poi/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java
index 68e242e7bd..68e242e7bd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HeaderFooterBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
index 8db7fcb238..8db7fcb238 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java
index b3447121ad..b3447121ad 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HeaderRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java
index cf195a7028..cf195a7028 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HideObjRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
index 67b16b3d0b..67b16b3d0b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index 78bda25262..78bda25262 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/HyperlinkRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/IndexRecord.java
index dd7772c845..dd7772c845 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/IndexRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/IndexRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
index eabd453b4a..eabd453b4a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/InterfaceEndRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
index 030299e851..030299e851 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/InterfaceHdrRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/IterationRecord.java
index 1dbb863932..1dbb863932 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/IterationRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/IterationRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java
index b21286085e..b21286085e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/LabelRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/LabelRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java
index 1872845f8e..1872845f8e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/LabelSSTRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
index cf06408b3f..cf06408b3f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java
index 1157a32823..1157a32823 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/LeftMarginRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/MMSRecord.java
index ec2b3808fd..ec2b3808fd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/MMSRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/MMSRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/Margin.java b/poi/src/main/java/org/apache/poi/hssf/record/Margin.java
index 933eb75e65..933eb75e65 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/Margin.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/Margin.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java
index 3978dc9c60..3978dc9c60 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/MergeCellsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java
index 0f395cc272..0f395cc272 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/MulBlankRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java
index 86ec9fc64a..86ec9fc64a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/MulRKRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java
index c0bf9fd475..c0bf9fd475 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/NameCommentRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/NameRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/NameRecord.java
index 5a527ab04b..5a527ab04b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/NameRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/NameRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/NoteRecord.java
index c89ac5dece..c89ac5dece 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/NoteRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/NoteRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
index 3adff3856d..3adff3856d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/NumberRecord.java
index 8441736aa4..8441736aa4 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/NumberRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/NumberRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ObjRecord.java
index beea8ac7e8..beea8ac7e8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ObjRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
index da8d892954..da8d892954 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java
index 308cf43475..308cf43475 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/OldCellRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
index dd18abebf6..dd18abebf6 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/OldFormulaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java
index e393c8e3d8..e393c8e3d8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/OldLabelRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java
index 9f2120c393..9f2120c393 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/OldSheetRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java
index e81a2aa4b8..e81a2aa4b8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/OldStringRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
index 402c04d02c..402c04d02c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PageBreakRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java
index 7501722277..7501722277 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PaletteRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PaneRecord.java
index fa38346961..fa38346961 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PaneRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PaneRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java
index 2536765c70..2536765c70 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PasswordRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java b/poi/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java
index af74f6b5b2..af74f6b5b2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PasswordRev4Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java
index 27471b935f..27471b935f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PrecisionRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
index 7de13c6ec8..7de13c6ec8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
index 07752d70d4..07752d70d4 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java
index d6404e6245..d6404e6245 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/PrintSetupRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java
index b57cbe72a9..b57cbe72a9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ProtectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java b/poi/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
index dff1c5cffd..dff1c5cffd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ProtectionRev4Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RKRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RKRecord.java
index d6737ad00d..d6737ad00d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RKRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RKRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java
index 2a0481c62d..2a0481c62d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RecalcIdRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/Record.java b/poi/src/main/java/org/apache/poi/hssf/record/Record.java
index ede39a04f2..ede39a04f2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/Record.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/Record.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RecordBase.java b/poi/src/main/java/org/apache/poi/hssf/record/RecordBase.java
index 40907ec7e7..40907ec7e7 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RecordBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RecordBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java b/poi/src/main/java/org/apache/poi/hssf/record/RecordFactory.java
index 86014c4d2b..86014c4d2b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RecordFactory.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RecordFactory.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java b/poi/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
index a475269562..a475269562 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RecordFactoryInputStream.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java b/poi/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
index a8af77c2e1..a8af77c2e1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RecordInputStream.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java
index 6929d07cc8..6929d07cc8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RefModeRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java
index e385f91bec..e385f91bec 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RefreshAllRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java
index 94fc0645b2..94fc0645b2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RightMarginRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/RowRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/RowRecord.java
index e6e0be434e..e6e0be434e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/RowRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/RowRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SCLRecord.java
index fa338d2d92..fa338d2d92 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SCLRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SCLRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java b/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java
index 6b3bce351d..6b3bce351d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SSTDeserializer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SSTRecord.java
index ad1b3ae903..ad1b3ae903 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SSTRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SSTRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java b/poi/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java
index c15c7ad1ff..c15c7ad1ff 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SSTSerializer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
index 47934d028f..47934d028f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
index 8e718cc1d3..8e718cc1d3 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java
index 6019a825a0..6019a825a0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SelectionRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
index 0c4f4e6a2b..0c4f4e6a2b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java b/poi/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
index 3f23037d2a..3f23037d2a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SharedValueRecordBase.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/StandardRecord.java
index ac7637672b..ac7637672b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/StandardRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/StandardRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/StringRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/StringRecord.java
index efd86f1f79..efd86f1f79 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/StringRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/StringRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/StyleRecord.java
index 8f14499d80..8f14499d80 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/StyleRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/StyleRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SubRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SubRecord.java
index 0429267162..0429267162 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SubRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SubRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
index 2d610ac981..2d610ac981 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/SupBookRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java
index c76a396bd7..c76a396bd7 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/TabIdRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/TableRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/TableRecord.java
index 52bda012b8..52bda012b8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/TableRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/TableRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java
index b1ffccc513..b1ffccc513 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/TableStylesRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java
index 8beeb3a621..8beeb3a621 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/TextObjectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java
index 05aaab3f8e..05aaab3f8e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/TopMarginRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java
index f53118d8b1..f53118d8b1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UncalcedRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
index f67002f8d9..f67002f8d9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UnknownRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java
index 139c2faa18..139c2faa18 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UseSelFSRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java b/poi/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java
index b283673eec..b283673eec 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UserSViewBegin.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java b/poi/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java
index 4acfa89a2e..4acfa89a2e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/UserSViewEnd.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java
index 4090730e9b..4090730e9b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/VCenterRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
index bd28b190c2..bd28b190c2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java
index 0bdee8b994..0bdee8b994 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WSBoolRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java
index 8adcd475bb..8adcd475bb 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WindowOneRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java
index 368f39a66a..368f39a66a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WindowProtectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java
index 7548361afc..7548361afc 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WindowTwoRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java
index f1bf1373c3..f1bf1373c3 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WriteAccessRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java
index 665d656108..665d656108 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/WriteProtectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
index cd513e8683..cd513e8683 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CFRecordsAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
index 795a66389e..795a66389e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
index ab14e35e34..ab14e35e34 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
index 2afbb3813d..2afbb3813d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ConditionalFormattingTable.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
index 40fe4dfc17..40fe4dfc17 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/CustomViewSettingsRecordAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
index e6ad8bb29d..e6ad8bb29d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/DataValidityTable.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
index 62c3df3a05..62c3df3a05 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/FormulaRecordAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
index c698cb0d27..c698cb0d27 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/MergedCellsTable.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
index c8d931f349..c8d931f349 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/PageSettingsBlock.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
index c8103501ed..c8103501ed 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RecordAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
index 738d1d9b13..738d1d9b13 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/RowRecordsAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
index 03de03ebbd..03de03ebbd 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/SharedValueManager.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
index fff9cc9b37..fff9cc9b37 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
index 9a1a6418db..9a1a6418db 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/WorksheetProtectionBlock.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java
index 79c1fbcb3a..79c1fbcb3a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/aggregates/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
index e4ea808c4b..e4ea808c4b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
index ab463c9fa8..ab463c9fa8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
index 51ea9ba716..51ea9ba716 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
index 5063cfe3bf..5063cfe3bf 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
index bef35e555e..bef35e555e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java
index fe40aec82f..fe40aec82f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/FontFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
index ac2a42fc15..ac2a42fc15 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
index 3b1c8f87c8..3b1c8f87c8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
index 4bad219297..4bad219297 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java b/poi/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java
index 6c161d7927..6c161d7927 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cf/Threshold.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
index f3c309e5a5..f3c309e5a5 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java
index 93462b4878..93462b4878 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AreaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
index 26e669d46f..26e669d46f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
index 3236ff04df..3236ff04df 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
index f9680ac14b..f9680ac14b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java
index 2da5fd4fe1..2da5fd4fe1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
index bd22059232..bd22059232 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java
index fd7a1c206a..fd7a1c206a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/BarRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java
index 09932be3c9..09932be3c9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/BeginRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
index 9cb603d253..9cb603d253 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/CatLabRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
index ea2a80bd3b..ea2a80bd3b 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
index c222c8a47e..c222c8a47e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
index 86c8ea10db..86c8ea10db 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartEndObjectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
index 66e10fbab0..66e10fbab0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFRTInfoRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
index 308c6f38ee..308c6f38ee 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java
index 0512e6814a..0512e6814a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
index 6e9601e09a..6e9601e09a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
index 27a600cfad..27a600cfad 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartStartObjectRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
index 281cfb5138..281cfb5138 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ChartTitleFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java
index 26e34a5195..26e34a5195 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/DatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
index ba319f23f2..ba319f23f2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
index 6374d8fb8c..6374d8fb8c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/DataLabelExtensionRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
index aafee0b3a2..aafee0b3a2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java
index 9bef5a0ab2..9bef5a0ab2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/EndRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
index 0a4a3c3f7c..0a4a3c3f7c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
index d46df3338d..d46df3338d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java
index 85cd206c65..85cd206c65 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/FrameRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java
index ebbe2e1e76..ebbe2e1e76 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/LegendRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
index 94d307c752..94d307c752 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
index 0b4810bc99..0b4810bc99 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
index 8a4077b7d6..8a4077b7d6 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
index f6305eedd7..f6305eedd7 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
index e35d2301af..e35d2301af 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
index 8167858e24..8167858e24 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
index ca456168a4..ca456168a4 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
index 7564965d26..7564965d26 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
index 286b42e353..286b42e353 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
index ac1fb5aba2..ac1fb5aba2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
index 4ed7ee3b60..4ed7ee3b60 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
index 4eecfc484a..4eecfc484a 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
index 00158480e2..00158480e2 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java
index 7c3c8666aa..7c3c8666aa 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/TextRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java
index 434f9aa74e..434f9aa74e 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/TickRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
index 661e521c2f..661e521c2f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
index e18ebcc1b8..e18ebcc1b8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java b/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java
index bb409edcad..bb409edcad 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/ExtRst.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/poi/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java
index e81cab49da..e81cab49da 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/ExtendedColor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
index f7330fd5ec..f7330fd5ec 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatFormulaErr2.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java
index b8d4aa80c9..b8d4aa80c9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatProtection.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
index 976f9a6d1c..976f9a6d1c 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FeatSmartTag.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java
index e0438e353f..e0438e353f 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FormatRun.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java
index fbf46f9d01..fbf46f9d01 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FtrHeader.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java
index 65a26cca73..65a26cca73 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/FutureRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java b/poi/src/main/java/org/apache/poi/hssf/record/common/PhRun.java
index 404efb0bd0..404efb0bd0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/PhRun.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/PhRun.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java b/poi/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java
index 5880bbc8ef..5880bbc8ef 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/SharedFeature.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java b/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
index d9b56d7e7d..d9b56d7e7d 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/common/UnicodeString.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
index dceb7b86b1..dceb7b86b1 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
index 0026aabaa8..0026aabaa8 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordInput.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
index a39f1393e0..a39f1393e0 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cont/ContinuableRecordOutput.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java b/poi/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
index 947cbcd595..947cbcd595 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/cont/UnknownLengthRecordOutput.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java b/poi/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
index b9a7638789..b9a7638789 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/crypto/Biff8DecryptingStream.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java b/poi/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
index 23cd17a823..23cd17a823 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/package-info.java b/poi/src/main/java/org/apache/poi/hssf/record/package-info.java
index 9d47affa70..9d47affa70 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
index 9d77e4b361..9d77e4b361 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/DataItemRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
index ade9c24d88..ade9c24d88 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ExtendedPivotTableViewFieldsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
index c1b0f91be4..c1b0f91be4 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/PageItemRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
index 11beef32b9..11beef32b9 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/StreamIDRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
index 190b5e4d39..190b5e4d39 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewDefinitionRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
index 7bbfbb68fb..7bbfbb68fb 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewFieldsRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
index 20aa600aea..20aa600aea 100644
--- a/main/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
+++ b/poi/src/main/java/org/apache/poi/hssf/record/pivottable/ViewSourceRecord.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java
index 5317969278..5317969278 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/DVConstraint.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
index 4e3c4bd1ca..4e3c4bd1ca 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
index a5e3516ab0..a5e3516ab0 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/EscherGraphics2d.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java
index d9fc1d54c2..d9fc1d54c2 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/FontDetails.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
index 56c918af47..56c918af47 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFAnchor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
index 533dffee37..533dffee37 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFAutoFilter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
index f0de680a6a..f0de680a6a 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFBorderFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
index a48313176a..a48313176a 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCell.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
index 3f78756a7d..3f78756a7d 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
index d78ac00d4d..d78ac00d4d 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChart.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
index a7a88c6b6b..a7a88c6b6b 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFChildAnchor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
index a9ffbea496..a9ffbea496 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFClientAnchor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
index 36c5a53e0c..36c5a53e0c 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFColorScaleFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
index 262eae5086..262eae5086 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCombobox.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java
index c62bd4daf1..c62bd4daf1 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFComment.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
index 26bdd6bd95..26bdd6bd95 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
index 29506743f6..29506743f6 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
index 4ab124c05c..4ab124c05c 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingThreshold.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
index 754930f13b..754930f13b 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCreationHelper.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
index f796dd80dd..f796dd80dd 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataBarFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
index 09284dcb90..09284dcb90 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
index ef3eb93154..ef3eb93154 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataFormatter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
index 40c0ada463..40c0ada463 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidation.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
index 15161cb882..15161cb882 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDataValidationHelper.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
index f0ff039fd1..f0ff039fd1 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFDateUtil.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
index 4b90599e43..4b90599e43 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationCell.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
index dd6c1f09df..dd6c1f09df 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationSheet.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
index b0fa3e28f7..b0fa3e28f7 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
index b178263185..b178263185 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFExtendedColor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java
index 2cdb4e8b7e..2cdb4e8b7e 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFont.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
index 735d921cc3..735d921cc3 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
index e23c21bea0..e23c21bea0 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFooter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
index f8ab24a0e8..f8ab24a0e8 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
index 41530874f1..41530874f1 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFHeader.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
index 1b51235bc8..1b51235bc8 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFHyperlink.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
index cabfad2f80..cabfad2f80 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFIconMultiStateFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
index c805c573e9..c805c573e9 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFName.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
index 3909f41400..3909f41400 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFObjectData.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
index 40799029be..40799029be 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFOptimiser.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
index b74bf1b570..b74bf1b570 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPalette.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
index e5b6d668cc..e5b6d668cc 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
index 1f521c509e..1f521c509e 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
index e66658905f..e66658905f 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPicture.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
index 9dd6079624..9dd6079624 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPictureData.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
index 430fe62798..430fe62798 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
index 6399b883af..6399b883af 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFPrintSetup.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
index 60b1a23417..60b1a23417 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRangeCopier.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
index 34b95d7fa0..34b95d7fa0 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRichTextString.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
index 0ecc946636..0ecc946636 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFRow.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java
index 964356f5a6..964356f5a6 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShape.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
index 28f7894dd0..28f7894dd0 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeContainer.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
index c7dce30535..c7dce30535 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeFactory.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
index b8001fc651..b8001fc651 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeGroup.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
index d72b4003d1..d72b4003d1 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFShapeTypes.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
index 975419077c..975419077c 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
index 436a7f5d1f..436a7f5d1f 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSheetConditionalFormatting.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
index 02d5e7fdac..02d5e7fdac 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFSimpleShape.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
index 5821a42f57..5821a42f57 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFTextbox.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
index bd86c2857f..bd86c2857f 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
index b43a45de6a..b43a45de6a 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFWorkbookFactory.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
index 38464490d6..38464490d6 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/HeaderFooter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
index 453f3db384..453f3db384 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/StaticFontMetrics.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
index 3f86caddd6..3f86caddd6 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFColumnShifter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
index 4a743556a4..4a743556a4 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/helpers/HSSFRowShifter.java
diff --git a/main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java b/poi/src/main/java/org/apache/poi/hssf/usermodel/package-info.java
index 7fe4e03ee3..7fe4e03ee3 100644
--- a/main/src/main/java/org/apache/poi/hssf/usermodel/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/usermodel/package-info.java
diff --git a/main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java b/poi/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
index c70e525667..c70e525667 100644
--- a/main/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
+++ b/poi/src/main/java/org/apache/poi/hssf/util/CellRangeAddress8Bit.java
diff --git a/main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java b/poi/src/main/java/org/apache/poi/hssf/util/HSSFColor.java
index a7d53da928..a7d53da928 100644
--- a/main/src/main/java/org/apache/poi/hssf/util/HSSFColor.java
+++ b/poi/src/main/java/org/apache/poi/hssf/util/HSSFColor.java
diff --git a/main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java b/poi/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
index 5b084916a2..5b084916a2 100644
--- a/main/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
+++ b/poi/src/main/java/org/apache/poi/hssf/util/LazilyConcatenatedByteArray.java
diff --git a/main/src/main/java/org/apache/poi/hssf/util/RKUtil.java b/poi/src/main/java/org/apache/poi/hssf/util/RKUtil.java
index 42cdd379b5..42cdd379b5 100644
--- a/main/src/main/java/org/apache/poi/hssf/util/RKUtil.java
+++ b/poi/src/main/java/org/apache/poi/hssf/util/RKUtil.java
diff --git a/main/src/main/java/org/apache/poi/hssf/util/package-info.java b/poi/src/main/java/org/apache/poi/hssf/util/package-info.java
index 4ac9c8f6f6..4ac9c8f6f6 100644
--- a/main/src/main/java/org/apache/poi/hssf/util/package-info.java
+++ b/poi/src/main/java/org/apache/poi/hssf/util/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java b/poi/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
index 1e8b1b113a..1e8b1b113a 100644
--- a/main/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
+++ b/poi/src/main/java/org/apache/poi/poifs/common/POIFSBigBlockSize.java
diff --git a/main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java b/poi/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java
index f3804a90be..f3804a90be 100644
--- a/main/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java
+++ b/poi/src/main/java/org/apache/poi/poifs/common/POIFSConstants.java
diff --git a/main/src/main/java/org/apache/poi/poifs/common/package-info.java b/poi/src/main/java/org/apache/poi/poifs/common/package-info.java
index 2df44254bd..2df44254bd 100644
--- a/main/src/main/java/org/apache/poi/poifs/common/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/common/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java b/poi/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java
index f32910e1ab..f32910e1ab 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/ChainingMode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
index 827ee4c0a7..827ee4c0a7 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherInputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
index 5270fc0461..5270fc0461 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java b/poi/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
index 5ec778617c..5ec778617c 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/CipherAlgorithm.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java b/poi/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java
index ac2dbafd0a..ac2dbafd0a 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/CipherProvider.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java b/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
index 369cbd67e4..369cbd67e4 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/CryptoFunctions.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java b/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
index 09a56e2e81..09a56e2e81 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/DataSpaceMapUtils.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java
index 34a12b5e0a..34a12b5e0a 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/Decryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
index f10dda09bd..f10dda09bd 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
index 30fc9539e3..30fc9539e3 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
index c32b069116..c32b069116 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java
index 393247df8d..393247df8d 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionMode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
index 2d3f0fe64a..2d3f0fe64a 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java
index 9c2041d72a..9c2041d72a 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/Encryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java b/poi/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
index b4618dc0b5..b4618dc0b5 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/HashAlgorithm.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
index 898670eaba..898670eaba 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileDecryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
index 78c289f5ea..78c289f5ea 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
index 0674305b22..0674305b22 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
index 6699b543c4..6699b543c4 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
index 9200fb3830..9200fb3830 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/AgileEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
index 938b04f466..938b04f466 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/CertificateKeyEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
index 5d067b0232..5d067b0232 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/DataIntegrity.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
index 07004d05a5..07004d05a5 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
index fba57eb2c4..fba57eb2c4 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyData.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
index c7e591d160..c7e591d160 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/KeyEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
index 1e3f8640ff..1e3f8640ff 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/agile/PasswordKeyEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
index ff14f19ab3..ff14f19ab3 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Decryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
index f9051b652c..f9051b652c 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
index d8b8573597..d8b8573597 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
index f771b77550..f771b77550 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4EncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
index c048271421..c048271421 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/binaryrc4/BinaryRC4Encryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
index df2a51bc38..df2a51bc38 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDecryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
index c2391b1680..c2391b1680 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentInputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
index 3a9cae9b04..3a9cae9b04 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIDocumentOutputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
index 9c0af9b177..9c0af9b177 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
index c1484d691b..c1484d691b 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
index f2c00410b3..f2c00410b3 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
index 652e7f51d7..652e7f51d7 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/package-info.java b/poi/src/main/java/org/apache/poi/poifs/crypt/package-info.java
index df27963002..df27963002 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
index 3b45190497..3b45190497 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/EncryptionRecord.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
index 9fedce6122..9fedce6122 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardDecryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
index 139bb2ac70..139bb2ac70 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
index b46055b967..b46055b967 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
index d30fe998b2..d30fe998b2 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
index 097a7bd6d7..097a7bd6d7 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
index d2cebca389..d2cebca389 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XORDecryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
index 4af028656a..4af028656a 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionHeader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
index 9fcaf8b35b..9fcaf8b35b 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionInfoBuilder.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
index 5f583a7f2c..5f583a7f2c 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptionVerifier.java
diff --git a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
index 0c1cbf4932..0c1cbf4932 100644
--- a/main/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/xor/XOREncryptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java
index fed8c008bf..fed8c008bf 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSDump.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java
index f9696bccfb..f9696bccfb 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSLister.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
index 8db1bf3129..8db1bf3129 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewEngine.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java
index 8349e66973..8349e66973 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewable.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java
index 0be693444f..0be693444f 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/POIFSViewer.java
diff --git a/main/src/main/java/org/apache/poi/poifs/dev/package-info.java b/poi/src/main/java/org/apache/poi/poifs/dev/package-info.java
index 4d04219f88..4d04219f88 100644
--- a/main/src/main/java/org/apache/poi/poifs/dev/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/dev/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
index 60487e1e8e..60487e1e8e 100644
--- a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
index fd228a5b6c..fd228a5b6c 100644
--- a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
+++ b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderEvent.java
diff --git a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
index 56a3b78479..56a3b78479 100644
--- a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
+++ b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderListener.java
diff --git a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
index 9ffac63120..9ffac63120 100644
--- a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
+++ b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/POIFSReaderRegistry.java
diff --git a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java
index 34760da4d4..34760da4d4 100644
--- a/main/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/eventfilesystem/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java
index fcd3bde649..fcd3bde649 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/BATManaged.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
index bdd016f860..bdd016f860 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/BlockStore.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
index 7148fda3cf..7148fda3cf 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryEntry.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
index e91da26fb5..e91da26fb5 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DirectoryNode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
index 0c1b2c8177..0c1b2c8177 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentDescriptor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
index 29f4b8afbf..29f4b8afbf 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentEntry.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
index 088b549283..088b549283 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentFactoryHelper.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
index bf07261ef9..bf07261ef9 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentInputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java
index 06c854dfc2..06c854dfc2 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentNode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
index a1052d865c..a1052d865c 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/DocumentOutputStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/Entry.java
index 2a8ea16aac..2a8ea16aac 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/Entry.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/Entry.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java
index a48d8e4f9a..a48d8e4f9a 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/EntryNode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java
index bd21697fcf..bd21697fcf 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/EntryUtils.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java
index 81cd6187e2..81cd6187e2 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/FileMagic.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
index 717247c5b6..717247c5b6 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/FilteringDirectoryNode.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
index 18387cfb77..18387cfb77 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/NotOLE2FileException.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
index ac2404b72a..ac2404b72a 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/OfficeXmlFileException.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
index c2d4a73ae4..c2d4a73ae4 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/Ole10Native.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
index 47fd9e95a4..47fd9e95a4 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/Ole10NativeException.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
index 05881561b1..05881561b1 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocument.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
index 1db851e8b6..1db851e8b6 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSDocumentPath.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
index 2fb09dc04d..2fb09dc04d 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSFileSystem.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
index db49e5b814..db49e5b814 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSMiniStore.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java
index f34d4da6ab..f34d4da6ab 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSStream.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
index a3954c3720..a3954c3720 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterEvent.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
index 9f9e396a11..9f9e396a11 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/POIFSWriterListener.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
index be162b6079..be162b6079 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/TempFilePOIFSFileSystem.java
diff --git a/main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java b/poi/src/main/java/org/apache/poi/poifs/filesystem/package-info.java
index 84c2d9f35d..84c2d9f35d 100644
--- a/main/src/main/java/org/apache/poi/poifs/filesystem/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/filesystem/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/macros/Module.java b/poi/src/main/java/org/apache/poi/poifs/macros/Module.java
index 29924d9d89..29924d9d89 100644
--- a/main/src/main/java/org/apache/poi/poifs/macros/Module.java
+++ b/poi/src/main/java/org/apache/poi/poifs/macros/Module.java
diff --git a/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java b/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
index 9874270a9d..9874270a9d 100644
--- a/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroExtractor.java
diff --git a/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java b/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
index 2f28c6397e..2f28c6397e 100644
--- a/main/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
+++ b/poi/src/main/java/org/apache/poi/poifs/macros/VBAMacroReader.java
diff --git a/main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java b/poi/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
index 15c4f6ff07..15c4f6ff07 100644
--- a/main/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
+++ b/poi/src/main/java/org/apache/poi/poifs/nio/ByteArrayBackedDataSource.java
diff --git a/main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java b/poi/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java
index bc05b25532..bc05b25532 100644
--- a/main/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java
+++ b/poi/src/main/java/org/apache/poi/poifs/nio/CleanerUtil.java
diff --git a/main/src/main/java/org/apache/poi/poifs/nio/DataSource.java b/poi/src/main/java/org/apache/poi/poifs/nio/DataSource.java
index f43667626f..f43667626f 100644
--- a/main/src/main/java/org/apache/poi/poifs/nio/DataSource.java
+++ b/poi/src/main/java/org/apache/poi/poifs/nio/DataSource.java
diff --git a/main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java b/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
index e3001f238f..e3001f238f 100644
--- a/main/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
+++ b/poi/src/main/java/org/apache/poi/poifs/nio/FileBackedDataSource.java
diff --git a/main/src/main/java/org/apache/poi/poifs/package-info.java b/poi/src/main/java/org/apache/poi/poifs/package-info.java
index 78420021c9..78420021c9 100644
--- a/main/src/main/java/org/apache/poi/poifs/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/Child.java b/poi/src/main/java/org/apache/poi/poifs/property/Child.java
index 6047452149..6047452149 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/Child.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/Child.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java b/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
index 07846736c2..07846736c2 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/DirectoryProperty.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java b/poi/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java
index 0a7c587e2a..0a7c587e2a 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/DocumentProperty.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/Parent.java b/poi/src/main/java/org/apache/poi/poifs/property/Parent.java
index 24e2bb266d..24e2bb266d 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/Parent.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/Parent.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/Property.java b/poi/src/main/java/org/apache/poi/poifs/property/Property.java
index 6ffff00424..6ffff00424 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/Property.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/Property.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java b/poi/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java
index cf89f40858..cf89f40858 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/PropertyConstants.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java b/poi/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java
index ba459050bf..ba459050bf 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/PropertyFactory.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java b/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
index 596bea5070..596bea5070 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/PropertyTable.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/RootProperty.java b/poi/src/main/java/org/apache/poi/poifs/property/RootProperty.java
index c74a02a29d..c74a02a29d 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/RootProperty.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/RootProperty.java
diff --git a/main/src/main/java/org/apache/poi/poifs/property/package-info.java b/poi/src/main/java/org/apache/poi/poifs/property/package-info.java
index 9ffa4aebc7..9ffa4aebc7 100644
--- a/main/src/main/java/org/apache/poi/poifs/property/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/property/package-info.java
diff --git a/main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java b/poi/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
index 9ef00ad1f5..9ef00ad1f5 100644
--- a/main/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/BATBlock.java
diff --git a/main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java b/poi/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java
index 3bf833ec10..3bf833ec10 100644
--- a/main/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/BlockWritable.java
diff --git a/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
index 24b1a99008..24b1a99008 100644
--- a/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlock.java
diff --git a/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
index 5470bde5b8..5470bde5b8 100644
--- a/main/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/HeaderBlockConstants.java
diff --git a/main/src/main/java/org/apache/poi/poifs/storage/package-info.java b/poi/src/main/java/org/apache/poi/poifs/storage/package-info.java
index 9fadf9df91..9fadf9df91 100644
--- a/main/src/main/java/org/apache/poi/poifs/storage/package-info.java
+++ b/poi/src/main/java/org/apache/poi/poifs/storage/package-info.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
index 96e63a6448..96e63a6448 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java
index 5503542a10..5503542a10 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawAutoShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawBackground.java
index c61f6dbb79..c61f6dbb79 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawBackground.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawBackground.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java
index bb973f5f8a..bb973f5f8a 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawConnectorShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawFactory.java
index 6b63274455..6b63274455 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawFactory.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawFactory.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java
index da1979cb9e..da1979cb9e 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontInfo.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java
index 72216b36bd..72216b36bd 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontManager.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
index a5acccd023..a5acccd023 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawFontManagerDefault.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java
index be18f037ab..be18f037ab 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawFreeformShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
index 0628429f83..0628429f83 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawGraphicalFrame.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java
index 3472d85437..3472d85437 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawGroupShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java
index 2dbbfef69b..2dbbfef69b 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawMasterSheet.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java
index 246e8d8a1b..246e8d8a1b 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawNotImplemented.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawNothing.java
index f875da7fc5..f875da7fc5 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawNothing.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawNothing.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java
index e78dd2ee14..e78dd2ee14 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawPaint.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawPaint.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
index 764f1f576a..764f1f576a 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawPictureShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawShape.java
index 05407e6a78..05407e6a78 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawSheet.java
index 4134b5ace0..4134b5ace0 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawSheet.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawSheet.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java
index 88b7eea935..88b7eea935 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawSimpleShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawSlide.java
index 295c584387..295c584387 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawSlide.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawSlide.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java
index 1974f0d9a7..1974f0d9a7 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTableShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java
index 1b2b2f444c..1b2b2f444c 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextBox.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java
index 7bc23cfa7c..7bc23cfa7c 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextFragment.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java
index b49f7276b8..b49f7276b8 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextParagraph.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java
index d8d23b5676..d8d23b5676 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTextShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java b/poi/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java
index 2d3db49069..2d3db49069 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/DrawTexturePaint.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/Drawable.java b/poi/src/main/java/org/apache/poi/sl/draw/Drawable.java
index cb5f8592f9..cb5f8592f9 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/Drawable.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/Drawable.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java b/poi/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
index 5fcdba52d7..5fcdba52d7 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/EmbeddedExtractor.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java b/poi/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java
index 6f255c72d0..6f255c72d0 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/ImageRenderer.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java b/poi/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java
index 40c802ccac..40c802ccac 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/PathGradientPaint.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java b/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java
index 9d0398e585..9d0398e585 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/SLGraphics.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/SLGraphics.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
index a101c167a1..a101c167a1 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustHandle.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
index 27c5e09a7f..27c5e09a7f 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustPoint.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java
index 68570b1599..68570b1599 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/AdjustValue.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
index 4c6c14d09b..4c6c14d09b 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/ArcToCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
index 63501a985c..63501a985c 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/BuiltInGuide.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
index ab7a37a444..ab7a37a444 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/ClosePathCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
index 9f19ebccc6..9f19ebccc6 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/ConnectionSite.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/Context.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/Context.java
index 3ac4495929..3ac4495929 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/Context.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/Context.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
index 2e121c7893..2e121c7893 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/CurveToCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
index ff7a1c2f5f..ff7a1c2f5f 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/CustomGeometry.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/Formula.java
index 24a49b80a6..24a49b80a6 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/Formula.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/Formula.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/Guide.java
index 77da392058..77da392058 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/Guide.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/Guide.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
index 3145507dca..3145507dca 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/IAdjustableShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java
index b1965fab87..b1965fab87 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/LineToCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
index 6ebaa206b3..6ebaa206b3 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/MoveToCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/Outline.java
index 11e643dad2..11e643dad2 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/Outline.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/Outline.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/Path.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/Path.java
index 2d86f4747d..2d86f4747d 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/Path.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/Path.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java
index 76a53e7de2..76a53e7de2 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/PathCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
index 97ca9afa97..97ca9afa97 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/PolarAdjustHandle.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
index acde02c945..acde02c945 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetGeometries.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java
index 998b0ee776..998b0ee776 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/PresetParser.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
index 4278a00274..4278a00274 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/QuadToCommand.java
diff --git a/main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java b/poi/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
index 46975da2c8..46975da2c8 100644
--- a/main/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/geom/XYAdjustHandle.java
diff --git a/main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
index fabab5a7a1..fabab5a7a1 100644
--- a/main/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
+++ b/poi/src/main/java/org/apache/poi/sl/extractor/SlideShowExtractor.java
diff --git a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
index b7d0a3c4ec..b7d0a3c4ec 100644
--- a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
+++ b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderBitmap.java
diff --git a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java
index 6dd5faf440..6dd5faf440 100644
--- a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java
+++ b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderEMF.java
diff --git a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java
index bf9cacefaf..bf9cacefaf 100644
--- a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java
+++ b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPICT.java
diff --git a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
index 400bedd74e..400bedd74e 100644
--- a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
+++ b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderPNG.java
diff --git a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java
index cf2f75867f..cf2f75867f 100644
--- a/main/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java
+++ b/poi/src/main/java/org/apache/poi/sl/image/ImageHeaderWMF.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java b/poi/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
index 32e146edf0..32e146edf0 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/AbstractColorStyle.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java b/poi/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
index 939add734f..939add734f 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/AutoNumberingScheme.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
index bea0502135..bea0502135 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/AutoShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Background.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Background.java
index 879879a209..879879a209 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Background.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Background.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java
index da24d16583..da24d16583 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ColorStyle.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Comment.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Comment.java
index 43e46efec8..43e46efec8 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Comment.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Comment.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java
index 2b580daeb8..2b580daeb8 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ConnectorShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java b/poi/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java
index 2bcfd5ce79..2bcfd5ce79 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/FillStyle.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java
index 42ae10ae9a..42ae10ae9a 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/FreeformShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java b/poi/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
index def24d9597..def24d9597 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/GraphicalFrame.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java
index 31f5be5345..31f5be5345 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/GroupShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
index 381c928995..381c928995 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Hyperlink.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java
index 7fec6354f5..7fec6354f5 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Insets2D.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Line.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Line.java
index d2c2134e52..d2c2134e52 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Line.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Line.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java b/poi/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java
index 7d78e8040a..7d78e8040a 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/LineDecoration.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java b/poi/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
index 81da0bb19a..81da0bb19a 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/MasterSheet.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Notes.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Notes.java
index 377ad24c40..377ad24c40 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Notes.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Notes.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java
index 11a94281ed..11a94281ed 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectData.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
index 1851b0c8b0..1851b0c8b0 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectMetaData.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
index c7d421950e..c7d421950e 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ObjectShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java
index 21f0824a2f..21f0824a2f 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PaintStyle.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
index df2ca79b01..df2ca79b01 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureData.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java
index 03b2f642a4..03b2f642a4 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PictureShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java
index 80d9f0fa52..80d9f0fa52 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PlaceableShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java
index 1d7e4c421c..1d7e4c421c 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Placeholder.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
index 7c4418f164..7c4418f164 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PlaceholderDetails.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java b/poi/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java
index 2538d1b828..2538d1b828 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/PresetColor.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java b/poi/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java
index 8fd9efc0db..8fd9efc0db 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/RectAlign.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Shadow.java
index de462f9132..de462f9132 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Shadow.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Shadow.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Shape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Shape.java
index 4929f48bb8..4929f48bb8 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Shape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
index 7706828c52..7706828c52 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ShapeContainer.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java b/poi/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java
index 31ab5011ae..31ab5011ae 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/ShapeType.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
index ae7cd179bc..ae7cd179bc 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Sheet.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
index ec31b5cc65..ec31b5cc65 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/SimpleShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/Slide.java b/poi/src/main/java/org/apache/poi/sl/usermodel/Slide.java
index 7c0d566138..7c0d566138 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/Slide.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/Slide.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
index 751379de92..751379de92 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShow.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
index a32123afe5..a32123afe5 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShowFactory.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
index 3dbde3cde5..3dbde3cde5 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/SlideShowProvider.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java b/poi/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java
index 500dffde4e..500dffde4e 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/StrokeStyle.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TabStop.java
index 479b1fec44..479b1fec44 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TabStop.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TabStop.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TableCell.java
index 4bc5e33278..4bc5e33278 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TableCell.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TableCell.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TableShape.java
index 20f2dc3d76..20f2dc3d76 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TableShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TableShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
index 1405722b85..1405722b85 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TextBox.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java
index 354b357b94..354b357b94 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TextParagraph.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
index 7dfd4933d8..7dfd4933d8 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TextRun.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java b/poi/src/main/java/org/apache/poi/sl/usermodel/TextShape.java
index 8219836281..8219836281 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/TextShape.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/TextShape.java
diff --git a/main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java b/poi/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
index f302d8288f..f302d8288f 100644
--- a/main/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
+++ b/poi/src/main/java/org/apache/poi/sl/usermodel/VerticalAlignment.java
diff --git a/main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java b/poi/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java
index 200175d04b..200175d04b 100644
--- a/main/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java
+++ b/poi/src/main/java/org/apache/poi/ss/SpreadsheetVersion.java
diff --git a/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java b/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java
index 0e598b3175..0e598b3175 100644
--- a/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java
+++ b/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedData.java
diff --git a/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java b/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
index dbce0249ea..dbce0249ea 100644
--- a/main/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
+++ b/poi/src/main/java/org/apache/poi/ss/extractor/EmbeddedExtractor.java
diff --git a/main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java b/poi/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java
index 9adc35cb84..9adc35cb84 100644
--- a/main/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java
+++ b/poi/src/main/java/org/apache/poi/ss/extractor/ExcelExtractor.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
index 94a4f46710..94a4f46710 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellDateFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
index 4a5e370e86..4a5e370e86 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormat.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
index 86a1dabf4f..86a1dabf4f 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java
index 96e9c5fcd8..96e9c5fcd8 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormatCondition.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
index c03dbc5795..c03dbc5795 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormatResult.java
index a22f77c277..a22f77c277 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormatResult.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormatResult.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormatType.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormatType.java
index af947b1db4..af947b1db4 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormatType.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormatType.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellFormatter.java
index e3ff5c5527..e3ff5c5527 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java
index 2233c284aa..2233c284aa 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellGeneralFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
index f25965af75..f25965af75 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellNumberFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java b/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
index a9af31851f..a9af31851f 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellNumberPartHandler.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java b/poi/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java
index 30c10f1258..30c10f1258 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellNumberStringMod.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java
index 3537520c46..3537520c46 100644
--- a/main/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellTextFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
index dec5a275f3..dec5a275f3 100644
--- a/main/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/SimpleFraction.java
diff --git a/main/src/main/java/org/apache/poi/ss/format/package-info.java b/poi/src/main/java/org/apache/poi/ss/format/package-info.java
index 71f14cb2b3..71f14cb2b3 100644
--- a/main/src/main/java/org/apache/poi/ss/format/package-info.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/package-info.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
index fa9989c02b..fa9989c02b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java b/poi/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java
index 2716e24084..2716e24084 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/CacheAreaEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java b/poi/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java
index 22db400533..22db400533 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/CellCacheEntry.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java b/poi/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
index b9c7efc678..b9c7efc678 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/CellEvaluationFrame.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java b/poi/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
index 65ef78c205..65ef78c205 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/CollaboratingWorkbooksEnvironment.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
index 269b8f292a..269b8f292a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ConditionalFormattingEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
index c49d5f0e3c..c49d5f0e3c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/DataValidationEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java
index 451ccc7ba3..451ccc7ba3 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationCache.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java
index ae983d11d8..ae983d11d8 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationCell.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
index afb4a09f9d..afb4a09f9d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationConditionalFormatRule.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationName.java
index e43ab76c46..e43ab76c46 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationName.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationName.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java
index 881f00fafd..881f00fafd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationSheet.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java
index a69386389c..a69386389c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationTracker.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
index 2a6aed0751..2a6aed0751 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/EvaluationWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java b/poi/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
index ce6bf0efdb..ce6bf0efdb 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ExternSheetReferenceToken.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/Formula.java b/poi/src/main/java/org/apache/poi/ss/formula/Formula.java
index cc32a63ad4..cc32a63ad4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/Formula.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/Formula.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java
index fc097eb884..fc097eb884 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCache.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
index 9dbb7248c8..9dbb7248c8 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntry.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
index 9a40cbc95e..9a40cbc95e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaCellCacheEntrySet.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
index 4b1040f16d..4b1040f16d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParseException.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
index a05166e29e..a05166e29e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParser.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
index 1d0c275b91..1d0c275b91 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaParsingWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java
index c247b1b61e..c247b1b61e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaRenderer.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
index 94b791d31f..94b791d31f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaRenderingWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java
index ed2589d754..ed2589d754 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaShifter.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaType.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaType.java
index fa154e6d42..fa154e6d42 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaType.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaType.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java b/poi/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
index 005c91dfac..005c91dfac 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/FormulaUsedBlankCellSet.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java b/poi/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java
index 6182a28cfd..6182a28cfd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/IEvaluationListener.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java b/poi/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java
index e4576a7c4d..e4576a7c4d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/IStabilityClassifier.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java b/poi/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java
index f10cfe6de9..f10cfe6de9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/LazyAreaEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java b/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java
index 4456c23a62..4456c23a62 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/LazyRefEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java b/poi/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java
index 4245afff18..4245afff18 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/NameIdentifier.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java b/poi/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java
index 341919af58..341919af58 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/OperandClassTransformer.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
index fcb1ccf9f2..fcb1ccf9f2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluationContext.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
index ca10b13075..ca10b13075 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/OperationEvaluatorFactory.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ParseNode.java b/poi/src/main/java/org/apache/poi/ss/formula/ParseNode.java
index a41ec26346..a41ec26346 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ParseNode.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ParseNode.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java b/poi/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java
index 0bf2ca4c3a..0bf2ca4c3a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/PlainCellCache.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java b/poi/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
index 171b12e179..171b12e179 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/PlainValueCellCacheEntry.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java b/poi/src/main/java/org/apache/poi/ss/formula/SharedFormula.java
index ed7e58b3bd..ed7e58b3bd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SharedFormula.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SharedFormula.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java
index 69f6f99501..69f6f99501 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetIdentifier.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
index cff04f3249..cff04f3249 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetNameFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetRange.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetRange.java
index ab7ccab83a..ab7ccab83a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetRange.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetRange.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
index 3ee1d77df5..3ee1d77df5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
index 68dbb9be3f..68dbb9be3f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
index 88c91991b9..88c91991b9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetRangeIdentifier.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
index 2324eda75b..2324eda75b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/SheetRefEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java b/poi/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java
index 0bda63749c..0bda63749c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ThreeDEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java b/poi/src/main/java/org/apache/poi/ss/formula/TwoDEval.java
index f3c8c974f5..f3c8c974f5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/TwoDEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/TwoDEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java
index c526137554..c526137554 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/UserDefinedFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
index 59bd2a1a80..59bd2a1a80 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookDependentFormula.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
index 8cb4cbf26b..8cb4cbf26b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
index dd6f09bd17..dd6f09bd17 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/WorkbookEvaluatorProvider.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
index 096f6b2ed2..096f6b2ed2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
index 0c3f537dd6..0c3f537dd6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/ArgumentsEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java
index a8419bc51f..a8419bc51f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/DateParser.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/IfError.java
index 9e405e3c23..9e405e3c23 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/IfError.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/IfError.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/MRound.java
index 73f5ab320b..73f5ab320b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/MRound.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/MRound.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
index e01ba84793..e01ba84793 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/NetworkdaysFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java
index b59b4808b5..b59b4808b5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/ParityFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java
index 79f1c0acea..79f1c0acea 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/RandBetween.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
index 666501d540..666501d540 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
index d4eff0261f..d4eff0261f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/WorkdayFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java
index a4f14b5436..a4f14b5436 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFrac.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
index aba00e7f6b..aba00e7f6b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java b/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
index 2d49270d0d..2d49270d0d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/constant/ConstantValueParser.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
index 3d8fb50c84..3d8fb50c84 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/constant/ErrorConstant.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
index c2a5240fcc..c2ce411685 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEval.java
@@ -59,29 +59,26 @@ public interface AreaEval extends TwoDEval, ThreeDEval {
      * returns true if the cell at row and col specified
      * as absolute indexes in the sheet is contained in
      * this area.
-     * @param row 0-based row index
-     * @param col 0-based column index
+     * @param row
+     * @param col
      */
     boolean contains(int row, int col);
 
     /**
      * returns true if the specified col is in range
-     * @param col 0-based column index
+     * @param col
      */
     boolean containsColumn(int col);
 
     /**
      * returns true if the specified row is in range
-     * @param row 0-based row index
+     * @param row
      */
     boolean containsRow(int row);
 
     int getWidth();
     int getHeight();
     /**
-     * @param relativeRowIndex 0-based row index relative to this area
-     * @param relativeColumnIndex 0-based column index relative to this area
-     *
      * @return the ValueEval from within this area at the specified relativeRowIndex and
      * relativeColumnIndex. Never <code>null</code> (possibly {@link BlankEval}). The
      * specified indexes should relative to the top left corner of this area.
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
index 96633318d9..96633318d9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java
index 845e7deaab..845e7deaab 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/BlankEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java
index 49fe3cf2a4..49fe3cf2a4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/BoolEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java
index 5622be8705..5622be8705 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/ConcatEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
index 31d08d05e5..31d08d05e5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/ErrorEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java
index e094df4649..e094df4649 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/EvaluationException.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
index cd813fb96f..cd813fb96f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
index da670439a9..da670439a9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
index 82e0296399..82e0296399 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
index 4063790c73..4063790c73 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
index 70d25040f4..70d25040f4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
index 9d81f8ce36..9d81f8ce36 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedException.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
index 182e53b153..182e53b153 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/NotImplementedFunctionException.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java
index 87d425356b..87d425356b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/NumberEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
index c6dcf1dc27..c6dcf1dc27 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
index 88fe456d5c..59a383c3e1 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/OperandResolver.java
@@ -43,7 +43,7 @@ public final class OperandResolver {
                  "(\\."+Digits+"("+Exp+")?))"+
                  "[\\x00-\\x20]*");
     private static final Pattern fpPattern = Pattern.compile(fpRegex);
-
+    
     private OperandResolver() {
         // no instances of this class
     }
@@ -75,7 +75,7 @@ public final class OperandResolver {
         }
         return result;
     }
-
+    
     /**
      * Retrieves a single value from an area evaluation utilizing the 2D indices of the cell
      * within its own area reference to index the value in the area evaluation.
@@ -105,7 +105,7 @@ public final class OperandResolver {
         else if (ae.isRow() && relativeColIndex < ae.getWidth()) {
             return ae.getRelativeValue(0, relativeColIndex);
         }
-
+        
         return ErrorEval.NA;
     }
 
@@ -212,7 +212,7 @@ public final class OperandResolver {
         }
         return ae.getAbsoluteValue(ae.getFirstRow(), srcCellCol);
     }
-
+    
     private static ValueEval chooseSingleElementFromRef(RefEval ref) {
         return ref.getInnerValueEval( ref.getFirstSheetIndex() );
     }
@@ -251,6 +251,7 @@ public final class OperandResolver {
      * {@link StringEval}, {@link BoolEval} or {@link BlankEval}
      */
     public static double coerceValueToDouble(ValueEval ev) throws EvaluationException {
+
         if (ev == BlankEval.instance) {
             return 0.0;
         }
@@ -265,7 +266,7 @@ public final class OperandResolver {
             if (dd == null) {
                 throw EvaluationException.invalidValue();
             }
-            return dd;
+            return dd.doubleValue();
         }
         throw new RuntimeException("Unexpected arg eval type (" + ev.getClass().getName() + ")");
     }
@@ -273,8 +274,8 @@ public final class OperandResolver {
     /**
      * Converts a string to a double using standard rules that Excel would use.<br>
      * Tolerates leading and trailing spaces, <p>
-     *
-     * Doesn't support currency prefixes, commas, percentage signs or arithmetic operations strings.
+     * 
+     * Doesn't support currency prefixes, commas, percentage signs or arithmetic operations strings.  
      *
      *  Some examples:<br>
      *  " 123 " -&gt; 123.0<br>
@@ -300,7 +301,7 @@ public final class OperandResolver {
         else {
             return null;
         }
-
+        
     }
 
     public static Double parseDateTime(String pText) {
@@ -339,7 +340,7 @@ public final class OperandResolver {
             return null;
         }
         if (ve instanceof BoolEval) {
-            return ((BoolEval) ve).getBooleanValue();
+            return Boolean.valueOf(((BoolEval) ve).getBooleanValue());
         }
 
         if (ve instanceof StringEval) {
@@ -363,7 +364,7 @@ public final class OperandResolver {
             if (Double.isNaN(d)) {
                 throw new EvaluationException(ErrorEval.VALUE_INVALID);
             }
-            return d != 0;
+            return Boolean.valueOf(d != 0);
         }
         if (ve instanceof ErrorEval) {
             throw new EvaluationException((ErrorEval) ve);
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
index d6162e54c0..d6162e54c0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/PercentEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java
index 617d20a765..617d20a765 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/RangeEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java
index 46aa96c04c..46aa96c04c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
index bd96c4eb81..bd96c4eb81 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java
index 99d9b3e841..99d9b3e841 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/RefListEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
index 2a9f2e34a7..2a9f2e34a7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java
index 61515e438f..61515e438f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/StringEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java
index 4e1b712fbc..4e1b712fbc 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/StringValueEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
index 8d15ebea93..8d15ebea93 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
index 8107c48544..8107c48544 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
index 81b36aad40..81b36aad40 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java
index c1309a7df6..c1309a7df6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/ValueEval.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
index 7a25291325..7a25291325 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
index 73fbe00a7a..73fbe00a7a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationSheet.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
index 8ba3aeef75..8ba3aeef75 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
index b85cc15ea9..b85cc15ea9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
index 0be53f555e..0be53f555e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionDataBuilder.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
index fa8ca34aca..fa8ca34aca 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadata.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
index dc83e9c601..dc83e9c601 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataReader.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
index bb01b41163..bb01b41163 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/function/FunctionMetadataRegistry.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Address.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Address.java
index ea5244c1eb..ea5244c1eb 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Address.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Address.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
index 5eb90c3417..5eb90c3417 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/AggregateFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
index 6d06c6375e..6d06c6375e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Areas.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
index 0e842fc5c9..0e842fc5c9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/ArrayFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java
index 1d9916b80c..1d9916b80c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/ArrayMode.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
index c39d082e10..c39d082e10 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/BaseNumberUtils.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java
index 3886e60fb1..88ce9e3f4c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Baseifs.java
@@ -30,7 +30,7 @@ import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate;
 import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
 
 /**
- * Base class for SUMIFS() and COUNTIFS() functions, as they share much of the same logic,
+ * Base class for SUMIFS() and COUNTIFS() functions, as they share much of the same logic, 
  * the difference being the source of the totals.
  */
 /*package*/ abstract class Baseifs implements FreeRefFunction {
@@ -40,11 +40,11 @@ import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
      * @return true if there should be a range argument before the criteria pairs
      */
     protected abstract boolean hasInitialRange();
-
+        
     public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
         final boolean hasInitialRange = hasInitialRange();
         final int firstCriteria = hasInitialRange ? 1 : 0;
-
+        
         if( args.length < (2+firstCriteria) || args.length % 2 != firstCriteria ) {
             return ErrorEval.VALUE_INVALID;
         }
@@ -54,13 +54,13 @@ import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
             if (hasInitialRange) {
                 sumRange = convertRangeArg(args[0]);
             }
-
+            
             // collect pairs of ranges and criteria
             AreaEval[] ae = new AreaEval[(args.length - firstCriteria)/2];
             I_MatchPredicate[] mp = new I_MatchPredicate[ae.length];
             for(int i = firstCriteria, k=0; i < args.length; i += 2, k++){
                 ae[k] = convertRangeArg(args[i]);
-
+                
                 mp[k] = Countif.createCriteriaPredicate(args[i+1], ec.getRowIndex(), ec.getColumnIndex());
             }
 
@@ -84,13 +84,13 @@ import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
     private static void validateCriteriaRanges(AreaEval sumRange, AreaEval[] criteriaRanges) throws EvaluationException {
         int h = criteriaRanges[0].getHeight();
         int w = criteriaRanges[0].getWidth();
-
-        if (sumRange != null
-                && (sumRange.getHeight() != h
+        
+        if (sumRange != null 
+                && (sumRange.getHeight() != h 
                     || sumRange.getWidth() != w) ) {
             throw EvaluationException.invalidValue();
         }
-
+        
         for(AreaEval r : criteriaRanges){
             if(r.getHeight() != h ||
                r.getWidth() != w ) {
@@ -107,7 +107,7 @@ import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
      */
     private static void validateCriteria(I_MatchPredicate[] criteria) throws EvaluationException {
         for(I_MatchPredicate predicate : criteria) {
-
+            
             // check for errors in predicate and return immediately using this error code
             if(predicate instanceof ErrorMatcher) {
                 throw new EvaluationException(ErrorEval.valueOf(((ErrorMatcher)predicate).getValue()));
@@ -154,16 +154,14 @@ import org.apache.poi.ss.formula.functions.Countif.ErrorMatcher;
     /**
      * For counts, this would return 1, for sums it returns a cell value or zero.
      * This is only called after all the criteria are confirmed true for the coordinates.
-     *
      * @param sumRange if used
-     * @param relRowIndex 0-based row index relative to the sumRange area
-     * @param relColIndex 0-based column index relative to the sumRange area
-     *
+     * @param relRowIndex
+     * @param relColIndex
      * @return the aggregate input value corresponding to the given range coordinates
      */
     private static double accumulate(AreaEval sumRange, int relRowIndex, int relColIndex) {
         if (sumRange == null) return 1.0; // count
-
+        
         ValueEval addend = sumRange.getRelativeValue(relRowIndex, relColIndex);
         if (addend instanceof NumberEval) {
             return ((NumberEval)addend).getNumberValue();
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
index 69a01fe69c..69a01fe69c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Bin2Dec.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
index 5177b851a6..5177b851a6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/BooleanFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
index 28af57a2a5..28af57a2a5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/CalendarFieldFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Choose.java
index 127ffd43d7..127ffd43d7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Choose.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Choose.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Code.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java
index f285d58580..f285d58580 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Code.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Code.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Column.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Column.java
index 9c152bb17f..9c152bb17f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Column.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Column.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Columns.java
index 3c1fdc54a2..3c1fdc54a2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Columns.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Columns.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
index b616eba7a7..b616eba7a7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Complex.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Count.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Count.java
index 25c0799054..25c0799054 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Count.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Count.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java
index 5dae60f946..5dae60f946 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/CountUtils.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Counta.java
index c725f012a2..c725f012a2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Counta.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Counta.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java
index af2016f807..af2016f807 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countblank.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
index 94e5594fa0..1f37d2e433 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countif.java
@@ -138,9 +138,11 @@ public final class Countif extends Fixed2ArgFunction {
         }
         @Override
         public String toString() {
-            return getClass().getName() + " [" + _representation + "]";
+            StringBuilder sb = new StringBuilder(64);
+            sb.append(getClass().getName());
+            sb.append(" [").append(_representation).append("]");
+            return sb.toString();
         }
-
         public String getRepresentation() {
             return _representation;
         }
@@ -206,7 +208,7 @@ public final class Countif extends Fixed2ArgFunction {
                     // x is text that is not a number
                     return false;
                 }
-                return _value == val;
+                return _value == val.doubleValue();
             } else if((x instanceof NumberEval)) {
                 NumberEval ne = (NumberEval) x;
                 testValue = ne.getNumberValue();
@@ -302,7 +304,7 @@ public final class Countif extends Fixed2ArgFunction {
             }
             return false;
         }
-
+        
         public int getValue() {
             return _value;
         }
@@ -503,12 +505,12 @@ public final class Countif extends Fixed2ArgFunction {
 
         Boolean booleanVal = parseBoolean(value);
         if(booleanVal != null) {
-            return new BooleanMatcher(booleanVal, operator);
+            return new BooleanMatcher(booleanVal.booleanValue(), operator);
         }
 
         Double doubleVal = OperandResolver.parseDouble(value);
         if(doubleVal != null) {
-            return new NumberMatcher(doubleVal, operator);
+            return new NumberMatcher(doubleVal.doubleValue(), operator);
         }
         ErrorEval ee = parseError(value);
         if (ee != null) {
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java
index 0ac50635aa..0ac50635aa 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Countifs.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DGet.java
index 78b1b9235e..78b1b9235e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DGet.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DGet.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DMax.java
index 4d442f0415..4d442f0415 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DMax.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DMax.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DMin.java
index 61b75768c7..61b75768c7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DMin.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DMin.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
index 295721b4dd..295721b4dd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DStarRunner.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DSum.java
index 26604677de..26604677de 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DSum.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DSum.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java
index 7068bea935..7068bea935 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DateFunc.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
index fa241a7389..fa241a7389 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/DateValue.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Days360.java
index e86b23be89..e86b23be89 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Days360.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Days360.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
index cbac6b2ebf..cbac6b2ebf 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Dec2Bin.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
index 299068d4c1..299068d4c1 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Dec2Hex.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
index 4fd112f4b0..4fd112f4b0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Delta.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/EDate.java
index 3faec3dd84..3faec3dd84 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/EDate.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/EDate.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
index f0c5c4bb5b..f0c5c4bb5b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/EOMonth.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
index 71565fdef0..71565fdef0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Errortype.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Even.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Even.java
index f691265324..f691265324 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Even.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Even.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
index 8c3394854d..8c3394854d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/FactDouble.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Finance.java
index a1b0604ff0..a1b0604ff0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Finance.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Finance.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
index 988007386b..988007386b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/FinanceFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java
index dc4917f5e2..dc4917f5e2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/FinanceLib.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java
index 364a05824c..364a05824c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
index dbb1695ba7..dbb1695ba7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed0ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
index 0b3317d5be..0b3317d5be 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed1ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
index 0ba3d40de8..0ba3d40de8 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed2ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
index 421a398022..421a398022 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed3ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
index e3f8ace412..e3f8ace412 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Fixed4ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
index b7affe2a2f..b7affe2a2f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/FreeRefFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
index 9df832366d..9df832366d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Frequency.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function.java
index 5f97b81a24..5f97b81a24 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java
index 749053ea15..749053ea15 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function0Arg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java
index ec214f4f09..ec214f4f09 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function1Arg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java
index bd395cc51e..bd395cc51e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function2Arg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java
index ad5eee1586..ad5eee1586 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function3Arg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java
index f0eee52241..f0eee52241 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Function4Arg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
index c3b1341d91..c3b1341d91 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hex2Dec.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java
index 5658ec49ec..5658ec49ec 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hlookup.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java
index c69c0b47cb..c69c0b47cb 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Hyperlink.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
index 111964a4c4..111964a4c4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/IDStarAlgorithm.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java
index 35dca8a2f6..35dca8a2f6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/IPMT.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java
index c73e13a1cc..c73e13a1cc 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/IfFunc.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
index c5a6e15a51..c5a6e15a51 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/ImReal.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
index a030107207..a030107207 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Imaginary.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Index.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Index.java
index 2dc6622d05..2dc6622d05 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Index.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Index.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
index ee44b9435d..ee44b9435d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Indirect.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
index 89542e2dab..89542e2dab 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Intercept.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java
index 7430335a0a..7430335a0a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Irr.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Irr.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
index 513daa3a1b..513daa3a1b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/LinearRegressionFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
index 9df2803c3c..9df2803c3c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/LogicalFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java
index 0b20ab36d7..0b20ab36d7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Lookup.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
index 9af09c301b..9af09c301b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/LookupUtils.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Match.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Match.java
index 4a61476657..4a61476657 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Match.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Match.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
index c88923faf6..c88923faf6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/MathX.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
index 4159ddcd98..4159ddcd98 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/MatrixFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
index 247192273c..247192273c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/MinaMaxa.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java
index 764be8ac5b..764be8ac5b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Mirr.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Mode.java
index 978c9cad38..978c9cad38 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Mode.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Mode.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
index 5e3670c784..5e3670c784 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/MultiOperandNumericFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Na.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Na.java
index 3224867704..3224867704 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Na.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Na.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
index 50e6237003..50e6237003 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/NotImplementedFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Now.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Now.java
index e0fcf22fd3..e0fcf22fd3 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Now.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Now.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Npv.java
index 1c19b84c1e..1c19b84c1e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Npv.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Npv.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
index 39adf4c8cd..39adf4c8cd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/NumericFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
index ae34904e02..ae34904e02 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Oct2Dec.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Odd.java
index 6762fcb5f7..6762fcb5f7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Odd.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Odd.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Offset.java
index 75aac0e780..75aac0e780 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Offset.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Offset.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java
index 2df2304db1..2df2304db1 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/PPMT.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
index 9bac12fc3d..9bac12fc3d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Quotient.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rank.java
index 97d0700e15..97d0700e15 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Rank.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rank.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java
index d0a840f6b7..d0a840f6b7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Rate.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rate.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Replace.java
index 5b4eeabef2..5b4eeabef2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Replace.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Replace.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
index 50dc559fab..50dc559fab 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rept.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
index f822990dc3..f822990dc3 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Roman.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java
index 17d7acfdfe..17d7acfdfe 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/RowFunc.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rows.java
index 1e363222ab..1e363222ab 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Rows.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Rows.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Single.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Single.java
index 38e8a20fdc..38e8a20fdc 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Single.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Single.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
index cb8b07aee7..cb8b07aee7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Slope.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java
index 528a14c511..528a14c511 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/StatsLib.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java
index 69d5cf5ec8..69d5cf5ec8 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Substitute.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
index 8d7084be83..8d7084be83 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Subtotal.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java
index ceeff9b1d1..ceeff9b1d1 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumif.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java
index 862930d438..862930d438 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumifs.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java
index f52b10fa8b..aea1fdb8ad 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumproduct.java
@@ -81,13 +81,17 @@ public final class Sumproduct implements Function {
 		} catch (EvaluationException e) {
 			return e.getErrorEval();
 		}
-		throw new RuntimeException("Invalid arg type for SUMPRODUCT: " + firstArg);
+		throw new RuntimeException("Invalid arg type for SUMPRODUCT: ("
+				+ firstArg.getClass().getName() + ")");
 	}
 
 	private static ValueEval evaluateSingleProduct(ValueEval[] evalArgs) throws EvaluationException {
+		int maxN = evalArgs.length;
+
 		double term = 1D;
-		for (ValueEval evalArg : evalArgs) {
-			term *= getScalarValue(evalArg);
+		for(int n=0; n<maxN; n++) {
+			double val = getScalarValue(evalArgs[n]);
+			term *= val;
 		}
 		return new NumberEval(term);
 	}
@@ -176,12 +180,13 @@ public final class Sumproduct implements Function {
 	}
 
 	private static boolean areasAllSameSize(TwoDEval[] args, int height, int width) {
-		for (TwoDEval areaEval : args) {
+		for (int i = 0; i < args.length; i++) {
+			TwoDEval areaEval = args[i];
 			// check that height and width match
-			if (areaEval.getHeight() != height) {
+			if(areaEval.getHeight() != height) {
 				return false;
 			}
-			if (areaEval.getWidth() != width) {
+			if(areaEval.getWidth() != width) {
 				return false;
 			}
 		}
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
index 28887a5bf0..28887a5bf0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumx2my2.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
index cae17d7e35..cae17d7e35 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumx2py2.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
index 1d5effa0cc..1d5effa0cc 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Sumxmy2.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/T.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/T.java
index 28895d0ad2..28895d0ad2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/T.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/T.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java
index f344d57ca5..f344d57ca5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/TextFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java
index 8423919e1a..8423919e1a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/TimeFunc.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Today.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Today.java
index 677d1f0e48..677d1f0e48 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Today.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Today.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Trend.java
index 62eb545670..62eb545670 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Trend.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Trend.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Value.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
index d2a1f24fc7..d2a1f24fc7 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Value.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Value.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
index 1938b79d3b..1938b79d3b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var1or2ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
index cf3f350d6e..cf3f350d6e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var2or3ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
index e701b2d9a2..e701b2d9a2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Var3or4ArgFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java
index a2daa856e4..a2daa856e4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/Vlookup.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
index eec44cc86f..eec44cc86f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekNum.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
index 184866e7c2..184866e7c2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/WeekdayFunc.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java b/poi/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
index da2a0f3127..da2a0f3127 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/functions/XYNumericFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/package-info.java b/poi/src/main/java/org/apache/poi/ss/formula/package-info.java
index 68eb7e42f2..68eb7e42f2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/package-info.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/package-info.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
index bc77d6049b..bc77d6049b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AbstractFunctionPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java
index 13f6b76a86..13f6b76a86 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AddPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
index 456909d59f..456909d59f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area2DPtgBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
index cb3aaa2234..cb3aaa2234 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
index 729fc0e742..729fc0e742 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Area3DPxg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
index 911abbf5bc..911abbf5bc 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaErrPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java
index 3610126628..3610126628 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaI.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
index 0ac7d5e74d..0ac7d5e74d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaNPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
index 2e25703786..2e25703786 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
index 5fbefc365e..5fbefc365e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AreaPtgBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
index f242fb2b39..f242fb2b39 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ArrayInitialPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
index aff4aa3918..aff4aa3918 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ArrayPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
index 99e0ea0c10..99e0ea0c10 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/AttrPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
index a94986f7fe..a94986f7fe 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/BoolPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
index 84777f2091..84777f2091 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ConcatPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
index a206b5dbe9..a206b5dbe9 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ControlPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
index b58b8e5298..b58b8e5298 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Deleted3DPxg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
index 1143dc5e7b..1143dc5e7b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DeletedArea3DPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
index 04908988d1..04908988d1 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DeletedRef3DPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java
index 6a69ff2df6..6a69ff2df6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/DividePtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
index b95a4b4262..b95a4b4262 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/EqualPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
index 6cb5d41803..6cb5d41803 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ErrPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
index 6c125e652c..6c125e652c 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ExpPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
index 2717662d2b..2717662d2b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ExternSheetNameResolver.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
index 9fbcc89690..9fbcc89690 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/FuncPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
index b13381ac22..b13381ac22 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/FuncVarPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
index 386249eb89..386249eb89 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/GreaterEqualPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
index a58e6e2cc6..a58e6e2cc6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/GreaterThanPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java
index 977c8b6bc4..977c8b6bc4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/IntPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
index 963564ad71..963564ad71 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/IntersectionPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
index f66987a3ca..f66987a3ca 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/LessEqualPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
index 5e5731654d..5e5731654d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/LessThanPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
index 18a00eed8b..18a00eed8b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemAreaPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
index 41adefcaff..41adefcaff 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemErrPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
index 548f15f1b4..548f15f1b4 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MemFuncPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
index bb80961b6a..bb80961b6a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MissingArgPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
index 6a785c1a07..6a785c1a07 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/MultiplyPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java
index aee1997509..aee1997509 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NamePtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
index 5ca85df72f..5ca85df72f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NameXPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
index 8ed4c9c43f..8ed4c9c43f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NameXPxg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
index 15313a4a77..15313a4a77 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NotEqualPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
index ed6f15f1ee..ed6f15f1ee 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/NumberPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
index 1f1ab3c761..1f1ab3c761 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/OperandPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
index 111f58b4e6..111f58b4e6 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/OperationPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
index 050924088d..050924088d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ParenthesisPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
index bf7eb0a152..bf7eb0a152 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/PercentPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
index 05883c4c3a..05883c4c3a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/PowerPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
index 3651ab93b2..3651ab93b2 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ptg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java
index fa1c4ff07e..fa1c4ff07e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Pxg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
index 49083fe150..49083fe150 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Pxg3D.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java
index 25b145a3cb..25b145a3cb 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RangePtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
index 911e2583ce..911e2583ce 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref2DPtgBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
index 7096921c43..7096921c43 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
index cebc0dcd6a..cebc0dcd6a 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/Ref3DPxg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
index 06c8489276..06c8489276 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefErrorPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
index c8e2b0a31e..c8e2b0a31e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefNPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java
index 1068bb8fe0..1068bb8fe0 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
index 6c6c9df463..6c6c9df463 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/RefPtgBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
index 310ffb2b1d..310ffb2b1d 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ScalarConstantPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
index 379ae2b72f..379ae2b72f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/StringPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
index d3e1f6e44b..d3e1f6e44b 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/SubtractPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java
index 63a2aa759e..63a2aa759e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/TblPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
index 0deeb7a8ae..0deeb7a8ae 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnaryMinusPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
index f1c1d96abd..f1c1d96abd 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnaryPlusPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
index da3175f56f..da3175f56f 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnionPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
index bd92b9b56e..bd92b9b56e 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/UnknownPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
index 1eff73a826..1eff73a826 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/ValueOperatorPtg.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java b/poi/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java
index e2e6da8b03..e2e6da8b03 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/ptg/package-info.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java b/poi/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
index 593a0ee1b5..593a0ee1b5 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java b/poi/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
index 4234054583..4234054583 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java b/poi/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
index c5af8d5254..c5af8d5254 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
diff --git a/main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java b/poi/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java
index 28614498e8..28614498e8 100644
--- a/main/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java
+++ b/poi/src/main/java/org/apache/poi/ss/formula/udf/UDFFinder.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java
index 2b8c2446c5..2b8c2446c5 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/AutoFilter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java
index 7115883b35..7115883b35 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderExtent.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java
index 985a215409..985a215409 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java
index 9fd5d15cbd..9fd5d15cbd 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/BorderStyle.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java b/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
index c430888178..c430888178 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/BuiltinFormats.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Cell.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java
index 5e3918f3d3..5e3918f3d3 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Cell.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Cell.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
index 726c9bd82b..726c9bd82b 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
index 8aea65ad23..8aea65ad23 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellCopyPolicy.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellRange.java
index 4868dd8e81..4868dd8e81 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellRange.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellRange.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
index 8417887f5f..8417887f5f 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellType.java
index c8e81c9c1a..c8e81c9c1a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CellValue.java
index da8b0cc502..da8b0cc502 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CellValue.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CellValue.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java
index 92a0469e52..92a0469e52 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ChildAnchor.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java
index 77c09c17b0..77c09c17b0 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ClientAnchor.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Color.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Color.java
index 29555a1849..29555a1849 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Color.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Color.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
index 8bdbb07355..8bdbb07355 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ColorScaleFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Comment.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java
index c39040cfe3..c39040cfe3 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Comment.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Comment.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
index 80f70d315a..80f70d315a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ComparisonOperator.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
index 2d532e31fc..2d532e31fc 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterData.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
index 5f68e689d9..5f68e689d9 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionFilterType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
index a5681cd4b9..a5681cd4b9 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
index d7789e14ea..d7789e14ea 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
index 2f19d9e3e5..2f19d9e3e5 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
index 5e534442e0..5e534442e0 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingRule.java.svntmp
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
index c70e3d1d24..c70e3d1d24 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ConditionalFormattingThreshold.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java b/poi/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java
index 004025db10..004025db10 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/CreationHelper.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
index bcdd34a6d2..bcdd34a6d2 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataBarFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
index d40a8d11c5..d40a8d11c5 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataConsolidateFunction.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java
index 3728541ef6..3728541ef6 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormat.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
index 78bbd79b55..78bbd79b55 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java
index c80ed6a744..c80ed6a744 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidation.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
index 38f78e8681..38f78e8681 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidationConstraint.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
index 2e749467e4..2e749467e4 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataValidationHelper.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java
index db9cdd3b69..db9cdd3b69 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Date1904Support.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
index ea95436c06..ea95436c06 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DateUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java b/poi/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
index ce6ad535e6..ce6ad535e6 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DifferentialStyleProvider.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Drawing.java
index 8147ff6635..8147ff6635 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Drawing.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Drawing.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
index 891c63e8d1..891c63e8d1 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelGeneralNumberFormat.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
index ee544f7c9a..ee544f7c9a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelNumberFormat.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
index fcaed994d5..fcaed994d5 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ExcelStyleDateFormatter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
index 616a61709d..616a61709d 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ExtendedColor.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java
index 0612c928cf..0612c928cf 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FillPatternType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Font.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Font.java
index 60b8a91dc2..60b8a91dc2 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Font.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Font.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java
index 24cb65f4e5..24cb65f4e5 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontCharset.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java
index 829246678e..829246678e 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontFamily.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java
index cce523fe29..cce523fe29 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java
index e1b7712309..e1b7712309 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontScheme.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
index a78062b92b..a78062b92b 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FontUnderline.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Footer.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Footer.java
index f982b71e6e..f982b71e6e 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Footer.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Footer.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java
index 996861e75a..996861e75a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FormulaError.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
index 776c022d14..776c022d14 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FormulaEvaluator.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java b/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
index c89838a5da..c89838a5da 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/FractionFormat.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Header.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Header.java
index 22f38a665c..22f38a665c 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Header.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Header.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java
index 41c0e9ea35..41c0e9ea35 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/HeaderFooter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java b/poi/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
index 6b9a313261..6b9a313261 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/HorizontalAlignment.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java
index c067cc002c..c067cc002c 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Hyperlink.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
index d99630996f..d99630996f 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/IconMultiStateFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
index 2843de4de3..2843de4de3 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/IgnoredErrorType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java b/poi/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java
index 19053f1cc1..19053f1cc1 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/IndexedColors.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Name.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Name.java
index 03e13a83d9..03e13a83d9 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Name.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Name.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java
index 3d21b1a8d2..3d21b1a8d2 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ObjectData.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java
index c3faf36b3e..c3faf36b3e 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PageOrder.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java
index abd65f3eaa..abd65f3eaa 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PaperSize.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java
index 0eb0c589c7..0eb0c589c7 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PatternFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Picture.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Picture.java
index ac7d33dd21..ac7d33dd21 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Picture.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Picture.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PictureData.java
index 67d3cefcd1..67d3cefcd1 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PictureData.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PictureData.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java
index ecbea6dafe..ecbea6dafe 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintCellComments.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java
index 8d5716f31e..8d5716f31e 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintOrientation.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java
index bba72c3951..bba72c3951 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/PrintSetup.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java b/poi/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java
index c6b82a6860..c6b82a6860 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/RangeCopier.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java
index 0544cb1542..0544cb1542 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ReadingOrder.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java b/poi/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java
index 551fede973..551fede973 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/RichTextString.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Row.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java
index ff27f4e826..ff27f4e826 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Row.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Row.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Shape.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Shape.java
index f9e3874a75..f9e3874a75 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Shape.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Shape.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java
index d0867b9b07..d0867b9b07 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ShapeContainer.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java b/poi/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java
index 3c5747ee5a..3c5747ee5a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/ShapeTypes.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
index bc93818a5c..bc93818a5c 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Sheet.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java b/poi/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
index 98e2aa7846..98e2aa7846 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/SheetConditionalFormatting.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java b/poi/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java
index 8f8ab9138a..8f8ab9138a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/SheetVisibility.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java b/poi/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java
index fe97c850f3..fe97c850f3 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/SimpleShape.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Table.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java
index ef7fe33797..ef7fe33797 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Table.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Table.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
index b4e5e19835..b4e5e19835 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyle.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
index a24ce05bd1..a24ce05bd1 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleInfo.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
index 870436a3b4..870436a3b4 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/TableStyleType.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java b/poi/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
index f8976d1307..f8976d1307 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/VerticalAlignment.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java b/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
index 156d1b0d7a..156d1b0d7a 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/Workbook.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
index 3e9b887179..3e9b887179 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookFactory.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
index 12b8cc8dee..12b8cc8dee 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/WorkbookProvider.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
index a044932cb8..a044932cb8 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/BaseRowColShifter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
index c6d97f3ff6..c6d97f3ff6 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/ColumnShifter.java
diff --git a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
index 2c4b3fa507..2c4b3fa507 100644
--- a/main/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/helpers/RowShifter.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/AreaReference.java b/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java
index ffe672f7ee..ffe672f7ee 100644
--- a/main/src/main/java/org/apache/poi/ss/util/AreaReference.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/AreaReference.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellAddress.java b/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java
index f9129647d9..f9129647d9 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellAddress.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellAddress.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
index 1a3bc11746..1a3bc11746 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddress.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
index 7ae0eada45..7ae0eada45 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressBase.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java
index c4ac6289b7..c4ac6289b7 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellRangeAddressList.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java
index 3b8b5251d4..3b8b5251d4 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellRangeUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellReference.java b/poi/src/main/java/org/apache/poi/ss/util/CellReference.java
index 6ba8c566de..6ba8c566de 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellReference.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellReference.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/CellUtil.java b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
index 4d5e3e01c7..4d5e3e01c7 100644
--- a/main/src/main/java/org/apache/poi/ss/util/CellUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java b/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java
index 47d1a04623..47d1a04623 100644
--- a/main/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/DateFormatConverter.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/DateParser.java b/poi/src/main/java/org/apache/poi/ss/util/DateParser.java
index a69dae6383..a69dae6383 100644
--- a/main/src/main/java/org/apache/poi/ss/util/DateParser.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/DateParser.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java b/poi/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java
index 40d4066af8..40d4066af8 100644
--- a/main/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/ExpandedDouble.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java b/poi/src/main/java/org/apache/poi/ss/util/IEEEDouble.java
index 91d8fea434..91d8fea434 100644
--- a/main/src/main/java/org/apache/poi/ss/util/IEEEDouble.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/IEEEDouble.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/ImageUtils.java b/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java
index 2b6a013e02..2b6a013e02 100644
--- a/main/src/main/java/org/apache/poi/ss/util/ImageUtils.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/ImageUtils.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java b/poi/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java
index 38594426b2..38594426b2 100644
--- a/main/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/MutableFPNumber.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java b/poi/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java
index 6c945f26b5..6c945f26b5 100644
--- a/main/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/NormalisedDecimal.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/NumberComparer.java b/poi/src/main/java/org/apache/poi/ss/util/NumberComparer.java
index 31be44e834..31be44e834 100644
--- a/main/src/main/java/org/apache/poi/ss/util/NumberComparer.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/NumberComparer.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java b/poi/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java
index 7023063de2..7023063de2 100644
--- a/main/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/NumberToTextConverter.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/PaneInformation.java b/poi/src/main/java/org/apache/poi/ss/util/PaneInformation.java
index dc54b4cf3c..dc54b4cf3c 100644
--- a/main/src/main/java/org/apache/poi/ss/util/PaneInformation.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/PaneInformation.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java b/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
index b19ea9f713..b19ea9f713 100644
--- a/main/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/PropertyTemplate.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/RegionUtil.java b/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java
index 7846d015a8..7846d015a8 100644
--- a/main/src/main/java/org/apache/poi/ss/util/RegionUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/RegionUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/SSCellRange.java b/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java
index 766e2e3564..766e2e3564 100644
--- a/main/src/main/java/org/apache/poi/ss/util/SSCellRange.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/SSCellRange.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java b/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
index 32fdb134a3..32fdb134a3 100644
--- a/main/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/SheetBuilder.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/SheetUtil.java b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
index 06d3aa1f70..06d3aa1f70 100644
--- a/main/src/main/java/org/apache/poi/ss/util/SheetUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/SheetUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java b/poi/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java
index 8475a0d53c..8475a0d53c 100644
--- a/main/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/WorkbookUtil.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
index 9fb4542c7d..9fb4542c7d 100644
--- a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellHandler.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
index d26d7a9864..d26d7a9864 100644
--- a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalk.java
diff --git a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
index f22bd6f584..f22bd6f584 100644
--- a/main/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
+++ b/poi/src/main/java/org/apache/poi/ss/util/cellwalk/CellWalkContext.java
diff --git a/main/src/main/java/org/apache/poi/util/ArrayUtil.java b/poi/src/main/java/org/apache/poi/util/ArrayUtil.java
index 1ebaae0215..1ebaae0215 100644
--- a/main/src/main/java/org/apache/poi/util/ArrayUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/ArrayUtil.java
diff --git a/main/src/main/java/org/apache/poi/util/Beta.java b/poi/src/main/java/org/apache/poi/util/Beta.java
index 0f0d808b77..0f0d808b77 100644
--- a/main/src/main/java/org/apache/poi/util/Beta.java
+++ b/poi/src/main/java/org/apache/poi/util/Beta.java
diff --git a/main/src/main/java/org/apache/poi/util/BitField.java b/poi/src/main/java/org/apache/poi/util/BitField.java
index c9d669d92f..c9d669d92f 100644
--- a/main/src/main/java/org/apache/poi/util/BitField.java
+++ b/poi/src/main/java/org/apache/poi/util/BitField.java
diff --git a/main/src/main/java/org/apache/poi/util/BitFieldFactory.java b/poi/src/main/java/org/apache/poi/util/BitFieldFactory.java
index e35c80cacc..e35c80cacc 100644
--- a/main/src/main/java/org/apache/poi/util/BitFieldFactory.java
+++ b/poi/src/main/java/org/apache/poi/util/BitFieldFactory.java
diff --git a/main/src/main/java/org/apache/poi/util/BoundedInputStream.java b/poi/src/main/java/org/apache/poi/util/BoundedInputStream.java
index df63cbc11b..df63cbc11b 100644
--- a/main/src/main/java/org/apache/poi/util/BoundedInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/BoundedInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/ByteField.java b/poi/src/main/java/org/apache/poi/util/ByteField.java
index ca62277918..ca62277918 100644
--- a/main/src/main/java/org/apache/poi/util/ByteField.java
+++ b/poi/src/main/java/org/apache/poi/util/ByteField.java
diff --git a/main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java b/poi/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java
index 82247b13af..82247b13af 100644
--- a/main/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/CloseIgnoringInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/CodePageUtil.java b/poi/src/main/java/org/apache/poi/util/CodePageUtil.java
index 2c1480253d..2c1480253d 100644
--- a/main/src/main/java/org/apache/poi/util/CodePageUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/CodePageUtil.java
diff --git a/main/src/main/java/org/apache/poi/util/Configurator.java b/poi/src/main/java/org/apache/poi/util/Configurator.java
index b82ad9b8c7..b82ad9b8c7 100644
--- a/main/src/main/java/org/apache/poi/util/Configurator.java
+++ b/poi/src/main/java/org/apache/poi/util/Configurator.java
diff --git a/main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java b/poi/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
index 0252b4b684..0252b4b684 100644
--- a/main/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
+++ b/poi/src/main/java/org/apache/poi/util/DefaultTempFileCreationStrategy.java
diff --git a/main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java b/poi/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java
index 6dd4930b9a..6dd4930b9a 100644
--- a/main/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java
+++ b/poi/src/main/java/org/apache/poi/util/DelayableLittleEndianOutput.java
diff --git a/main/src/main/java/org/apache/poi/util/Dimension2DDouble.java b/poi/src/main/java/org/apache/poi/util/Dimension2DDouble.java
index 227c0cddd5..227c0cddd5 100644
--- a/main/src/main/java/org/apache/poi/util/Dimension2DDouble.java
+++ b/poi/src/main/java/org/apache/poi/util/Dimension2DDouble.java
diff --git a/main/src/main/java/org/apache/poi/util/DocumentFormatException.java b/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java
index e53202235c..e53202235c 100644
--- a/main/src/main/java/org/apache/poi/util/DocumentFormatException.java
+++ b/poi/src/main/java/org/apache/poi/util/DocumentFormatException.java
diff --git a/main/src/main/java/org/apache/poi/util/DrawingDump.java b/poi/src/main/java/org/apache/poi/util/DrawingDump.java
index 72d9580b65..72d9580b65 100644
--- a/main/src/main/java/org/apache/poi/util/DrawingDump.java
+++ b/poi/src/main/java/org/apache/poi/util/DrawingDump.java
diff --git a/main/src/main/java/org/apache/poi/util/FixedField.java b/poi/src/main/java/org/apache/poi/util/FixedField.java
index 45d6c6f714..45d6c6f714 100644
--- a/main/src/main/java/org/apache/poi/util/FixedField.java
+++ b/poi/src/main/java/org/apache/poi/util/FixedField.java
diff --git a/main/src/main/java/org/apache/poi/util/FontMetricsDumper.java b/poi/src/main/java/org/apache/poi/util/FontMetricsDumper.java
index 321f0d5ea9..321f0d5ea9 100644
--- a/main/src/main/java/org/apache/poi/util/FontMetricsDumper.java
+++ b/poi/src/main/java/org/apache/poi/util/FontMetricsDumper.java
diff --git a/main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java b/poi/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
index c46a535a0b..c46a535a0b 100644
--- a/main/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
+++ b/poi/src/main/java/org/apache/poi/util/GenericRecordJsonWriter.java
diff --git a/main/src/main/java/org/apache/poi/util/GenericRecordUtil.java b/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java
index 50a6f3b59a..50a6f3b59a 100644
--- a/main/src/main/java/org/apache/poi/util/GenericRecordUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/GenericRecordUtil.java
diff --git a/main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java b/poi/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
index c5a949cc63..c5a949cc63 100644
--- a/main/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
+++ b/poi/src/main/java/org/apache/poi/util/GenericRecordXmlWriter.java
diff --git a/main/src/main/java/org/apache/poi/util/HexDump.java b/poi/src/main/java/org/apache/poi/util/HexDump.java
index 184c48bd1e..184c48bd1e 100644
--- a/main/src/main/java/org/apache/poi/util/HexDump.java
+++ b/poi/src/main/java/org/apache/poi/util/HexDump.java
diff --git a/main/src/main/java/org/apache/poi/util/HexRead.java b/poi/src/main/java/org/apache/poi/util/HexRead.java
index c6a5fb4f73..c6a5fb4f73 100644
--- a/main/src/main/java/org/apache/poi/util/HexRead.java
+++ b/poi/src/main/java/org/apache/poi/util/HexRead.java
diff --git a/main/src/main/java/org/apache/poi/util/IOUtils.java b/poi/src/main/java/org/apache/poi/util/IOUtils.java
index 974efdf64b..974efdf64b 100644
--- a/main/src/main/java/org/apache/poi/util/IOUtils.java
+++ b/poi/src/main/java/org/apache/poi/util/IOUtils.java
diff --git a/main/src/main/java/org/apache/poi/util/IntList.java b/poi/src/main/java/org/apache/poi/util/IntList.java
index f536e089e9..f536e089e9 100644
--- a/main/src/main/java/org/apache/poi/util/IntList.java
+++ b/poi/src/main/java/org/apache/poi/util/IntList.java
diff --git a/main/src/main/java/org/apache/poi/util/IntMapper.java b/poi/src/main/java/org/apache/poi/util/IntMapper.java
index 86d5b599ae..86d5b599ae 100644
--- a/main/src/main/java/org/apache/poi/util/IntMapper.java
+++ b/poi/src/main/java/org/apache/poi/util/IntMapper.java
diff --git a/main/src/main/java/org/apache/poi/util/IntegerField.java b/poi/src/main/java/org/apache/poi/util/IntegerField.java
index c86a008b77..c86a008b77 100644
--- a/main/src/main/java/org/apache/poi/util/IntegerField.java
+++ b/poi/src/main/java/org/apache/poi/util/IntegerField.java
diff --git a/main/src/main/java/org/apache/poi/util/Internal.java b/poi/src/main/java/org/apache/poi/util/Internal.java
index 565a908d7b..565a908d7b 100644
--- a/main/src/main/java/org/apache/poi/util/Internal.java
+++ b/poi/src/main/java/org/apache/poi/util/Internal.java
diff --git a/main/src/main/java/org/apache/poi/util/LZWDecompresser.java b/poi/src/main/java/org/apache/poi/util/LZWDecompresser.java
index 0ebae8a0ac..0ebae8a0ac 100644
--- a/main/src/main/java/org/apache/poi/util/LZWDecompresser.java
+++ b/poi/src/main/java/org/apache/poi/util/LZWDecompresser.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndian.java b/poi/src/main/java/org/apache/poi/util/LittleEndian.java
index 0ef687298f..0ef687298f 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndian.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndian.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java b/poi/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
index c1bbaabb73..c1bbaabb73 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianByteArrayInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java b/poi/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
index fe9949f1af..fe9949f1af 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianByteArrayOutputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianConsts.java b/poi/src/main/java/org/apache/poi/util/LittleEndianConsts.java
index 9f7e4a21a5..9f7e4a21a5 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianConsts.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianConsts.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianInput.java b/poi/src/main/java/org/apache/poi/util/LittleEndianInput.java
index c140c275d2..c140c275d2 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianInput.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianInput.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java b/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
index a80597a267..a80597a267 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianOutput.java b/poi/src/main/java/org/apache/poi/util/LittleEndianOutput.java
index 708d97bf4a..708d97bf4a 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianOutput.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianOutput.java
diff --git a/main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java b/poi/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java
index 920ff40519..920ff40519 100644
--- a/main/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/LittleEndianOutputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/LocaleID.java b/poi/src/main/java/org/apache/poi/util/LocaleID.java
index 975442b5bc..975442b5bc 100644
--- a/main/src/main/java/org/apache/poi/util/LocaleID.java
+++ b/poi/src/main/java/org/apache/poi/util/LocaleID.java
diff --git a/main/src/main/java/org/apache/poi/util/LocaleUtil.java b/poi/src/main/java/org/apache/poi/util/LocaleUtil.java
index 5e6619645c..5e6619645c 100644
--- a/main/src/main/java/org/apache/poi/util/LocaleUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/LocaleUtil.java
diff --git a/main/src/main/java/org/apache/poi/util/LongField.java b/poi/src/main/java/org/apache/poi/util/LongField.java
index 9aeffb36ea..9aeffb36ea 100644
--- a/main/src/main/java/org/apache/poi/util/LongField.java
+++ b/poi/src/main/java/org/apache/poi/util/LongField.java
diff --git a/main/src/main/java/org/apache/poi/util/NotImplemented.java b/poi/src/main/java/org/apache/poi/util/NotImplemented.java
index e815c5d153..e815c5d153 100644
--- a/main/src/main/java/org/apache/poi/util/NotImplemented.java
+++ b/poi/src/main/java/org/apache/poi/util/NotImplemented.java
diff --git a/main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java b/poi/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
index 6bd7fef86e..6bd7fef86e 100644
--- a/main/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/RLEDecompressingInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/RecordFormatException.java b/poi/src/main/java/org/apache/poi/util/RecordFormatException.java
index 65bea581ee..65bea581ee 100644
--- a/main/src/main/java/org/apache/poi/util/RecordFormatException.java
+++ b/poi/src/main/java/org/apache/poi/util/RecordFormatException.java
diff --git a/main/src/main/java/org/apache/poi/util/Removal.java b/poi/src/main/java/org/apache/poi/util/Removal.java
index 0b618998ef..0b618998ef 100644
--- a/main/src/main/java/org/apache/poi/util/Removal.java
+++ b/poi/src/main/java/org/apache/poi/util/Removal.java
diff --git a/main/src/main/java/org/apache/poi/util/ReplacingInputStream.java b/poi/src/main/java/org/apache/poi/util/ReplacingInputStream.java
index 6b157599fc..6b157599fc 100644
--- a/main/src/main/java/org/apache/poi/util/ReplacingInputStream.java
+++ b/poi/src/main/java/org/apache/poi/util/ReplacingInputStream.java
diff --git a/main/src/main/java/org/apache/poi/util/ShortField.java b/poi/src/main/java/org/apache/poi/util/ShortField.java
index 29d91df7f4..29d91df7f4 100644
--- a/main/src/main/java/org/apache/poi/util/ShortField.java
+++ b/poi/src/main/java/org/apache/poi/util/ShortField.java
diff --git a/main/src/main/java/org/apache/poi/util/StaxHelper.java b/poi/src/main/java/org/apache/poi/util/StaxHelper.java
index 9563666532..9563666532 100644
--- a/main/src/main/java/org/apache/poi/util/StaxHelper.java
+++ b/poi/src/main/java/org/apache/poi/util/StaxHelper.java
diff --git a/main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java b/poi/src/main/java/org/apache/poi/util/StringCodepointsIterable.java
index 5fb83935bb..5fb83935bb 100644
--- a/main/src/main/java/org/apache/poi/util/StringCodepointsIterable.java
+++ b/poi/src/main/java/org/apache/poi/util/StringCodepointsIterable.java
diff --git a/main/src/main/java/org/apache/poi/util/StringUtil.java b/poi/src/main/java/org/apache/poi/util/StringUtil.java
index d281c63386..d281c63386 100644
--- a/main/src/main/java/org/apache/poi/util/StringUtil.java
+++ b/poi/src/main/java/org/apache/poi/util/StringUtil.java
diff --git a/main/src/main/java/org/apache/poi/util/SuppressForbidden.java b/poi/src/main/java/org/apache/poi/util/SuppressForbidden.java
index 1160cc20bd..1160cc20bd 100644
--- a/main/src/main/java/org/apache/poi/util/SuppressForbidden.java
+++ b/poi/src/main/java/org/apache/poi/util/SuppressForbidden.java
diff --git a/main/src/main/java/org/apache/poi/util/TempFile.java b/poi/src/main/java/org/apache/poi/util/TempFile.java
index e0a2eaca2d..e0a2eaca2d 100644
--- a/main/src/main/java/org/apache/poi/util/TempFile.java
+++ b/poi/src/main/java/org/apache/poi/util/TempFile.java
diff --git a/main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java b/poi/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java
index d576f08857..d576f08857 100644
--- a/main/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java
+++ b/poi/src/main/java/org/apache/poi/util/TempFileCreationStrategy.java
diff --git a/main/src/main/java/org/apache/poi/util/Units.java b/poi/src/main/java/org/apache/poi/util/Units.java
index 1aad77db8b..1aad77db8b 100644
--- a/main/src/main/java/org/apache/poi/util/Units.java
+++ b/poi/src/main/java/org/apache/poi/util/Units.java
diff --git a/main/src/main/java/org/apache/poi/util/XMLHelper.java b/poi/src/main/java/org/apache/poi/util/XMLHelper.java
index e27c976d28..e27c976d28 100644
--- a/main/src/main/java/org/apache/poi/util/XMLHelper.java
+++ b/poi/src/main/java/org/apache/poi/util/XMLHelper.java
diff --git a/main/src/main/java/org/apache/poi/util/package-info.java b/poi/src/main/java/org/apache/poi/util/package-info.java
index 268d5b83ee..268d5b83ee 100644
--- a/main/src/main/java/org/apache/poi/util/package-info.java
+++ b/poi/src/main/java/org/apache/poi/util/package-info.java
diff --git a/main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java b/poi/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java
index 28dc89016e..28dc89016e 100644
--- a/main/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java
+++ b/poi/src/main/java/org/apache/poi/wp/usermodel/CharacterRun.java
diff --git a/main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java b/poi/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
index bca6b6658d..bca6b6658d 100644
--- a/main/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
+++ b/poi/src/main/java/org/apache/poi/wp/usermodel/HeaderFooterType.java
diff --git a/main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java b/poi/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java
index be488a2ef8..be488a2ef8 100644
--- a/main/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java
+++ b/poi/src/main/java/org/apache/poi/wp/usermodel/Paragraph.java
diff --git a/poi/src/main/java9/module-info.class b/poi/src/main/java9/module-info.class
new file mode 100644
index 0000000000..65a7086587
--- /dev/null
+++ b/poi/src/main/java9/module-info.class
diff --git a/main/src/main/java9/module-info.java b/poi/src/main/java9/module-info.java
index a94109211a..a94109211a 100644
--- a/main/src/main/java9/module-info.java
+++ b/poi/src/main/java9/module-info.java
diff --git a/main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider b/poi/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
index c93493ce19..c93493ce19 100644
--- a/main/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
+++ b/poi/src/main/resources/META-INF/services/org.apache.poi.extractor.ExtractorProvider
diff --git a/main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer b/poi/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
index a911eb6cb4..a911eb6cb4 100644
--- a/main/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
+++ b/poi/src/main/resources/META-INF/services/org.apache.poi.sl.draw.ImageRenderer
diff --git a/main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider b/poi/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
index fe7fe8c2a7..fe7fe8c2a7 100644
--- a/main/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
+++ b/poi/src/main/resources/META-INF/services/org.apache.poi.ss.usermodel.WorkbookProvider
diff --git a/main/src/main/resources/font_metrics.properties b/poi/src/main/resources/font_metrics.properties
index e521b0c51a..e521b0c51a 100644
--- a/main/src/main/resources/font_metrics.properties
+++ b/poi/src/main/resources/font_metrics.properties
diff --git a/main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml b/poi/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
index f3c3f2ca33..f3c3f2ca33 100644
--- a/main/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
+++ b/poi/src/main/resources/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
diff --git a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
index b56f65e238..b56f65e238 100644
--- a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
+++ b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata-asGenerated.txt
diff --git a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt
index e3c8fc4d74..e3c8fc4d74 100644
--- a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt
+++ b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadata.txt
diff --git a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
index b0cf329429..b0cf329429 100644
--- a/main/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
+++ b/poi/src/main/resources/org/apache/poi/ss/formula/function/functionMetadataCetab.txt
diff --git a/main/src/main/version/Version.java.template b/poi/src/main/version/Version.java.template
index 716ec916bf..716ec916bf 100644
--- a/main/src/main/version/Version.java.template
+++ b/poi/src/main/version/Version.java.template
diff --git a/main/src/test/java/org/apache/poi/POIDataSamples.java b/poi/src/test/java/org/apache/poi/POIDataSamples.java
index d74839e3a7..d74839e3a7 100644
--- a/main/src/test/java/org/apache/poi/POIDataSamples.java
+++ b/poi/src/test/java/org/apache/poi/POIDataSamples.java
diff --git a/main/src/test/java/org/apache/poi/POITestCase.java b/poi/src/test/java/org/apache/poi/POITestCase.java
index dbaae88889..dbaae88889 100644
--- a/main/src/test/java/org/apache/poi/POITestCase.java
+++ b/poi/src/test/java/org/apache/poi/POITestCase.java
diff --git a/main/src/test/java/org/apache/poi/TestJDK12.java b/poi/src/test/java/org/apache/poi/TestJDK12.java
index 53e272233b..53e272233b 100644
--- a/main/src/test/java/org/apache/poi/TestJDK12.java
+++ b/poi/src/test/java/org/apache/poi/TestJDK12.java
diff --git a/main/src/test/java/org/apache/poi/TestPOIDocumentMain.java b/poi/src/test/java/org/apache/poi/TestPOIDocumentMain.java
index c2c44529b8..c2c44529b8 100644
--- a/main/src/test/java/org/apache/poi/TestPOIDocumentMain.java
+++ b/poi/src/test/java/org/apache/poi/TestPOIDocumentMain.java
diff --git a/main/src/test/java/org/apache/poi/TestPOITestCase.java b/poi/src/test/java/org/apache/poi/TestPOITestCase.java
index 862d0d7e46..862d0d7e46 100644
--- a/main/src/test/java/org/apache/poi/TestPOITestCase.java
+++ b/poi/src/test/java/org/apache/poi/TestPOITestCase.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
index 43edb89d0c..43edb89d0c 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherBSERecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
index a081f61c65..a081f61c65 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherBlipRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
index 4957c063d5..4957c063d5 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherBoolProperty.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
index 9f24b6d18d..9f24b6d18d 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherChildAnchorRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
index b931359e54..b931359e54 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherClientAnchorRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
index f9ee5eaca1..f9ee5eaca1 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherClientDataRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
index df13975197..df13975197 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherContainerRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
index ad84a54585..ad84a54585 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherDgRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
index f8f8b58115..f8f8b58115 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherDggRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherDump.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherDump.java
index 088d346bae..088d346bae 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherDump.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherDump.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
index c09dc223c2..c09dc223c2 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherOptRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
index 99f508224f..99f508224f 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherProperty.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
index ec94ba15d4..ec94ba15d4 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherPropertyFactory.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
index 4e18b641d3..4e18b641d3 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherSpRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
index 8aa7aa86d9..8aa7aa86d9 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherSpgrRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
index 1aa96edc5c..1aa96edc5c 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestEscherSplitMenuColorsRecord.java
diff --git a/main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java b/poi/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
index d84f8bccee..d84f8bccee 100644
--- a/main/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
+++ b/poi/src/test/java/org/apache/poi/ddf/TestUnknownEscherRecord.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java b/poi/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
index 1cea118353..1cea118353 100644
--- a/main/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/TestVariantSupport.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java b/poi/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
index 1420e35bab..1420e35bab 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/POIFile.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
index 6d95b38450..6d95b38450 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestBasic.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
index ac50ec591d..ac50ec591d 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestClassID.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
index 9ef1289461..9ef1289461 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestEmptyProperties.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
index 6205713fa3..6205713fa3 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestHPSFBugs.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
index f8fb0aad13..f8fb0aad13 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestMetaDataIPI.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
index 13eb537fe2..13eb537fe2 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestReadAllFiles.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
index 4abf73547f..4abf73547f 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestUnicode.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
index 85ae090206..85ae090206 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestWrite.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/poi/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
index 06cf09cf3f..06cf09cf3f 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/basic/Util.java b/poi/src/test/java/org/apache/poi/hpsf/basic/Util.java
index c6ef7ae6c7..c6ef7ae6c7 100644
--- a/main/src/test/java/org/apache/poi/hpsf/basic/Util.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/basic/Util.java
diff --git a/main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/poi/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
index 85d7d02b89..85d7d02b89 100644
--- a/main/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
+++ b/poi/src/test/java/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java b/poi/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
index 5d80a26d53..5d80a26d53 100644
--- a/main/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
+++ b/poi/src/test/java/org/apache/poi/hssf/HSSFITestDataProvider.java
diff --git a/main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java b/poi/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
index 2fe3359d4d..2fe3359d4d 100644
--- a/main/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
+++ b/poi/src/test/java/org/apache/poi/hssf/HSSFTestDataSamples.java
diff --git a/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java b/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
new file mode 100644
index 0000000000..230635ee70
--- /dev/null
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/BaseTestIteratingXLS.java
@@ -0,0 +1,103 @@
+/* ====================================================================
+   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.hssf.dev;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.hssf.OldExcelFormatException;
+import org.apache.poi.util.RecordFormatException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.function.Executable;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Base class for integration-style tests which iterate over all test-files
+ * and execute the same action to find out if any change breaks these applications.
+ */
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.CONCURRENT)
+public abstract class BaseTestIteratingXLS {
+    private static final String[] XLS_INCLUDES = {
+        "spreadsheet/*.xls", "hpsf/*.xls"
+    };
+
+    public Stream<Arguments> files() {
+        String dataDirName = System.getProperty(POIDataSamples.TEST_PROPERTY, "test-data");
+
+        DirectoryScanner scanner = new DirectoryScanner();
+        scanner.setBasedir(dataDirName);
+        scanner.setIncludes(XLS_INCLUDES);
+        scanner.scan();
+
+        final Map<String, Class<? extends Throwable>> exc = getExcludes();
+        Function<String,Arguments> mapArg = (s) -> {
+            File f = new File(dataDirName, s);
+            return Arguments.of(f, exc.get(f.getName()));
+        };
+
+        return Arrays.stream(scanner.getIncludedFiles()).map(mapArg);
+    }
+
+    protected Map<String,Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = new HashMap<>();
+        // Biff 2 / Excel 2, pre-OLE2
+        excludes.put("testEXCEL_2.xls", OldExcelFormatException.class);
+        // Biff 3 / Excel 3, pre-OLE2
+        excludes.put("testEXCEL_3.xls", OldExcelFormatException.class);
+        // Biff 4 / Excel 4, pre-OLE2
+        excludes.put("testEXCEL_4.xls", OldExcelFormatException.class);
+        // Biff 5 / Excel 5
+        excludes.put("testEXCEL_5.xls", OldExcelFormatException.class);
+        // Biff 5 / Excel 5
+        excludes.put("60284.xls", OldExcelFormatException.class);
+        // Biff 5 / Excel 95
+        excludes.put("testEXCEL_95.xls", OldExcelFormatException.class);
+        excludes.put("46904.xls", OldExcelFormatException.class);
+        excludes.put("59074.xls", OldExcelFormatException.class);
+        excludes.put("61300.xls", RecordFormatException.class);
+        // BIFF 5
+        excludes.put("64130.xls", OldExcelFormatException.class);
+        return excludes;
+    }
+
+    @ParameterizedTest
+    @MethodSource("files")
+	void testMain(File file, Class<? extends Throwable> t) throws Exception {
+        Executable ex = () -> runOneFile(file);
+        if (t == null) {
+            assertDoesNotThrow(ex);
+        } else {
+            assertThrows(t, ex);
+        }
+	}
+
+	abstract void runOneFile(File pFile) throws Exception;
+}
diff --git a/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
new file mode 100644
index 0000000000..0f346f50ee
--- /dev/null
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffDrawingToXml.java
@@ -0,0 +1,50 @@
+/* ====================================================================
+   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.hssf.dev;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Map;
+
+import org.apache.poi.EncryptedDocumentException;
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.util.NullOutputStream;
+
+class TestBiffDrawingToXml extends BaseTestIteratingXLS {
+
+    @Override
+    protected Map<String, Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = super.getExcludes();
+        // unsupported crypto api header
+        excludes.put("35897-type4.xls", EncryptedDocumentException.class);
+        excludes.put("51832.xls", EncryptedDocumentException.class);
+        excludes.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
+        excludes.put("password.xls", EncryptedDocumentException.class);
+        // HSSFWorkbook cannot open it as well
+        excludes.put("43493.xls", RecordInputStream.LeftoverDataException.class);
+        excludes.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
+        return excludes;
+    }
+
+	@Override
+	void runOneFile(File pFile) throws Exception {
+        try (InputStream wb = new FileInputStream(pFile)) {
+            BiffDrawingToXml.writeToFile(new NullOutputStream(), wb, false, new String[0]);
+        }
+	}
+}
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
index 7c6cf1b1f5..0a99128a76 100644
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestBiffViewer.java
@@ -21,39 +21,32 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.util.Map;
 
-import org.apache.poi.hssf.OldExcelFormatException;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.LocaleUtil;
 import org.apache.poi.util.NullOutputStream;
 import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.parallel.Execution;
-import org.junit.jupiter.api.parallel.ExecutionMode;
 
-@Execution(ExecutionMode.CONCURRENT)
 class TestBiffViewer extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", IllegalArgumentException.class); // unsupported crypto api header
-        EXCLUDED.put("51832.xls", IllegalArgumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", RecordFormatException.class);
-        EXCLUDED.put("password.xls", IllegalArgumentException.class);
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordFormatException.class);  // HSSFWorkbook cannot open it as well
+    @Override
+    protected Map<String, Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = super.getExcludes();
+        // unsupported crypto api header
+        excludes.put("35897-type4.xls", IllegalArgumentException.class);
+        excludes.put("51832.xls", IllegalArgumentException.class);
+        excludes.put("xor-encryption-abc.xls", RecordFormatException.class);
+        excludes.put("password.xls", IllegalArgumentException.class);
+        // HSSFWorkbook cannot open it as well
+        excludes.put("43493.xls", RecordFormatException.class);
         // EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("50833.xls", IllegalArgumentException.class);       // "Name is too long" when setting username
-        EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-        EXCLUDED.put("61300.xls", IndexOutOfBoundsException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); //Biff 5
+        // "Name is too long" when setting username
+        excludes.put("50833.xls", IllegalArgumentException.class);
+        // "Buffer overrun"
+        excludes.put("XRefCalc.xls", RuntimeException.class);
+
+        excludes.put("61300.xls", IndexOutOfBoundsException.class);
+        return excludes;
     }
 
     @Override
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
index 56be2c87af..9f072b37b3 100644
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestEFBiffViewer.java
@@ -19,38 +19,27 @@ package org.apache.poi.hssf.dev;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.Map;
 
 import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.util.NullPrintStream;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.api.parallel.Resources;
 
 @ResourceLock(Resources.SYSTEM_OUT)
 class TestEFBiffViewer extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
+    @Override
+    protected Map<String, Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = super.getExcludes();
+        excludes.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
+        excludes.put("51832.xls", EncryptedDocumentException.class);
+        excludes.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
+        excludes.put("password.xls", EncryptedDocumentException.class);
+        excludes.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
+        excludes.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
         // EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-        EXCLUDED.put("61300.xls", RecordFormatException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); //Biff 5
+        return excludes;
     }
 
 	@Override
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
index a0cdaddcd2..df2247b22c 100644
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestFormulaViewer.java
@@ -20,37 +20,26 @@ import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.File;
 import java.io.PrintStream;
+import java.util.Map;
 
 import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.hssf.OldExcelFormatException;
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.util.NullPrintStream;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.api.parallel.Resources;
 
 @ResourceLock(Resources.SYSTEM_OUT)
 class TestFormulaViewer extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("61300.xls", RecordFormatException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); //Biff 5
+    @Override
+    protected Map<String, Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = super.getExcludes();
+        excludes.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
+        excludes.put("51832.xls", EncryptedDocumentException.class);
+        excludes.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
+        excludes.put("password.xls", EncryptedDocumentException.class);
+        excludes.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
+        excludes.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
+        return excludes;
     }
 
     @Override
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
index 868561df21..1d890ef4a6 100644
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestReSave.java
@@ -20,14 +20,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.PrintStream;
+import java.util.Map;
 
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.POIDataSamples;
-import org.apache.poi.hssf.OldExcelFormatException;
 import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.util.NullPrintStream;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Isolated;
@@ -37,26 +35,20 @@ import org.junit.jupiter.api.parallel.Resources;
 @Isolated("Modifies the test data directory")
 @ResourceLock(Resources.SYSTEM_OUT)
 class TestReSave extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("35897-type4.xls", EncryptedDocumentException.class); // unsupported crypto api header
-        EXCLUDED.put("51832.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("password.xls", EncryptedDocumentException.class);
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("43493.xls", RecordInputStream.LeftoverDataException.class);  // HSSFWorkbook cannot open it as well
-        EXCLUDED.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
-        EXCLUDED.put("XRefCalc.xls", RuntimeException.class);            // "Buffer overrun"
-        EXCLUDED.put("61300.xls", RecordFormatException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); //Biff 5
+    @Override
+    protected Map<String, Class<? extends Throwable>> getExcludes() {
+        Map<String, Class<? extends Throwable>> excludes = super.getExcludes();
+        // unsupported crypto api header
+        excludes.put("35897-type4.xls", EncryptedDocumentException.class);
+        excludes.put("51832.xls", EncryptedDocumentException.class);
+        excludes.put("xor-encryption-abc.xls", EncryptedDocumentException.class);
+        excludes.put("password.xls", EncryptedDocumentException.class);
+        // HSSFWorkbook cannot open it as well
+        excludes.put("43493.xls", RecordInputStream.LeftoverDataException.class);
+        excludes.put("44958_1.xls", RecordInputStream.LeftoverDataException.class);
+        // "Buffer overrun"
+        excludes.put("XRefCalc.xls", RuntimeException.class);
+        return excludes;
     }
 
 	@Override
diff --git a/main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java b/poi/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
index 9eb6ebc255..6087dab647 100644
--- a/main/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
+++ b/poi/src/test/java/org/apache/poi/hssf/dev/TestRecordLister.java
@@ -20,30 +20,12 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 
-import org.apache.poi.hssf.OldExcelFormatException;
 import org.apache.poi.util.NullPrintStream;
-import org.apache.poi.util.RecordFormatException;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.api.parallel.Resources;
 
 @ResourceLock(Resources.SYSTEM_OUT)
 class TestRecordLister extends BaseTestIteratingXLS {
-    @BeforeAll
-    public static void setup() {
-        EXCLUDED.clear();
-        EXCLUDED.put("46904.xls", OldExcelFormatException.class);
-        EXCLUDED.put("59074.xls", OldExcelFormatException.class);
-        EXCLUDED.put("testEXCEL_2.xls", OldExcelFormatException.class);  // Biff 2 / Excel 2, pre-OLE2
-        EXCLUDED.put("testEXCEL_3.xls", OldExcelFormatException.class);  // Biff 3 / Excel 3, pre-OLE2
-        EXCLUDED.put("testEXCEL_4.xls", OldExcelFormatException.class);  // Biff 4 / Excel 4, pre-OLE2
-        EXCLUDED.put("testEXCEL_5.xls", OldExcelFormatException.class);  // Biff 5 / Excel 5
-        EXCLUDED.put("60284.xls", OldExcelFormatException.class); // Biff 5 / Excel 5
-        EXCLUDED.put("testEXCEL_95.xls", OldExcelFormatException.class); // Biff 5 / Excel 95
-        EXCLUDED.put("61300.xls", RecordFormatException.class);
-        EXCLUDED.put("64130.xls", OldExcelFormatException.class); //Biff 5
-    }
-
 	@Override
 	void runOneFile(File fileIn) throws IOException {
 		PrintStream save = System.out;
diff --git a/main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/poi/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
index 058e1eda09..058e1eda09 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
diff --git a/main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java b/poi/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
index 8bb1b6771c..8bb1b6771c 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventmodel/TestEventRecordFactory.java
diff --git a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
index fcd9d81dbc..fcd9d81dbc 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
diff --git a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
index 74ac31845d..74ac31845d 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
diff --git a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
index 24fba3e492..24fba3e492 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
diff --git a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
index 852f07e9de..852f07e9de 100644
--- a/main/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
+++ b/poi/src/test/java/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
diff --git a/main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/poi/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
index 7a5ceef5f1..7a5ceef5f1 100644
--- a/main/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/extractor/TestExcelExtractor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/poi/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
index 3fb037c93e..3fb037c93e 100644
--- a/main/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
index 18138de8ed..18138de8ed 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
index 7dfcd66940..7dfcd66940 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingManager2.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
index 22cd1ee11c..22cd1ee11c 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestDrawingShapes.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/poi/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
index efd3f5feff..efd3f5feff 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestEscherRecordFactory.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
index 0e8964daee..0e8964daee 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParser.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
index 8b41f96879..8b41f96879 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParserEval.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
index f9c06bbedb..f9c06bbedb 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestFormulaParserIf.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java b/poi/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
index 4ea06a42f4..4ea06a42f4 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestHSSFAnchor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java b/poi/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
index 32e3736d0c..32e3736d0c 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestLinkTable.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java b/poi/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
index f36ee053a8..f36ee053a8 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestOperandClassTransformer.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestRVA.java b/poi/src/test/java/org/apache/poi/hssf/model/TestRVA.java
index 488a9e6fc5..488a9e6fc5 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestRVA.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestRVA.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java b/poi/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
index fde901216b..fde901216b 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestRowBlocksReader.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestSheet.java b/poi/src/test/java/org/apache/poi/hssf/model/TestSheet.java
index aef0c5e40b..aef0c5e40b 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestSheet.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestSheet.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java b/poi/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
index c58dd39849..c58dd39849 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestSheetAdditional.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java b/poi/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
index ba63dc70b7..ba63dc70b7 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java b/poi/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java
index bc610c42e8..bc610c42e8 100644
--- a/main/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java
+++ b/poi/src/test/java/org/apache/poi/hssf/model/TestWorkbookRecordList.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
index 8433fb4cb1..8433fb4cb1 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestArrayRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
index 9c855f8b3e..9c855f8b3e 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestAutoFilterInfoRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
index bbf5bf3549..bbf5bf3549 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestBOFRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
index 700f415f07..700f415f07 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestBoolErrRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
index 3ee14a90ba..3ee14a90ba 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestBoundSheetRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
index 0a43dbfdb6..0a43dbfdb6 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestCFHeaderRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
index 81689f140c..81689f140c 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestCFRuleRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
index 6d472b9c2b..6d472b9c2b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestColumnInfoRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
index 5fccfd0975..5fccfd0975 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestCommonObjectDataSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
index c6ea64d6b6..c6ea64d6b6 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestDConRefRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
index 00b25ac225..00b25ac225 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestDVALRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
index e7c97e86ec..e7c97e86ec 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestDrawingGroupRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
index bac766e08a..bac766e08a 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestDrawingRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
index 0f936fd405..0f936fd405 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestEmbeddedObjectRefSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
index 0a69b6554f..0a69b6554f 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestEndSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
index 3578a8d99b..3578a8d99b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestEscherAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
index 6b0933cc31..6b0933cc31 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestExtSSTRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
index f4d191d69f..f4d191d69f 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestExtendedFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
index 41372882c6..41372882c6 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestExternalNameRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
index c6a9cd9581..c6a9cd9581 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestFeatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
index 2dbaeb4818..2dbaeb4818 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestFontRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
index 623588ffee..623588ffee 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestFormulaRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
index 2804fe3d71..2804fe3d71 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestFtCblsSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
index a372d11685..a372d11685 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestHyperlinkRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
index 169efaf2ad..169efaf2ad 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
index 84946bd6b2..84946bd6b2 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestLabelRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
index afd988fb37..afd988fb37 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
index 7e9e1da0d0..7e9e1da0d0 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestMergeCellsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
index 9884379747..9884379747 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestNameCommentRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
index 12da160752..12da160752 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestNameRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
index b59541da10..b59541da10 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestNoteRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
index 9aa690b79f..9aa690b79f 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestNoteStructureSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
index f797358de9..f797358de9 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestObjRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
index 55fc393bde..55fc393bde 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestPLVRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
index ac97d99d4e..ac97d99d4e 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestPaletteRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
index c20209cf5b..c20209cf5b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestPaneRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
index 670e2fe70c..670e2fe70c 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestRecalcIdRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
index 11f66367e1..11f66367e1 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordFactory.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
index 9c7d6be428..9c7d6be428 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordFactoryInputStream.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
index 0956350283..0956350283 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestRecordInputStream.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
index 92e5abff02..92e5abff02 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSCLRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
index 7bde03cb06..7bde03cb06 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTDeserializer.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
index b2206b86b7..b2206b86b7 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
index db0593f344..db0593f344 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
index 17855c08de..17855c08de 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
index 18d345213e..18d345213e 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestStringRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
index ed47560caf..ed47560caf 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestStyleRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
index b10800d5a3..b10800d5a3 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSubRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
index 1766c514dd..1766c514dd 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestSupBookRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
index 58cd682df2..58cd682df2 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestTableRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
index 6af2622dcb..6af2622dcb 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestTextObjectBaseRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
index 272b1802e1..272b1802e1 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestTextObjectRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
index 773b8666c1..773b8666c1 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestUnicodeNameRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
index 364e478932..364e478932 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestWriteAccessRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java b/poi/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
index 93c62912a9..93c62912a9 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/TestcaseRecordInputStream.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
index b400b76c24..b400b76c24 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
index 6fae73f041..6fae73f041 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
index 8bfc6576c2..8bfc6576c2 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
index 243e1adc2e..243e1adc2e 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
index 41ad8fbcb5..41ad8fbcb5 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
index 31b4f92548..31b4f92548 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestSharedValueManager.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
index 38018f3627..38018f3627 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java b/poi/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
index cb0a6a548b..cb0a6a548b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/cf/TestCellRange.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
index c0cb666800..c0cb666800 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
index 638b32635c..638b32635c 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAreaRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
index 7e1a07f651..7e1a07f651 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
index 06c03ee0ca..06c03ee0ca 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
index 0c77fbcf2d..0c77fbcf2d 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
index 70b504c6ac..70b504c6ac 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
index 4a494d2f8b..4a494d2f8b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
index 975f6c998f..975f6c998f 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestBarRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
index 87f020479b..87f020479b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
index 1341bce4b8..1341bce4b8 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
index a2eaa8fa43..a2eaa8fa43 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index e719910ddf..e719910ddf 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
index 8511d1cdf5..8511d1cdf5 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
index a146408400..a146408400 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
index 6ebf3a6191..6ebf3a6191 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
index 5042e5663d..5042e5663d 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
index ca92378c8c..ca92378c8c 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
index ca8ec3ca9b..ca8ec3ca9b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestFrameRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
index d5c995fd5b..d5c995fd5b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLegendRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
index 89fd5e48e4..89fd5e48e4 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
index b21fd2d71d..b21fd2d71d 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
index 12c7cc7342..12c7cc7342 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
index cd0b87bbc8..cd0b87bbc8 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
index 2c9d42a8dc..2c9d42a8dc 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
index 30435c76b7..30435c76b7 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
index 1c6e886c90..1c6e886c90 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
index b4bad1d191..b4bad1d191 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
index f20184d3ba..f20184d3ba 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
index b75c579147..b75c579147 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
index 8aac948d0c..8aac948d0c 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
index 6e56904996..6e56904996 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
index 21f03302c6..21f03302c6 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
index 7628d9ce4f..7628d9ce4f 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestTextRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
index dc1a0405bd..dc1a0405bd 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestTickRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
index 8d1294fa9b..8d1294fa9b 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
index 0dc470d417..0dc470d417 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java b/poi/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
index 45151b90ff..45151b90ff 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/common/TestUnicodeString.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
index 3cfe1dc277..3cfe1dc277 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestExtendedPivotTableViewFieldsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
index ff6ac5d019..ff6ac5d019 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestPageItemRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
index ee05e1a4f4..ee05e1a4f4 100644
--- a/main/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
+++ b/poi/src/test/java/org/apache/poi/hssf/record/pivot/TestViewFieldsRecord.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
index c44b3c0c7b..c44b3c0c7b 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/FormulaExtractor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
index 96196c146e..96196c146e 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/HSSFEvaluationTestHelper.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
index 20a55c32ab..20a55c32ab 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/HSSFTestHelper.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
index 22d0676d51..22d0676d51 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/SanityChecker.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
index d467333ffc..d467333ffc 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/StreamUtility.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
index 8a3008cb45..8a3008cb45 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBug42464.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
index b30f9f71ec..b30f9f71ec 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestBugs.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
index d80f000368..d80f000368 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCellStyle.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
index cb3d92d113..cb3d92d113 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCloneSheet.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
index 0f7d5788fe..0f7d5788fe 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestCryptoAPI.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
index 4a120b2ac6..4a120b2ac6 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestDataValidation.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
index 1617bd65ad..1617bd65ad 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEmbeddedObjects.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
index 3ddac1b794..3ddac1b794 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
index e6aaf092b6..e6aaf092b6 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestEscherGraphics2d.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
index 2d8ff7e834..2d8ff7e834 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestExternalReferenceChange.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
index 7341a43b1f..7341a43b1f 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFontDetails.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
index 0ddc016d29..0ddc016d29 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
index ef8cd2538a..ef8cd2538a 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorDocs.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
index 836ed32bae..836ed32bae 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestFormulas.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index 57f0fbc19d..57f0fbc19d 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFCell.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
index a6555e3f6c..a6555e3f6c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFChart.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
index 1cc79736c1..1cc79736c1 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFClientAnchor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
index 66a5c308df..66a5c308df 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFColumnShifting.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
index 181cd5052b..181cd5052b 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFComment.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
index b6a472ad38..b6a472ad38 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFConditionalFormatting.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
index 98195b11d5..98195b11d5 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormat.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
index 4e2843ad22..4e2843ad22 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDataFormatter.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
index 2949dbeeee..2949dbeeee 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
index dfc64df1bb..dfc64df1bb 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFEvaluationSheet.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
index 552e028aff..552e028aff 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFExternalFunctions.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
index e4859923ff..e4859923ff 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFont.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
index afe96936fd..afe96936fd 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
index a104bba25f..a104bba25f 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHeaderFooter.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
index 67cb04010d..67cb04010d 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
index e3e6cea444..e3e6cea444 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFName.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
index 95364a33c2..95364a33c2 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFOptimiser.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
index 1f6460e920..1f6460e920 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPalette.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
index 64b91fc516..64b91fc516 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPatriarch.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
index b2a793f972..b2a793f972 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPicture.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
index dd1de44da9..dd1de44da9 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
index 4b17b77a8e..4b17b77a8e 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRangeCopier.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
index 44ae5b4fcf..44ae5b4fcf 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRichTextString.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
index b588f1375c..b588f1375c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFRow.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index b6c9c918d2..b6c9c918d2 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
index 340211560d..340211560d 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetAutosizeColumn.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
index 9333ac516a..9333ac516a 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftColumns.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
index d78c3bf660..d78c3bf660 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetShiftRows.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
index 33f6607988..33f6607988 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
index 5d08d77e4c..5d08d77e4c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFTextbox.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
index ac4f32cb0e..ac4f32cb0e 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
index d56c3d6134..d56c3d6134 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestMatrixFormulasFromBinarySpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
index 6f8bc8dfbb..6f8bc8dfbb 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestNonStandardWorkbookStreamNames.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
index 1183c5f6b5..1183c5f6b5 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestOLE2Embeding.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
index 6d62955f0c..6d62955f0c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPOIFSProperties.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
index 341be15819..341be15819 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPatriarch.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
index 759e790a6f..759e790a6f 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestPolygon.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
index f1e9f0ef1f..f1e9f0ef1f 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestReadWriteChart.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
index 5bde759a5c..5bde759a5c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestRowStyle.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
index 428fb3030e..428fb3030e 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestSanityChecker.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
index b02fa4fc7a..b02fa4fc7a 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestShapeGroup.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
index 2bda96ce2c..2bda96ce2c 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestSheetHiding.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
index a7065cda2e..a7065cda2e 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestText.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
index 76701fd1dd..76701fd1dd 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnfixedBugs.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
index 1ced954a27..1ced954a27 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestUnicodeWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
index e3ca2f4247..e3ca2f4247 100644
--- a/main/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/hssf/usermodel/TestWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java b/poi/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
index 1fe92ec022..1fe92ec022 100644
--- a/main/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
+++ b/poi/src/test/java/org/apache/poi/hssf/util/TestAreaReference.java
diff --git a/main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java b/poi/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
index f761e251dd..f761e251dd 100644
--- a/main/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
+++ b/poi/src/test/java/org/apache/poi/hssf/util/TestCellReference.java
diff --git a/main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java b/poi/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
index ff3ec06277..ff3ec06277 100644
--- a/main/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
+++ b/poi/src/test/java/org/apache/poi/hssf/util/TestHSSFColor.java
diff --git a/main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java b/poi/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
index 15190f93ab..15190f93ab 100644
--- a/main/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
+++ b/poi/src/test/java/org/apache/poi/hssf/util/TestRKUtil.java
diff --git a/main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java b/poi/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
index 959565cfeb..959565cfeb 100644
--- a/main/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
+++ b/poi/src/test/java/org/apache/poi/poifs/crypt/TestBiff8DecryptingStream.java
diff --git a/main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java b/poi/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
index 22452a0efd..22452a0efd 100644
--- a/main/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
+++ b/poi/src/test/java/org/apache/poi/poifs/crypt/TestCipherAlgorithm.java
diff --git a/main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java b/poi/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java
index 2bca550236..2bca550236 100644
--- a/main/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java
+++ b/poi/src/test/java/org/apache/poi/poifs/crypt/TestXorEncryption.java
diff --git a/main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java b/poi/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
index 42a607c130..42a607c130 100644
--- a/main/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
+++ b/poi/src/test/java/org/apache/poi/poifs/crypt/binaryrc4/TestBinaryRC4.java
diff --git a/main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java b/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
index 1fa1802bea..1fa1802bea 100644
--- a/main/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
+++ b/poi/src/test/java/org/apache/poi/poifs/dev/TestPOIFSDump.java
diff --git a/main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java b/poi/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
index 4b597c1719..4b597c1719 100644
--- a/main/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
+++ b/poi/src/test/java/org/apache/poi/poifs/eventfilesystem/Listener.java
diff --git a/main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/poi/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
index 1eb939f961..1eb939f961 100644
--- a/main/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
+++ b/poi/src/test/java/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
index ed2ce941ab..ed2ce941ab 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/ReaderWriter.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
index f818d21978..f818d21978 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/SlowInputStream.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
index 9212aa6c8f..9212aa6c8f 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDirectoryNode.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
index 15edc14e92..15edc14e92 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocument.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
index 17c1b572d5..17c1b572d5 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentDescriptor.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
index c0d4de1353..c0d4de1353 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentInputStream.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
index d2815e0254..d2815e0254 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestDocumentOutputStream.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
index c594fb513d..c594fb513d 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
index b85550cc15..b85550cc15 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestEntryUtils.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java
index 456ca076ac..456ca076ac 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileMagic.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
index ef504aca69..ef504aca69 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
index aa9c8883af..aa9c8883af 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
index 42d6534dc6..42d6534dc6 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestNotOLE2Exception.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
index 8e4dd48298..8e4dd48298 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOfficeXMLException.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
index 6becf23aa1..6becf23aa1 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestOle10Native.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
index 94d8e73e9c..94d8e73e9c 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSDocumentPath.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
index c644fb1c60..c644fb1c60 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
index fcc1e4bcf1..fcc1e4bcf1 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSMiniStore.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
index 2a2a8122d1..2a2a8122d1 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPOIFSStream.java
diff --git a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
index 29ed3001f0..29ed3001f0 100644
--- a/main/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
+++ b/poi/src/test/java/org/apache/poi/poifs/filesystem/TestPropertySorter.java
diff --git a/main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/poi/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java
index 57e9ed814e..57e9ed814e 100644
--- a/main/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java
+++ b/poi/src/test/java/org/apache/poi/poifs/macros/TestVBAMacroReader.java
diff --git a/main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java b/poi/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
index 3845ce75fe..3845ce75fe 100644
--- a/main/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
+++ b/poi/src/test/java/org/apache/poi/poifs/nio/TestDataSource.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java b/poi/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
index f578129b68..f578129b68 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/LocalProperty.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java b/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
index 49b6553012..49b6553012 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/TestDirectoryProperty.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java b/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
index 17145cd9db..17145cd9db 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/TestDocumentProperty.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java b/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
index 6d67310ff6..6d67310ff6 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyFactory.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java b/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
index e6ce6610f5..e6ce6610f5 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/TestPropertyTable.java
diff --git a/main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java b/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
index 4b311a8ec8..4b311a8ec8 100644
--- a/main/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
+++ b/poi/src/test/java/org/apache/poi/poifs/property/TestRootProperty.java
diff --git a/main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java b/poi/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
index 13a1c52306..13a1c52306 100644
--- a/main/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
+++ b/poi/src/test/java/org/apache/poi/poifs/storage/LocalProperty.java
diff --git a/main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java b/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
index b04741fb06..b04741fb06 100644
--- a/main/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
+++ b/poi/src/test/java/org/apache/poi/poifs/storage/RawDataUtil.java
diff --git a/main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java b/poi/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
index 8190b151b6..8190b151b6 100644
--- a/main/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
+++ b/poi/src/test/java/org/apache/poi/poifs/storage/TestBATBlock.java
diff --git a/main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java b/poi/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
index bb08ae3965..bb08ae3965 100644
--- a/main/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
+++ b/poi/src/test/java/org/apache/poi/poifs/storage/TestHeaderBlockReading.java
diff --git a/main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java b/poi/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java
index a99041c852..a99041c852 100644
--- a/main/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java
+++ b/poi/src/test/java/org/apache/poi/sl/draw/geom/TestFormulaParser.java
diff --git a/main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java b/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
index 28849f77e9..28849f77e9 100644
--- a/main/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
+++ b/poi/src/test/java/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
diff --git a/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java b/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
index 81f5931f34..81f5931f34 100644
--- a/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
+++ b/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShow.java
diff --git a/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java b/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
index 090aeb0aa8..090aeb0aa8 100644
--- a/main/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
+++ b/poi/src/test/java/org/apache/poi/sl/usermodel/BaseTestSlideShowFactory.java
diff --git a/main/src/test/java/org/apache/poi/ss/ITestDataProvider.java b/poi/src/test/java/org/apache/poi/ss/ITestDataProvider.java
index e258e1a4a2..e258e1a4a2 100644
--- a/main/src/test/java/org/apache/poi/ss/ITestDataProvider.java
+++ b/poi/src/test/java/org/apache/poi/ss/ITestDataProvider.java
diff --git a/main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java b/poi/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
index 4da0ab5b05..4da0ab5b05 100644
--- a/main/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
+++ b/poi/src/test/java/org/apache/poi/ss/TestSpreadsheetVersion.java
diff --git a/main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
index 3c0476a9c3..3c0476a9c3 100644
--- a/main/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
+++ b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormat.java
diff --git a/main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
index bf4cafc714..bf4cafc714 100644
--- a/main/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
+++ b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormatCondition.java
diff --git a/main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java
index 7f19b7dcb6..7f19b7dcb6 100644
--- a/main/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java
+++ b/poi/src/test/java/org/apache/poi/ss/format/TestCellFormatResult.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/poi/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
index 4e6bb88d4a..4e6bb88d4a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/BaseTestExternalFunctions.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java b/poi/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
index 2e05261cf3..2e05261cf3 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/BaseTestMissingWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java b/poi/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
index 3524c3f7d0..3524c3f7d0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/EvaluationListener.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java b/poi/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
index 507cbc854c..507cbc854c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/SheetRangeAndWorkbookIndexFormatterTest.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java b/poi/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
index 11b08fade6..11b08fade6 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestCellCacheEntry.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java b/poi/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
index 5f7c6a76d2..5f7c6a76d2 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestEvaluationCache.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java b/poi/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
index 37e2131ee0..37e2131ee0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestFormulaShifter.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java b/poi/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
index 5bb859ce34..5bb859ce34 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestFunctionRegistry.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java b/poi/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
index dc05d792f4..dc05d792f4 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestPlainCellCache.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java b/poi/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
index 484e5597cb..484e5597cb 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestSheetNameFormatter.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
index 39eafbe65f..39eafbe65f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java b/poi/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
index 673cb9500c..673cb9500c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/WorkbookEvaluatorTestHelper.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
index 8214390798..8214390798 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestIfError.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
index 2e99276f7f..2e99276f7f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestMRound.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
index 7ee0476b3c..7ee0476b3c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
index 9af99fb0ee..9af99fb0ee 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestPercentile.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
index 83d54ef446..83d54ef446 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestRandBetween.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
index 598b3119b7..598b3119b7 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
index e2e73bad04..e2e73bad04 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
index 57875af9cd..57875af9cd 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculator.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
index 1ac4f2576b..1ac4f2576b 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java b/poi/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
index 0f9c0ee60a..0f9c0ee60a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
index 74de1ca32c..74de1ca32c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
index 4a15444773..4a15444773 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/EvalInstances.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
index 40b9a09715..40b9a09715 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestAreaEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
index 3155ba5b37..3155ba5b37 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestDivideEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
index 8d8e29f2f0..8d8e29f2f0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestEqualEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
index e4eba2c296..e4eba2c296 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestExternalFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
index b82532592d..b82532592d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulaBugs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
index 80ddc6d988..80ddc6d988 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
index 90d9739efb..90d9739efb 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestHSSFCircularReferences.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
index f5a73d186d..f5a73d186d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMinusZeroResult.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
index a89db5837f..a89db5837f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMissingArgEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
index 68e634f1cd..68e634f1cd 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
index f37b818142..f37b818142 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestOperandResolver.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
index 3727cc1c71..3727cc1c71 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestPercentEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java
index 78b0d49ac8..78b0d49ac8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestPowerEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
index f67d8a92ff..f67d8a92ff 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestRangeEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
index febecbe359..febecbe359 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java b/poi/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
index 5c3dcb9875..5c3dcb9875 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/eval/forked/BaseTestForkedEvaluator.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java b/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
index db87e07377..db87e07377 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelCetabFunctionExtractor.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
index c408dd527b..c408dd527b 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java b/poi/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
index 29853a410d..29853a410d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/function/TestFunctionMetadataRegistry.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java b/poi/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
index c95eae8871..c95eae8871 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java b/poi/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
index c26220dbd8..c26220dbd8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/function/TestReadMissingBuiltInFuncs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
index a39599c526..a39599c526 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
index d5e02e0de8..d5e02e0de8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/BaseTestNumeric.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
index 345b4fb80c..345b4fb80c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/EvalFactory.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
index bf49dad45d..bf49dad45d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/NumericFunctionInvoker.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
index 05cfdfc8a2..05cfdfc8a2 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/RefEvalImplementation.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
index 766ccc303e..766ccc303e 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAddress.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java
index 3137614d3a..3137614d3a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAreas.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
index bfee8f6ad6..bfee8f6ad6 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestAverage.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java
index e873ba227c..e873ba227c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBin2Dec.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
index bb9a238eaa..bb9a238eaa 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestBooleanFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
index b59eb221a4..b59eb221a4 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
index 1ab4f90ea0..1ab4f90ea0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestClean.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
index 32dd466ba8..32dd466ba8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCode.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
index 213aeca067..213aeca067 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCodeFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
index 018e2222f3..018e2222f3 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplex.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
index 3318832fc1..3318832fc1 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestComplexFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
index 6b351fbe0d..6b351fbe0d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestCountFuncs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
index 393334c5da..393334c5da 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDGetFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
index f7d20532c6..f7d20532c6 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDStarFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
index 82d0e82742..82d0e82742 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDate.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
index 4f0e9ee7ba..4f0e9ee7ba 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateTimeToNumberFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java
index fe487b6815..fe487b6815 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDateValue.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
index b796a4d5b9..b796a4d5b9 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays360.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java
index d745603a5a..d745603a5a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Bin.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
index 125f9c4396..125f9c4396 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDec2Hex.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
index 83aee557f3..83aee557f3 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDelta.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
index aa1bf1f0c5..aa1bf1f0c5 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDeltaFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
index d55fdcf5e8..d55fdcf5e8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestEDate.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java
index c1e1349909..c1e1349909 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestEOMonth.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
index 9e9394c791..9e9394c791 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFactDoubleFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
index e0d2aca4c5..e0d2aca4c5 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFinanceLib.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
index 31e50331d0..31e50331d0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFind.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java
index 63f01cdbb6..63f01cdbb6 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixed.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
index 907ecf7cc1..907ecf7cc1 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFixedFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java
index 6dd04d13c1..6dd04d13c1 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestFrequency.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java
index 681b9e00dc..681b9e00dc 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestGeomean.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
index ba5bae0b1f..ba5bae0b1f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestHex2Dec.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
index 3614200239..3614200239 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIFFunctionFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
index e11a2b87c1..e11a2b87c1 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIPMT.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
index 4d226fa26a..4d226fa26a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImRealFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
index ea1fe44b1f..ea1fe44b1f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestImaginaryFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
index b39e396c04..b39e396c04 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndex.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
index 8bf6ffc1a9..8bf6ffc1a9 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndexFunctionFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
index 45422e19e7..45422e19e7 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirect.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
index f3a8cccb4f..f3a8cccb4f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIndirectFunctionFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
index 03dac3cef2..03dac3cef2 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIntercept.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
index 6764ebdc2b..6764ebdc2b 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIrr.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
index 9f6ece060c..9f6ece060c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestIsBlank.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
index 4bf92c7196..4bf92c7196 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLeftRight.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
index b4d8aa7a13..b4d8aa7a13 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLen.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
index 8825f01814..8825f01814 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
index 84deb0fc7b..84deb0fc7b 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLogicalFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
index 84d3674b70..84d3674b70 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestLookupFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
index 3721c688df..3721c688df 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatch.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
index 7f6f8ca2e6..7f6f8ca2e6 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMatchFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
index e408fceb7e..e408fceb7e 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMathX.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
index 866c65fb4a..866c65fb4a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMid.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
index f640cb54ee..f640cb54ee 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMirr.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
index 3c6e88a273..3c6e88a273 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestMultiOperandNumericFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
index 9f958f0205..9f958f0205 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNper.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
index 191ff37fef..191ff37fef 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestNpv.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
index 89c19277d2..89c19277d2 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOct2Dec.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
index fd2ada7b97..fd2ada7b97 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestOffset.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
index 0b908063fc..0b908063fc 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPPMT.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
index 0640450a03..0640450a03 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPmt.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
index 35ee88c29d..35ee88c29d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestPoisson.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java
index 7f5bc5a1dc..7f5bc5a1dc 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestProduct.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
index 15968199b5..15968199b5 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotient.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
index bbbfba1882..bbbfba1882 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestQuotientFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
index 90da6fdb0a..90da6fdb0a 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRank.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
index 0e87b38210..0e87b38210 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRelationalOperations.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
index 2a7132e813..2a7132e813 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestReptFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
index ffe0c75c00..ffe0c75c00 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRomanFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
index 4450528822..4450528822 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRoundFuncs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
index eb2812e0e4..eb2812e0e4 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestRowCol.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
index 5c8bc1eb33..5c8bc1eb33 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSlope.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
index 9fb322f978..9fb322f978 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestStatsLib.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java
index 3735232878..3735232878 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSubstitute.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
index 3f4eb88dd8..3f4eb88dd8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSubtotal.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
index 4bd60295a8..4bd60295a8 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumif.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
index 6aa1962953..6aa1962953 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumifs.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
index 35ee48d26c..35ee48d26c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestSumproduct.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
index 03cb480e47..03cb480e47 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTFunc.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
index ddcdd35165..ddcdd35165 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestText.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
index d45787b2a5..d45787b2a5 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTime.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
index 55398d31cb..55398d31cb 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrendFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
index efee41b996..efee41b996 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrim.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
index 6e1d5d8cac..6e1d5d8cac 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTrunc.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
index 3cac14426d..3cac14426d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestTwoOperandNumericFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
index a733f243de..a733f243de 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestValue.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
index 3719d93b35..3719d93b35 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
index b918d0490e..b918d0490e 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekNumFunctionsFromSpreadsheet2013.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
index d1c48a265f..d1c48a265f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestWeekdayFunc.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
index b97e80171e..b97e80171e 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestXYNumericFunction.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
index 8e566bf929..8e566bf929 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/BaseTestPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
index 3d99bc3e6d..3d99bc3e6d 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAbstractFunctionPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
index 51b8c32f28..51b8c32f28 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
index 91e76c08ef..91e76c08ef 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
index ea5a2cee50..ea5a2cee50 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
index c5a1b44bd0..c5a1b44bd0 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
index 142f4a574f..142f4a574f 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
index bddba7ff54..bddba7ff54 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestErrPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
index fedc639764..fedc639764 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
index 0c582c5cf7..0c582c5cf7 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
index fd6027fa93..fd6027fa93 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
index 2eb91217cb..2eb91217cb 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
index 91ed33b1e9..91ed33b1e9 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
index 7a806f15cd..7a806f15cd 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
index 6ff906c96c..6ff906c96c 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestRangePtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
index 2a1b44e6fc..2a1b44e6fc 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
index f4170286ca..f4170286ca 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
index 7b85995a02..7b85995a02 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
diff --git a/main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java b/poi/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java
index 9628c0af97..9628c0af97 100644
--- a/main/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java
+++ b/poi/src/test/java/org/apache/poi/ss/formula/udf/TestUDFFinder.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
index dbd7e5fc46..dbd7e5fc46 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBorderStyle.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index bcd8bf272a..bcd8bf272a 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
index d8a54cfa54..d8a54cfa54 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCell.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
index 25bd602c51..25bd602c51 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCellComment.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
index 7d9cd0c448..7d9cd0c448 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestCloneSheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
index 9acd338e11..9acd338e11 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestColumnShifting.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
index 4d3954fa78..4d3954fa78 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestConditionalFormatting.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
index 65ee8ffa49..65ee8ffa49 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
index ccfd8293c0..ccfd8293c0 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataValidation.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
index d0d2b0c535..d0d2b0c535 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFont.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
index 6c0e20c888..6c0e20c888 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestFormulaEvaluator.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
index 44a33c3f20..44a33c3f20 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
index 60a676fc7b..60a676fc7b 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestNamedRange.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
index d79e594857..d79e594857 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestPicture.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
index 6610623545..6610623545 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
index c2205d240c..c2205d240c 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRow.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
index 947bd71a9f..947bd71a9f 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
index 3afec95478..3afec95478 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
index 5d09f30016..5d09f30016 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetHiding.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
index 9a1a463363..9a1a463363 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftColumns.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
index 67d351bffc..67d351bffc 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
index 8f67877635..8f67877635 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
index 11bb3c9357..11bb3c9357 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestWorkbook.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
index 08fbae584e..08fbae584e 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestXEvaluationSheet.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
index da68a86b20..da68a86b20 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java
index 615e2f1d72..615e2f1d72 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDateUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
index e27557e9b9..e27557e9b9 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
index 7a45018569..7a45018569 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestFractionFormat.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
index 202ffae308..202ffae308 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestHSSFBorderStyle.java
diff --git a/main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java b/poi/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java
index d336ea95cd..d336ea95cd 100644
--- a/main/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestIndexedColors.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java b/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
index caef1acf52..caef1acf52 100644
--- a/main/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java b/poi/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
index d8664487ce..d8664487ce 100644
--- a/main/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/NumberComparingSpreadsheetGenerator.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java b/poi/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
index 925f968b37..925f968b37 100644
--- a/main/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/NumberComparisonExamples.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
index 0014a1f539..0014a1f539 100644
--- a/main/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java b/poi/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
index 1dcedc97a2..1dcedc97a2 100644
--- a/main/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/NumberToTextConversionExamples.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java b/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
index e8419d5306..e8419d5306 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java
index 044203f3c2..044203f3c2 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestCellAddress.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellAddress.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
index 01d12f41c3..01d12f41c3 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeAddress.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java
index 5b402a3bcd..5b402a3bcd 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellRangeUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestCellReference.java b/poi/src/test/java/org/apache/poi/ss/util/TestCellReference.java
index 0d2d791374..0d2d791374 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestCellReference.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestCellReference.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java b/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
index befe219a16..befe219a16 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestDateFormatConverter.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestDateParser.java b/poi/src/test/java/org/apache/poi/ss/util/TestDateParser.java
index 28e51d1b67..28e51d1b67 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestDateParser.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestDateParser.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java b/poi/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
index 9465619b79..9465619b79 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestExpandedDouble.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java
index aba0d71a37..aba0d71a37 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestHSSFCellUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java b/poi/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
index 225d9f835c..225d9f835c 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestNumberComparer.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java b/poi/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
index 387980d870..387980d870 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestNumberToTextConverter.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java b/poi/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java
index bd57735706..bd57735706 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestPropertyTemplate.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java
index 1fcd52ca80..1fcd52ca80 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestRegionUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java b/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
index e258895c8f..e258895c8f 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestSheetBuilder.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java
index 1731d46371..1731d46371 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestSheetUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java b/poi/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
index bb4094a470..bb4094a470 100644
--- a/main/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/TestWorkbookUtil.java
diff --git a/main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java b/poi/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
index 3515f783bd..3515f783bd 100644
--- a/main/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
+++ b/poi/src/test/java/org/apache/poi/ss/util/cellwalk/TestCellWalk.java
diff --git a/main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java b/poi/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java
index da84469c3f..da84469c3f 100644
--- a/main/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java
+++ b/poi/src/test/java/org/apache/poi/util/MemoryLeakVerifier.java
diff --git a/main/src/test/java/org/apache/poi/util/NullOutputStream.java b/poi/src/test/java/org/apache/poi/util/NullOutputStream.java
index ac76123a3c..ac76123a3c 100644
--- a/main/src/test/java/org/apache/poi/util/NullOutputStream.java
+++ b/poi/src/test/java/org/apache/poi/util/NullOutputStream.java
diff --git a/main/src/test/java/org/apache/poi/util/NullPrintStream.java b/poi/src/test/java/org/apache/poi/util/NullPrintStream.java
index 5fd6bc64ad..5fd6bc64ad 100644
--- a/main/src/test/java/org/apache/poi/util/NullPrintStream.java
+++ b/poi/src/test/java/org/apache/poi/util/NullPrintStream.java
diff --git a/main/src/test/java/org/apache/poi/util/TestArrayUtil.java b/poi/src/test/java/org/apache/poi/util/TestArrayUtil.java
index 0038aa019d..0038aa019d 100644
--- a/main/src/test/java/org/apache/poi/util/TestArrayUtil.java
+++ b/poi/src/test/java/org/apache/poi/util/TestArrayUtil.java
diff --git a/main/src/test/java/org/apache/poi/util/TestBitField.java b/poi/src/test/java/org/apache/poi/util/TestBitField.java
index 55c30087fa..55c30087fa 100644
--- a/main/src/test/java/org/apache/poi/util/TestBitField.java
+++ b/poi/src/test/java/org/apache/poi/util/TestBitField.java
diff --git a/main/src/test/java/org/apache/poi/util/TestByteField.java b/poi/src/test/java/org/apache/poi/util/TestByteField.java
index 8c37667fbc..8c37667fbc 100644
--- a/main/src/test/java/org/apache/poi/util/TestByteField.java
+++ b/poi/src/test/java/org/apache/poi/util/TestByteField.java
diff --git a/main/src/test/java/org/apache/poi/util/TestHexDump.java b/poi/src/test/java/org/apache/poi/util/TestHexDump.java
index 4a465cb4be..4a465cb4be 100644
--- a/main/src/test/java/org/apache/poi/util/TestHexDump.java
+++ b/poi/src/test/java/org/apache/poi/util/TestHexDump.java
diff --git a/main/src/test/java/org/apache/poi/util/TestIOUtils.java b/poi/src/test/java/org/apache/poi/util/TestIOUtils.java
index 558f62bc0a..19b64dd3c1 100644
--- a/main/src/test/java/org/apache/poi/util/TestIOUtils.java
+++ b/poi/src/test/java/org/apache/poi/util/TestIOUtils.java
@@ -531,7 +531,7 @@ final class TestIOUtils {
         }
     }
 
-    public static class NullInputStream extends InputStream {
+    public class NullInputStream extends InputStream {
         private final int bytes;
         private final boolean exception;
 
diff --git a/main/src/test/java/org/apache/poi/util/TestIntList.java b/poi/src/test/java/org/apache/poi/util/TestIntList.java
index 3483933ce4..3483933ce4 100644
--- a/main/src/test/java/org/apache/poi/util/TestIntList.java
+++ b/poi/src/test/java/org/apache/poi/util/TestIntList.java
diff --git a/main/src/test/java/org/apache/poi/util/TestIntegerField.java b/poi/src/test/java/org/apache/poi/util/TestIntegerField.java
index d8e2f1b66f..d8e2f1b66f 100644
--- a/main/src/test/java/org/apache/poi/util/TestIntegerField.java
+++ b/poi/src/test/java/org/apache/poi/util/TestIntegerField.java
diff --git a/main/src/test/java/org/apache/poi/util/TestLittleEndian.java b/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java
index 27e5e3fe1a..27e5e3fe1a 100644
--- a/main/src/test/java/org/apache/poi/util/TestLittleEndian.java
+++ b/poi/src/test/java/org/apache/poi/util/TestLittleEndian.java
diff --git a/main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java b/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
index 54ebefa5b5..54ebefa5b5 100644
--- a/main/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
+++ b/poi/src/test/java/org/apache/poi/util/TestLittleEndianStreams.java
diff --git a/main/src/test/java/org/apache/poi/util/TestLocaleUtil.java b/poi/src/test/java/org/apache/poi/util/TestLocaleUtil.java
index 3335b85368..3335b85368 100644
--- a/main/src/test/java/org/apache/poi/util/TestLocaleUtil.java
+++ b/poi/src/test/java/org/apache/poi/util/TestLocaleUtil.java
diff --git a/main/src/test/java/org/apache/poi/util/TestLongField.java b/poi/src/test/java/org/apache/poi/util/TestLongField.java
index 8cd39aba92..8cd39aba92 100644
--- a/main/src/test/java/org/apache/poi/util/TestLongField.java
+++ b/poi/src/test/java/org/apache/poi/util/TestLongField.java
diff --git a/main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java b/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
index 219e1460b1..219e1460b1 100644
--- a/main/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
+++ b/poi/src/test/java/org/apache/poi/util/TestRLEDecompressingInputStream.java
diff --git a/main/src/test/java/org/apache/poi/util/TestShortField.java b/poi/src/test/java/org/apache/poi/util/TestShortField.java
index 8c863ee074..8c863ee074 100644
--- a/main/src/test/java/org/apache/poi/util/TestShortField.java
+++ b/poi/src/test/java/org/apache/poi/util/TestShortField.java
diff --git a/main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java b/poi/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java
index 4630a3cd0d..4630a3cd0d 100644
--- a/main/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java
+++ b/poi/src/test/java/org/apache/poi/util/TestStringCodepointsIterable.java
diff --git a/main/src/test/java/org/apache/poi/util/TestStringUtil.java b/poi/src/test/java/org/apache/poi/util/TestStringUtil.java
index c0545cd762..c0545cd762 100644
--- a/main/src/test/java/org/apache/poi/util/TestStringUtil.java
+++ b/poi/src/test/java/org/apache/poi/util/TestStringUtil.java
diff --git a/main/src/test/java/org/apache/poi/util/TestTempFile.java b/poi/src/test/java/org/apache/poi/util/TestTempFile.java
index ec195e35f8..ec195e35f8 100644
--- a/main/src/test/java/org/apache/poi/util/TestTempFile.java
+++ b/poi/src/test/java/org/apache/poi/util/TestTempFile.java
diff --git a/main/src/test/java/org/apache/poi/util/TestXMLHelper.java b/poi/src/test/java/org/apache/poi/util/TestXMLHelper.java
index a4e8732b8d..a4e8732b8d 100644
--- a/main/src/test/java/org/apache/poi/util/TestXMLHelper.java
+++ b/poi/src/test/java/org/apache/poi/util/TestXMLHelper.java
diff --git a/main/src/test/java/org/apache/poi/util/data/test_properties1 b/poi/src/test/java/org/apache/poi/util/data/test_properties1
index 5c88809b70..5c88809b70 100644
--- a/main/src/test/java/org/apache/poi/util/data/test_properties1
+++ b/poi/src/test/java/org/apache/poi/util/data/test_properties1
diff --git a/main/src/test/java/org/apache/poi/util/data/test_properties2 b/poi/src/test/java/org/apache/poi/util/data/test_properties2
index dbf3f81e16..dbf3f81e16 100644
--- a/main/src/test/java/org/apache/poi/util/data/test_properties2
+++ b/poi/src/test/java/org/apache/poi/util/data/test_properties2
diff --git a/main/src/test/java/org/apache/poi/util/data/test_properties3 b/poi/src/test/java/org/apache/poi/util/data/test_properties3
index 84ba40da05..84ba40da05 100644
--- a/main/src/test/java/org/apache/poi/util/data/test_properties3
+++ b/poi/src/test/java/org/apache/poi/util/data/test_properties3
diff --git a/poi/src/test/java9/module-info.class b/poi/src/test/java9/module-info.class
new file mode 100644
index 0000000000..2cd1356efd
--- /dev/null
+++ b/poi/src/test/java9/module-info.class
diff --git a/main/src/test/java9/module-info.java b/poi/src/test/java9/module-info.java
index 58ac2220c5..58ac2220c5 100644
--- a/main/src/test/java9/module-info.java
+++ b/poi/src/test/java9/module-info.java
diff --git a/main/src/test/resources/log4j2-test.xml b/poi/src/test/resources/log4j2-test.xml
index 4737e9569a..4737e9569a 100644
--- a/main/src/test/resources/log4j2-test.xml
+++ b/poi/src/test/resources/log4j2-test.xml
diff --git a/scratchpad/build.gradle b/scratchpad/build.gradle
deleted file mode 100644
index 83a4e09ce6..0000000000
--- a/scratchpad/build.gradle
+++ /dev/null
@@ -1,31 +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.
-==================================================================== */
-
-dependencies {
-    api project(':main')
-    implementation "commons-codec:commons-codec:${commonsCodecVersion}"
-    implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
-    implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
-
-    testImplementation project(path: ':main', configuration: 'tests')
-}
-
-jar {
-    manifest {
-        attributes 'Automatic-Module-Name': 'org.apache.poi.scratchpad'
-    }
-}
diff --git a/scratchpad/src/main/java9/module-info.class b/scratchpad/src/main/java9/module-info.class
deleted file mode 100644
index 037213fa66..0000000000
--- a/scratchpad/src/main/java9/module-info.class
+++ /dev/null
diff --git a/scratchpad/src/test/java9/module-info.class b/scratchpad/src/test/java9/module-info.class
deleted file mode 100644
index 480bdd61e3..0000000000
--- a/scratchpad/src/test/java9/module-info.class
+++ /dev/null
diff --git a/settings.gradle b/settings.gradle
index c1b5e71952..7d799fd606 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,5 @@
 rootProject.name = 'poi'
 
-include 'main', 'ooxml-schema', 'ooxml', 'excelant', 'examples', 'scratchpad', 'integrationtest'
\ No newline at end of file
+include 'poi', 'poi-ooxml-full', 'poi-ooxml-lite-agent', 'poi-scratchpad',
+        'poi-ooxml', 'poi-excelant', 'poi-examples', 'poi-integration',
+        'poi-ooxml-lite'
\ No newline at end of file