diff --git a/.gitignore b/.gitignore
index 0ba0c1b4bd..ed8a7870af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,18 +20,6 @@ ooxml-testlib/
 junit*.properties
 TEST-org.apache.poi*.xml
 
-# Sonar
-.sonar
-sonar/main/src/
-sonar/ooxml/src/
-sonar/scratchpad/src/
-sonar/ooxml-full/src/
-sonar/examples/src/
-sonar/excelant/src/
-sonar/integration-test/src/
-sonar/target
-sonar/*/target
-
 # IntelliJ
 /out/
 /*/out/
diff --git a/build.xml b/build.xml
index 9c90a8a08b..e2d57f98b6 100644
--- a/build.xml
+++ b/build.xml
@@ -639,13 +639,6 @@ under the License.
         <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/**"/>
-                <include name="*/build/**"/>
-                <include name="*/src/**"/>
-            </fileset>
-        </delete>
     </target>
 
     <macrodef name="downloadfile">
@@ -2002,6 +1995,7 @@ under the License.
         <uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html">
             <srcfiles dir="${main.documentation}" />
         </uptodate>
+        <echo message="Had result: ${main.docs.notRequired}"/>
     </target>
 
     <target name="-check-forrest-installed" unless="env.FORREST_HOME">
@@ -2020,6 +2014,8 @@ under the License.
 
     <target name="-forrest-docs" depends="-check-forrest-installed, -check-docs"
             unless="main.docs.notRequired" description="Builds the HTML pages of the POI website">
+        <echo message="Using Apache Forrest from ${env.FORREST_HOME}"/>
+
         <exec executable="${env.FORREST_HOME}/bin/forrest" osfamily="unix"/>
         <exec executable="cmd" osfamily="windows">
             <arg value="/c"/>
@@ -2389,8 +2385,6 @@ under the License.
                       out/**,
                       tmp/**,
                       gradle/**,
-                      sonar/**/target/**,
-                      sonar/*/src/**,
                       compile-lib/**,
                       ooxml-lib/**,
                       ooxml-testlib/**,
@@ -3031,26 +3025,16 @@ under the License.
             <param name="version_id" value="${rel_next}"/>
         </antcall>
 
-        <!-- update sonar pom.xmls -->
-        <replaceregexp byline="true">
-            <regexp pattern="&lt;version&gt;.*-SNAPSHOT&lt;/version&gt;"/>
-            <substitution expression="&lt;version&gt;${rel_next}-SNAPSHOT&lt;/version&gt;"/>
-            <fileset dir="sonar">
-              <include name="**/pom.xml"/>
-            </fileset>
-        </replaceregexp>
-
         <!-- unpin documentation and commit next snapshot version -->
         <svn refid="svn.settings">
             <update dir="." recurse="true"/>
             <propset path="src" name="svn:externals" value="documentation https://svn.apache.org/repos/asf/poi/site/src/documentation"/>
             <!--<commit message="prepare for ${rel_next}" recurse="false">
                 <fileset dir="." includes="build.xml"/>
-                <fileset dir="sonar" includes="**/pom.xml"/>
                 <dirset dir="src"/>
             </commit>-->
         </svn>
-        <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml sonar src"/>
+        <exec command="svn ci --username ${settings.apache-id.username} --password ${settings.apache-id.password} -m 'prepare for ${rel_next}' build.xml src poi*"/>
 
         <mkdir dir="build/release"/>
 
@@ -3123,10 +3107,6 @@ under the License.
         <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;"/>
-
-        <replaceregexp match="(&lt;version&gt;)[^&lt;]+" replace="\1${version.id}">
-            <fileset dir="sonar" includes="**/pom.xml"/>
-        </replaceregexp>
     </target>
 
 
@@ -3289,20 +3269,6 @@ under the License.
 
 	<target name="replaceVersion" description="Apply the version from build.xml in all other places">
 		<replaceregexp
-               match="(packaging>\n\s*&lt;version>)[0-9.]+(?:-SNAPSHOT)?"
-               replace="\1${version.id}">
-			<fileset dir="sonar">
-				<include name="**/pom.xml"/>
-			</fileset>
-        </replaceregexp>
-		<replaceregexp
-               match="(poi-parent&lt;/artifactId>\n\s*&lt;version>)[0-9.]+(?:-SNAPSHOT)?"
-               replace="\1${version.id}">
-			<fileset dir="sonar">
-				<include name="**/pom.xml"/>
-			</fileset>
-        </replaceregexp>
-		<replaceregexp
                match=" version = '[0-9.]+(?:-SNAPSHOT)?'"
                replace=" version = '${version.id}'">
 			<fileset dir=".">
diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index c72c898231..ece3c0c22e 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -280,7 +280,6 @@ poijobs.each { poijob ->
                 /* remove xmlbeans while 4.0 is not stable */
                 includePattern('**/lib/ooxml/xmlbeans*.jar')
                 includePattern('**/lib/ooxml/ooxml*.jar')
-                includePattern('sonar/*/target/**')
                 /* remove ooxml-schemas while the builds migrate to 5th edition */
                 includePattern('build/xmlbean-*/**')
                 /* remove remaining src debris */