Skip to content

Commit 0d392bd

Browse files
committed
[ignore] upgrade nekohtml to newer and maintained version from https://github.com/codelibs/nekohtml/
1 parent 17275cd commit 0d392bd

File tree

34 files changed

+70
-70
lines changed

34 files changed

+70
-70
lines changed

exist-ant/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-core/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,12 @@
311311
</dependency>
312312

313313
<dependency>
314-
<groupId>net.sourceforge.nekohtml</groupId>
314+
<groupId>org.codelibs</groupId>
315315
<artifactId>nekohtml</artifactId>
316-
<version>1.9.22</version>
317-
<scope>runtime</scope> <!-- default for util:parse-html -->
316+
<version>2.1.0</version>
317+
<scope>runtime</scope>
318318
<exclusions>
319-
<exclusion> <!-- conflicts with eXist-db's xercesImpl 2.12.2 dependency -->
319+
<exclusion>
320320
<groupId>xerces</groupId>
321321
<artifactId>xercesImpl</artifactId>
322322
</exclusion>
@@ -1040,7 +1040,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
10401040
<ignoredUnusedDeclaredDependency>org.eclipse.angus:angus-activation:jar:${eclipse.angus-activation.version}</ignoredUnusedDeclaredDependency>
10411041
<ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime:jar:${jaxb.impl.version}</ignoredUnusedDeclaredDependency>
10421042
<ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi:jar:${jansi.version}</ignoredUnusedDeclaredDependency>
1043-
<ignoredUnusedDeclaredDependency>net.sourceforge.nekohtml:nekohtml:jar:1.9.22</ignoredUnusedDeclaredDependency>
1043+
<ignoredUnusedDeclaredDependency>org.codelibs:nekohtml:jar:2.1.0</ignoredUnusedDeclaredDependency>
10441044
<ignoredUnusedDeclaredDependency>xml-resolver:xml-resolver:jar:1.2</ignoredUnusedDeclaredDependency>
10451045
<ignoredUnusedDeclaredDependency>org.xmlresolver:xmlresolver:jar:${xmlresolver.version}</ignoredUnusedDeclaredDependency>
10461046
<ignoredUnusedDeclaredDependency>org.exist-db.thirdparty.org.eclipse.wst.xml:xpath2:jar:1.2.0</ignoredUnusedDeclaredDependency>

exist-core/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
669669
670670
Examples include:
671-
- org.cyberneko.html.parsers.SAXParser
671+
- org.codelibs.nekohtml.parsers.SAXParser
672672
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
673673
674674
- org.ccil.cowan.tagsoup.Parser
@@ -713,7 +713,7 @@
713713

714714
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
715715

716-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
716+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
717717
<properties>
718718
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
719719
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-core/src/test/resources-filtered/org/exist/storage/statistics/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@
667667
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
668668
669669
Examples include:
670-
- org.cyberneko.html.parsers.SAXParser
670+
- org.codelibs.nekohtml.parsers.SAXParser
671671
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
672672
673673
- org.ccil.cowan.tagsoup.Parser
@@ -712,7 +712,7 @@
712712

713713
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
714714

715-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
715+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
716716
<properties>
717717
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
718718
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-core/src/test/resources-filtered/org/exist/xquery/functions/transform/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@
678678
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
679679
680680
Examples include:
681-
- org.cyberneko.html.parsers.SAXParser
681+
- org.codelibs.nekohtml.parsers.SAXParser
682682
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
683683
684684
- org.ccil.cowan.tagsoup.Parser
@@ -723,7 +723,7 @@
723723

724724
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
725725

726-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
726+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
727727
<properties>
728728
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
729729
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-core/src/test/resources/org/exist/storage/ConcurrentBrokerPoolTest.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<xml>
6868
<features/>
6969
</xml>
70-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
70+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
7171
<properties>
7272
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
7373
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-core/src/test/resources/org/exist/xmldb/allowAnyUri.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@
715715
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
716716
717717
Examples include:
718-
- org.cyberneko.html.parsers.SAXParser
718+
- org.codelibs.nekohtml.parsers.SAXParser
719719
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
720720
721721
- org.ccil.cowan.tagsoup.Parser
@@ -760,7 +760,7 @@
760760

761761
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
762762

763-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
763+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
764764
<properties>
765765
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
766766
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

