SAK-40712 (sakaiproject#6061)

org.apache.commons.validator.EmailValidator => org.apache.commons.validator.routines.EmailValidator: msgcntr/messageforums-app/ signup/impl simple-rss-portlet site-manage/site-manage-participant-helper web/web-tool/tool pom.xml commons-validator delele: polls-impl account-validator-impls singup-tool
abdobaz · Oct 1, 2018 · 28f6199 · 28f6199
1 parent aaef026
commit 28f6199
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 17 deletions.
diff --git a/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java b/...r/messageforums-app/src/java/org/sakaiproject/tool/messageforums/PrivateMessagesTool.java
@@ -43,7 +43,7 @@
 import javax.faces.model.SelectItem;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
 import org.sakaiproject.api.app.messageforums.Area;
 import org.sakaiproject.api.app.messageforums.Attachment;
 import org.sakaiproject.api.app.messageforums.DefaultPermissionsManager;

diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml
@@ -58,10 +58,6 @@
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>

diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml
@@ -142,10 +142,6 @@
 			<version>3.4</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>oro</groupId>
 			<artifactId>oro</artifactId>

diff --git a/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java b/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java
@@ -45,7 +45,7 @@
 import lombok.Setter;
 import net.fortuna.ical4j.model.component.VEvent;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
 
 import org.sakaiproject.email.api.AddressValidationException;
 import org.sakaiproject.email.api.Attachment;

diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml
@@ -128,10 +128,6 @@
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/...src/main/java/au/edu/anu/portal/portlets/rss/validator/SimpleRSSPreferencesValidator.java b/...src/main/java/au/edu/anu/portal/portlets/rss/validator/SimpleRSSPreferencesValidator.java
@@ -23,7 +23,7 @@
 import javax.portlet.ValidatorException;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.UrlValidator;
+import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.commons.validator.routines.IntegerValidator;
 
 import au.edu.anu.portal.portlets.rss.utils.Constants;

diff --git a/...rc/java/org/sakaiproject/site/tool/helper/participant/impl/SiteAddParticipantHandler.java b/...rc/java/org/sakaiproject/site/tool/helper/participant/impl/SiteAddParticipantHandler.java
@@ -29,7 +29,8 @@
 import org.apache.commons.collections.Predicate;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.EmailValidator;
+import org.apache.commons.validator.routines.EmailValidator;
+
 import uk.org.ponder.messageutil.MessageLocator;
 import uk.org.ponder.messageutil.TargettedMessage;
 import uk.org.ponder.messageutil.TargettedMessageList;

diff --git a/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java b/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java
@@ -30,7 +30,7 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.validator.UrlValidator;
+import org.apache.commons.validator.routines.UrlValidator;
 
 import org.sakaiproject.authz.api.AuthzGroup;
 import org.sakaiproject.authz.api.GroupNotDefinedException;