From f4c5264cc8fe62cd17703d21457f3161150d6fa6 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 14 Dec 2020 13:10:26 +0100
Subject: [PATCH] Updating dependency, thereby fixing compilation issues with
package being available from more than one source
---
pom.xml | 3 ++-
src/main/java/no/nibio/vips/util/WebUtil.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e519949..3469306 100755
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
+ <version>1.7</version>
<type>jar</type>
</dependency>
<dependency>
@@ -63,6 +63,7 @@
<artifactId>jython-standalone</artifactId>
<version>2.7.0</version>
<type>jar</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
diff --git a/src/main/java/no/nibio/vips/util/WebUtil.java b/src/main/java/no/nibio/vips/util/WebUtil.java
index 06c4805..dcaedba 100755
--- a/src/main/java/no/nibio/vips/util/WebUtil.java
+++ b/src/main/java/no/nibio/vips/util/WebUtil.java
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
import static java.util.stream.Collectors.toList;
import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
-import org.apache.commons.validator.UrlValidator;
+import org.apache.commons.validator.routines.UrlValidator;
import org.apache.http.HttpResponse;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
--
GitLab