new subproject htmlunit-csp

HtmlUnit · Nov 28, 2023 · 792e845 · 792e845
1 parent e07ba67
commit 792e845
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,7 @@
         <htmlunitcssparser.version>3.8.0</htmlunitcssparser.version>
         <htmlunitneko.version>3.9.0-SNAPSHOT</htmlunitneko.version>
         <htmlunitxpath.version>3.8.0</htmlunitxpath.version>
+        <htmlunitcsp.version>3.9.0-SNAPSHOT</htmlunitcsp.version>
         <htmlunitcorejs.version>3.8.0</htmlunitcorejs.version>
 
         <htmlunitdriver.version>4.15.0</htmlunitdriver.version>
@@ -1154,6 +1155,12 @@
             <artifactId>htmlunit-xpath</artifactId>
             <version>${htmlunitxpath.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.htmlunit</groupId>
+            <artifactId>htmlunit-csp</artifactId>
+            <version>${htmlunitcsp.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -1195,17 +1202,7 @@
             <artifactId>dec</artifactId>
             <version>0.1.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.shapesecurity</groupId>
-            <artifactId>salvation2</artifactId>
-            <version>3.0.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+
         <!-- Jetty -->
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="3.9.0" date="December xx, 2023" description="Bugfixes">
+            <action type="add" dev="rbri">
+                New subproject htmlunit-csp. This replaces shapesecurity/salvation.
+            </action>
             <action type="fix" dev="rbri">
                 Enable FEATURE_SECURE_PROCESSING for the MSXML XSLProcessor.
             </action>

diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java
@@ -70,6 +70,8 @@
 import org.htmlunit.activex.javascript.msxml.MSXMLActiveXObjectFactory;
 import org.htmlunit.attachment.AttachmentHandler;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.csp.Policy;
+import org.htmlunit.csp.url.URI;
 import org.htmlunit.css.ComputedCssStyleDeclaration;
 import org.htmlunit.cssparser.parser.CSSErrorHandler;
 import org.htmlunit.cssparser.parser.javacc.CSS3Parser;
@@ -105,9 +107,6 @@
 import org.htmlunit.util.UrlUtils;
 import org.htmlunit.webstart.WebStartHandler;
 
-import com.shapesecurity.salvation2.Policy;
-import com.shapesecurity.salvation2.URLs.URI;
-
 /**
  * The main starting point in HtmlUnit: this class simulates a web browser.
  * <p>