use our own 'fork' of the current brotli source code

rbri · rbri · commit b1c5b3d87671 · 2025-08-22T18:25:04.000+02:00
diff --git a/checkstyle_suppressions.xml b/checkstyle_suppressions.xml
@@ -6,6 +6,7 @@
 
 <suppressions>
     <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]test[\\/]resources[\\/]"/>
+    <suppress checks="[a-zA-Z0-9]*" files="[\\/]src[\\/]main[\\/]java[\\/]org[\\/]htmlunit[\\/]util[\\/]brotli[\\/]"/>
 
     <suppress checks="JavadocPackage" files="[\\/]src[\\/](test)[\\/]"/>
 
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
         <commons-lang3.version>3.18.0</commons-lang3.version>
         <commons-io.version>2.20.0</commons-io.version>
         <commons-logging.version>1.3.5</commons-logging.version>
-        <brotli.version>0.1.2</brotli.version>
+        <!--brotli.version>0.1.2</brotli.version-->
 
         <!-- selenium -->
         <htmlunitdriver.version>4.35.0</htmlunitdriver.version>
@@ -1372,11 +1372,11 @@
             <artifactId>commons-logging</artifactId>
             <version>${commons-logging.version}</version>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.brotli</groupId>
             <artifactId>dec</artifactId>
             <version>${brotli.version}</version>
-        </dependency>
+        </dependency-->
 
         <!-- Test dependencies. -->
         <dependency>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -7,6 +7,19 @@
     </properties>
 
     <body>
+        <release version="4.16.0" date="August 17, 2025" description="StringUtils, Brotli, Bugfixes">
+            <action type="update" dev="rbri" issue="#1009">
+                Use our own 'fork' of the current brotli source code.
+            </action>
+            <action type="update" dev="rbri">
+                Use our own StringUtils at more places to be comptible with older commons lang versions.
+            </action>
+            <action type="update" dev="rbri">
+                Handling of CData sections in XHTML documents improved/fixed.
+            </action>
+        </release>
+
+
         <release version="4.15.0" date="August 17, 2025" description="Chrome/Edge 139, Firefox 141, core-js, Bugfixes">
             <action type="update" dev="rbri">
                 WebAssert messages reviewed and improved.
diff --git a/src/main/java/org/htmlunit/WebResponseData.java b/src/main/java/org/htmlunit/WebResponseData.java
@@ -31,10 +31,10 @@
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.brotli.dec.BrotliInputStream;
 import org.htmlunit.util.MimeType;
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.StringUtils;
+import org.htmlunit.util.brotli.BrotliInputStream;
 
 /**
  * Simple data object to simplify WebResponse creation.
