diff --git a/pom.xml b/pom.xml
index bb5ef9dcffa29385c94435b7b9e3918b822558b4..0b2545214bca6c584ffca668d1ad68528d8dfb92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1354,7 +1354,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -1604,7 +1604,7 @@
<docletArtifact>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</docletArtifact>
</docletArtifacts>
<additionalparam>-output
@@ -1686,7 +1686,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
</dependency>
</dependencies>
</plugin>
@@ -2171,12 +2171,18 @@
<dependency>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>1.9.21</version>
+ <version>1.9.22</version>
</dependency>
<dependency>
<groupId>org.owasp.antisamy</groupId>
<artifactId>antisamy</artifactId>
- <version>1.5.2</version>
+ <version>1.5.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.w3c.css</groupId>
@@ -2186,12 +2192,22 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-css</artifactId>
- <version>1.7</version>
+ <version>1.11</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis-ext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-util</artifactId>
- <version>1.7</version>
+ <version>1.11</version>
</dependency>
<dependency>
<groupId>de.java2html</groupId>
@@ -2348,9 +2364,13 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.11.0</version>
+ <version>2.12.0</version>
<!-- prevents duplicate -->
<exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId>
@@ -2364,7 +2384,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <version>1.4.01</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
@@ -2620,6 +2640,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- End test dependencies -->
diff --git a/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml b/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml
index 1d1e90ff54478bad72e1cf6115d9db7759ee3801..a40d6161bb170ecb1162e85fd89a86ada66d3a8c 100644
--- a/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml
+++ b/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-tinymce.xml
@@ -1,54 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE definition [
- <!ENTITY Agrave "À">
- <!ENTITY Aacute "Á">
- <!ENTITY Acirc "Â">
- <!ENTITY Atilde "Ã">
- <!ENTITY Auml "Ä">
- <!ENTITY Egrave "È">
- <!ENTITY Eacute "É">
- <!ENTITY Ecirc "Ê">
- <!ENTITY Euml "Ë">
- <!ENTITY Igrave "Ì">
- <!ENTITY Iacute "Í">
- <!ENTITY Icirc "Î">
- <!ENTITY Iuml "Ï">
- <!ENTITY Ograve "Ò">
- <!ENTITY Oacute "Ó">
- <!ENTITY Ocirc "Ô">
- <!ENTITY Otilde "Õ">
- <!ENTITY Ouml "Ö">
- <!ENTITY Ugrave "Ù">
- <!ENTITY Uacute "Ú">
- <!ENTITY Ucirc "Û">
- <!ENTITY Uuml "Ü">
- <!ENTITY agrave "à">
- <!ENTITY aacute "á">
- <!ENTITY acirc "â">
- <!ENTITY atilde "ã">
- <!ENTITY auml "ä">
- <!ENTITY egrave "è">
- <!ENTITY eacute "é">
- <!ENTITY ecirc "ê">
- <!ENTITY euml "ë">
- <!ENTITY igrave "ì">
- <!ENTITY iacute "í">
- <!ENTITY icirc "î">
- <!ENTITY iuml "ï">
- <!ENTITY ograve "ò">
- <!ENTITY oacute "ó">
- <!ENTITY ocirc "ô">
- <!ENTITY ouml "ö">
- <!ENTITY ugrave "ù">
- <!ENTITY uacute "ú">
- <!ENTITY ucirc "û">
- <!ENTITY uuml "ü">
-]>
<!--
TinyMCE policy download from trunk adapted for OLAT
Version found at 30.07.2009, Adaption made by frentix GmbH
-->
-
<anti-samy-rules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="antisamy.xsd">
@@ -85,7 +39,8 @@
<!-- value="([\p{L}\p{N}\p{Zs}/\.\?=&\-~_])+" /> -->
<regexp name="offsiteURL"
- value="(\s)*(http(s?)://|mailto:)[A-Za-z0-9]+[~a-zA-Z0-9-_\.@#$%&;À;ÁÂÃÄÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜàáâãäèéêëìíîïòóôöùúûü;:,\?=/\+!]*(\s)*" />
+ value="(\s)*((ht)tp(s?)://|mailto:)[\p{L}\p{N}]+[\p{L}\p{N}\p{Zs}\.\#@\$%\+&;:\-_~,\?=/!\(\)]*(\s)*" />
+
<!--
<regexp name="offsiteURL"
value="(\s)*(http(s?)://|mailto:)[A-Za-z0-9]+[~a-zA-Z0-9-_\.@#$%&;:,\?=/\+!]*(\s)*" />
diff --git a/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-wiki.xml b/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-wiki.xml
index 91281caaa4985cedd269a5d3d9772cb2b1fe905a..03fcb66d2baddb7df88c3b96ab30c072ef869deb 100644
--- a/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-wiki.xml
+++ b/src/main/java/org/olat/core/util/filter/impl/_resources/antisamy-wiki.xml
@@ -1,49 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE definition [
- <!ENTITY Agrave "À">
- <!ENTITY Aacute "Á">
- <!ENTITY Acirc "Â">
- <!ENTITY Atilde "Ã">
- <!ENTITY Auml "Ä">
- <!ENTITY Egrave "È">
- <!ENTITY Eacute "É">
- <!ENTITY Ecirc "Ê">
- <!ENTITY Euml "Ë">
- <!ENTITY Igrave "Ì">
- <!ENTITY Iacute "Í">
- <!ENTITY Icirc "Î">
- <!ENTITY Iuml "Ï">
- <!ENTITY Ograve "Ò">
- <!ENTITY Oacute "Ó">
- <!ENTITY Ocirc "Ô">
- <!ENTITY Otilde "Õ">
- <!ENTITY Ouml "Ö">
- <!ENTITY Ugrave "Ù">
- <!ENTITY Uacute "Ú">
- <!ENTITY Ucirc "Û">
- <!ENTITY Uuml "Ü">
- <!ENTITY agrave "à">
- <!ENTITY aacute "á">
- <!ENTITY acirc "â">
- <!ENTITY atilde "ã">
- <!ENTITY auml "ä">
- <!ENTITY egrave "è">
- <!ENTITY eacute "é">
- <!ENTITY ecirc "ê">
- <!ENTITY euml "ë">
- <!ENTITY igrave "ì">
- <!ENTITY iacute "í">
- <!ENTITY icirc "î">
- <!ENTITY iuml "ï">
- <!ENTITY ograve "ò">
- <!ENTITY oacute "ó">
- <!ENTITY ocirc "ô">
- <!ENTITY ouml "ö">
- <!ENTITY ugrave "ù">
- <!ENTITY uacute "ú">
- <!ENTITY ucirc "û">
- <!ENTITY uuml "ü">
-]>
<!--
TinyMCE policy download from trunk adapted for OLAT
Version found at 30.07.2009, Adaption made by frentix GmbH
@@ -83,14 +38,8 @@
<regexp name="onsiteURL"
value="([\p{L}\p{N}\p{Zs}/\.\?=&\-~_#])+" />
- <!--
<regexp name="offsiteURL"
- value="^(?:(?:http(?:s)?|ftp)://)(?:\\\\S+(?::(?:\\\\S)*)?@)?(?:(?:[a-z0-9\\u00a1-\\uffff](?:-)*)*(?:[a-z0-9\\u00a1-\\uffff])+)(?:\\\\.(?:[a-z0-9\\u00a1-\\uffff](?:-)*)*(?:[a-z0-9\\u00a1-\\uffff])+)*(?:\\\\.(?:[a-z0-9\\u00a1-\\uffff]){2,})(?::(?:\\\\d){2,5})?(?:/(?:\\\\S)*)?$" />
- -->
-
- <regexp name="offsiteURL"
- value="(\s)*(http(s?)://|mailto:)[A-Za-z0-9]+[~a-zA-Z0-9\u00a1-\uffff-_\.@#$% &;À;ÁÂÃÄÈÉÊËÌÍÎÏÒÓÔÕÖÙÚÛÜàáâãäèéêëìíîïòóôöùúûü;:,\?=/\+!]*(\s)*" />
-
+ value="(\s)*((ht)tp(s?)://|mailto:)[\p{L}\p{N}]+[\p{L}\p{N}\p{Zs}\.\#@\$%\+&;:\-_~,\?=/!\(\)]*(\s)*" />
<!--
<regexp name="offsiteURL"
value="(\s)*(http(s?)://|mailto:)[A-Za-z0-9]+[~a-zA-Z0-9-_\.@#$%&;:,\?=/\+!]*(\s)*" />