ref #10055 remove all dependencies to org.apache.commons.lang. from vaadin

diff --git a/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java b/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java
index 7dbfc99addf5370fe6614d7e6f91a964b19a34a2..5096aa8f5a857d1f9caba39f43e80a53673541e0 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java
+++ b/src/main/java/eu/etaxonomy/cdm/cache/CdmEntityCache.java
@@ -22,7 +22,7 @@ import java.util.Set;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.beanutils.PropertyUtilsBean;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.hibernate.Hibernate;

diff --git a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java
index 0f5b2d9e94de70e28878fda76a2f23835f375abf..53fc9fd9e0cf35c673b25dbe5b52f4ec01e55c3d 100644 (file)
--- a/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java
+++ b/src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/WorkflowStep.java
@@ -8,15 +8,13 @@
 */
 package eu.etaxonomy.cdm.vaadin.model.registration;
 
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 
 import eu.etaxonomy.cdm.model.name.RegistrationStatus;
 
-
 /**
  * @author a.kohlbecker
  * @since Mar 28, 2017
- *
  */
 public enum WorkflowStep {
 
@@ -50,7 +48,7 @@ public enum WorkflowStep {
     }
 
     public String getHtml(){
-        return StringEscapeUtils.escapeHtml(getRepresentation());
+        return StringEscapeUtils.escapeHtml4(getRepresentation());
     }
 
     public static WorkflowStep from(RegistrationStatus status, boolean citationDetailsReady) {