[ignore] upgrade nekohtml to newer and maintained version from https:…

…//github.com/codelibs/nekohtml/
line-o · Nov 30, 2023 · 0d392bd · 0d392bd
1 parent 17275cd
commit 0d392bd
Show file tree

Hide file tree

Showing 34 changed files with 70 additions and 70 deletions.
diff --git a/exist-ant/src/test/resources-filtered/conf.xml b/exist-ant/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-core/pom.xml b/exist-core/pom.xml
@@ -311,12 +311,12 @@
         </dependency>
 
         <dependency>
-            <groupId>net.sourceforge.nekohtml</groupId>
+            <groupId>org.codelibs</groupId>
             <artifactId>nekohtml</artifactId>
-            <version>1.9.22</version>
-            <scope>runtime</scope>  <!-- default for util:parse-html -->
+            <version>2.1.0</version>
+            <scope>runtime</scope>
             <exclusions>
-                <exclusion>  <!-- conflicts with eXist-db's xercesImpl 2.12.2 dependency -->
+                <exclusion>
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
@@ -1040,7 +1040,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                                 <ignoredUnusedDeclaredDependency>org.eclipse.angus:angus-activation:jar:${eclipse.angus-activation.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime:jar:${jaxb.impl.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi:jar:${jansi.version}</ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>net.sourceforge.nekohtml:nekohtml:jar:1.9.22</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.codelibs:nekohtml:jar:2.1.0</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>xml-resolver:xml-resolver:jar:1.2</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.xmlresolver:xmlresolver:jar:${xmlresolver.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.exist-db.thirdparty.org.eclipse.wst.xml:xpath2:jar:1.2.0</ignoredUnusedDeclaredDependency>

diff --git a/exist-core/src/test/resources-filtered/conf.xml b/exist-core/src/test/resources-filtered/conf.xml
@@ -668,7 +668,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -713,7 +713,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-core/src/test/resources-filtered/org/exist/storage/statistics/conf.xml b/exist-core/src/test/resources-filtered/org/exist/storage/statistics/conf.xml
@@ -667,7 +667,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -712,7 +712,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-core/src/test/resources-filtered/org/exist/xquery/functions/transform/conf.xml b/exist-core/src/test/resources-filtered/org/exist/xquery/functions/transform/conf.xml
@@ -678,7 +678,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -723,7 +723,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-core/src/test/resources/org/exist/storage/ConcurrentBrokerPoolTest.conf.xml b/exist-core/src/test/resources/org/exist/storage/ConcurrentBrokerPoolTest.conf.xml
@@ -67,7 +67,7 @@
         <xml>
             <features/>
         </xml>
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-core/src/test/resources/org/exist/xmldb/allowAnyUri.xml b/exist-core/src/test/resources/org/exist/xmldb/allowAnyUri.xml
@@ -715,7 +715,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -760,7 +760,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/exist-distribution/src/main/config/conf.xml b/exist-distribution/src/main/config/conf.xml
@@ -715,7 +715,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -756,7 +756,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/contentextraction/src/test/resources-filtered/conf.xml b/extensions/contentextraction/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/debuggee/src/test/resources-filtered/conf.xml b/extensions/debuggee/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/expath/src/test/resources-filtered/conf.xml b/extensions/expath/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/exquery/restxq/src/test/resources-filtered/conf.xml b/extensions/exquery/restxq/src/test/resources-filtered/conf.xml
@@ -519,7 +519,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -548,7 +548,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/indexes-integration-tests/src/test/resources-filtered/conf.xml b/extensions/indexes/indexes-integration-tests/src/test/resources-filtered/conf.xml
@@ -671,7 +671,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -716,7 +716,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/lucene/src/test/resources-filtered/conf.xml b/extensions/indexes/lucene/src/test/resources-filtered/conf.xml
@@ -670,7 +670,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/ngram/src/test/resources-filtered/conf.xml b/extensions/indexes/ngram/src/test/resources-filtered/conf.xml
@@ -670,7 +670,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/range/src/test/resources-filtered/conf.xml b/extensions/indexes/range/src/test/resources-filtered/conf.xml
@@ -673,7 +673,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -718,7 +718,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/sort/src/test/resources-filtered/conf.xml b/extensions/indexes/sort/src/test/resources-filtered/conf.xml
@@ -670,7 +670,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/indexes/spatial/src/test/resources-filtered/conf.xml b/extensions/indexes/spatial/src/test/resources-filtered/conf.xml
@@ -669,7 +669,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -714,7 +714,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/modules/cache/src/test/resources-filtered/conf.xml b/extensions/modules/cache/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/modules/cache/src/test/resources-filtered/lazy-cache-conf.xml b/extensions/modules/cache/src/test/resources-filtered/lazy-cache-conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/modules/cache/src/test/resources-filtered/non-lazy-cache-conf.xml b/extensions/modules/cache/src/test/resources-filtered/non-lazy-cache-conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

diff --git a/extensions/modules/compression/src/test/resources-filtered/conf.xml b/extensions/modules/compression/src/test/resources-filtered/conf.xml
@@ -542,7 +542,7 @@
                 perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
 
                 Examples include:
-                    - org.cyberneko.html.parsers.SAXParser
+                    - org.codelibs.nekohtml.parsers.SAXParser
                         The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
 
                     - org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
 
         <!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
 
-        <html-to-xml class="org.cyberneko.html.parsers.SAXParser">
+        <html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
             <properties>
                 <property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
                 <property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>