diff --git a/.classpath b/.classpath
index 9512653..4037c47 100644
--- a/.classpath
+++ b/.classpath
@@ -2,19 +2,20 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.jar" sourcepath="lib/Logs/log4j-1.2.17-source.zip"/>
-	<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar" sourcepath="lib/UnitTesting/hamcrest-core-1.3-sources.jar"/>
-	<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.25.jar" sourcepath="lib/Logs/slf4j-api-1.7.25-sources.jar"/>
-	<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.25.jar" sourcepath="lib/Logs/slf4j-log4j12-1.7.25-sources.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang3-3.7.jar" sourcepath="lib/commons-lang3-3.7-sources.jar"/>
-	<classpathentry kind="lib" path="lib/UnitTesting/junit-4.12.jar" sourcepath="lib/UnitTesting/junit-4.12-sources.jar"/>
-	<classpathentry kind="lib" path="lib/devinsy-strings-0.8.2.jar" sourcepath="lib/devinsy-strings-0.8.2-sources.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="lib" path="lib/Logs/log4j-1.2.17.jar" sourcepath="lib/Logs/log4j-1.2.17-source.zip"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/hamcrest-core-1.3.jar" sourcepath="lib/UnitTesting/hamcrest-core-1.3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-api-1.7.25.jar" sourcepath="lib/Logs/slf4j-api-1.7.25-sources.jar"/>
+	<classpathentry kind="lib" path="lib/Logs/slf4j-log4j12-1.7.25.jar" sourcepath="lib/Logs/slf4j-log4j12-1.7.25-sources.jar"/>
+	<classpathentry kind="lib" path="lib/UnitTesting/junit-4.12.jar" sourcepath="lib/UnitTesting/junit-4.12-sources.jar"/>
+	<classpathentry kind="lib" path="lib/commons-lang3-3.11.jar" sourcepath="lib/commons-lang3-3.11-sources.jar"/>
+	<classpathentry kind="lib" path="lib/commons-text-1.9.jar" sourcepath="lib/commons-text-1.9-sources.jar"/>
+	<classpathentry kind="lib" path="lib/devinsy-strings-0.11.0.jar" sourcepath="lib/devinsy-strings-0.11.0-sources.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
new file mode 100644
index 0000000..7c8126d
--- /dev/null
+++ b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
@@ -0,0 +1,5 @@
+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1
diff --git a/lib/README b/lib/README
index 73953e3..2f5ad2a 100644
--- a/lib/README
+++ b/lib/README
@@ -1,7 +1,7 @@
 Description of used libraries.
 
 Standards:
-- commons-lang: useful tools (StringUtils...)
+- commons-lang: useful tools (StringUtils…)
 
 Logging
 - log4j: log API
diff --git a/lib/commons-lang3-3.11-sources.jar b/lib/commons-lang3-3.11-sources.jar
new file mode 100644
index 0000000..68cad64
Binary files /dev/null and b/lib/commons-lang3-3.11-sources.jar differ
diff --git a/lib/commons-lang3-3.11.jar b/lib/commons-lang3-3.11.jar
new file mode 100644
index 0000000..bbaa8a6
Binary files /dev/null and b/lib/commons-lang3-3.11.jar differ
diff --git a/lib/commons-lang3-3.7-sources.jar b/lib/commons-lang3-3.7-sources.jar
deleted file mode 100644
index a83c661..0000000
Binary files a/lib/commons-lang3-3.7-sources.jar and /dev/null differ
diff --git a/lib/commons-lang3-3.7.jar b/lib/commons-lang3-3.7.jar
deleted file mode 100644
index f37ded6..0000000
Binary files a/lib/commons-lang3-3.7.jar and /dev/null differ
diff --git a/lib/commons-text-1.9-sources.jar b/lib/commons-text-1.9-sources.jar
new file mode 100644
index 0000000..a636e92
Binary files /dev/null and b/lib/commons-text-1.9-sources.jar differ
diff --git a/lib/commons-text-1.9.jar b/lib/commons-text-1.9.jar
new file mode 100644
index 0000000..cc0c690
Binary files /dev/null and b/lib/commons-text-1.9.jar differ
diff --git a/lib/devinsy-strings-0.11.0-sources.zip b/lib/devinsy-strings-0.11.0-sources.zip
new file mode 100644
index 0000000..eb31276
Binary files /dev/null and b/lib/devinsy-strings-0.11.0-sources.zip differ
diff --git a/lib/devinsy-strings-0.11.0.jar b/lib/devinsy-strings-0.11.0.jar
new file mode 100644
index 0000000..1926831
Binary files /dev/null and b/lib/devinsy-strings-0.11.0.jar differ
diff --git a/lib/devinsy-strings-0.8.2-sources.zip b/lib/devinsy-strings-0.8.2-sources.zip
deleted file mode 100644
index 815e0b8..0000000
Binary files a/lib/devinsy-strings-0.8.2-sources.zip and /dev/null differ
diff --git a/lib/devinsy-strings-0.8.2.jar b/lib/devinsy-strings-0.8.2.jar
deleted file mode 100644
index 1e95075..0000000
Binary files a/lib/devinsy-strings-0.8.2.jar and /dev/null differ
diff --git a/src/fr/devinsy/xml/XMLTools.java b/src/fr/devinsy/xml/XMLTools.java
index 368c12a..b3cd7ea 100644
--- a/src/fr/devinsy/xml/XMLTools.java
+++ b/src/fr/devinsy/xml/XMLTools.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2014,2017-2018 Christian Pierre MOMON
+ * Copyright (C) 2013-2020 Christian Pierre MOMON
  * 
  * This file is part of Devinsy-xml.
  * 
@@ -35,8 +35,8 @@ import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
@@ -66,7 +66,7 @@ public class XMLTools
 		}
 		else
 		{
-			result = StringEscapeUtils.escapeXml(source);
+			result = StringEscapeUtils.escapeXml10(source);
 		}
 
 		//