exist-distribution/src/main/config/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@
715715
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
716716
717717
Examples include:
718-
- org.cyberneko.html.parsers.SAXParser
718+
- org.codelibs.nekohtml.parsers.SAXParser
719719
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
720720
721721
- org.ccil.cowan.tagsoup.Parser
@@ -756,7 +756,7 @@
756756

757757
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
758758

759-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
759+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
760760
<properties>
761761
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
762762
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/contentextraction/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/debuggee/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/expath/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/exquery/restxq/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@
519519
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
520520
521521
Examples include:
522-
- org.cyberneko.html.parsers.SAXParser
522+
- org.codelibs.nekohtml.parsers.SAXParser
523523
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
524524
525525
- org.ccil.cowan.tagsoup.Parser
@@ -548,7 +548,7 @@
548548

549549
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
550550

551-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
551+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
552552
<properties>
553553
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
554554
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/indexes-integration-tests/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@
671671
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
672672
673673
Examples include:
674-
- org.cyberneko.html.parsers.SAXParser
674+
- org.codelibs.nekohtml.parsers.SAXParser
675675
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
676676
677677
- org.ccil.cowan.tagsoup.Parser
@@ -716,7 +716,7 @@
716716

717717
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
718718

719-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
719+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
720720
<properties>
721721
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
722722
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/lucene/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@
670670
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
671671
672672
Examples include:
673-
- org.cyberneko.html.parsers.SAXParser
673+
- org.codelibs.nekohtml.parsers.SAXParser
674674
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
675675
676676
- org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
715715

716716
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
717717

718-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
718+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
719719
<properties>
720720
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
721721
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/ngram/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@
670670
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
671671
672672
Examples include:
673-
- org.cyberneko.html.parsers.SAXParser
673+
- org.codelibs.nekohtml.parsers.SAXParser
674674
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
675675
676676
- org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
715715

716716
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
717717

718-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
718+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
719719
<properties>
720720
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
721721
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/range/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@
673673
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
674674
675675
Examples include:
676-
- org.cyberneko.html.parsers.SAXParser
676+
- org.codelibs.nekohtml.parsers.SAXParser
677677
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
678678
679679
- org.ccil.cowan.tagsoup.Parser
@@ -718,7 +718,7 @@
718718

719719
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
720720

721-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
721+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
722722
<properties>
723723
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
724724
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/sort/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@
670670
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
671671
672672
Examples include:
673-
- org.cyberneko.html.parsers.SAXParser
673+
- org.codelibs.nekohtml.parsers.SAXParser
674674
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
675675
676676
- org.ccil.cowan.tagsoup.Parser
@@ -715,7 +715,7 @@
715715

716716
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
717717

718-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
718+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
719719
<properties>
720720
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
721721
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/indexes/spatial/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
670670
671671
Examples include:
672-
- org.cyberneko.html.parsers.SAXParser
672+
- org.codelibs.nekohtml.parsers.SAXParser
673673
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
674674
675675
- org.ccil.cowan.tagsoup.Parser
@@ -714,7 +714,7 @@
714714

715715
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
716716

717-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
717+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
718718
<properties>
719719
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
720720
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/modules/cache/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/modules/cache/src/test/resources-filtered/lazy-cache-conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/modules/cache/src/test/resources-filtered/non-lazy-cache-conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

extensions/modules/compression/src/test/resources-filtered/conf.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@
542542
perhaps the best way to do this is to place it into $EXIST_HOME/lib/user
543543
544544
Examples include:
545-
- org.cyberneko.html.parsers.SAXParser
545+
- org.codelibs.nekohtml.parsers.SAXParser
546546
The Cyber NekoHTML parser from https://sourceforge.net/projects/nekohtml/
547547
548548
- org.ccil.cowan.tagsoup.Parser
@@ -571,7 +571,7 @@
571571

572572
<!-- html-to-xml class="org.ccil.cowan.tagsoup.Parser"/ -->
573573

574-
<html-to-xml class="org.cyberneko.html.parsers.SAXParser">
574+
<html-to-xml class="org.codelibs.nekohtml.parsers.SAXParser">
575575
<properties>
576576
<property name="http://cyberneko.org/html/properties/names/elems" value="match"/>
577577
<property name="http://cyberneko.org/html/properties/names/attrs" value="no-change"/>

0 commit comments

Comments
 (0)