From 7169b81000e5d306e3aaa8ff1f9a0189377f5c93 Mon Sep 17 00:00:00 2001
From: Greg Turnquist <gturnquist@pivotal.io>
Date: Thu, 22 Aug 2019 18:38:21 -0500
Subject: [PATCH] SWS-1072 - Resolve version conflict with commons-codec.

---
 pom.xml                    | 2 +-
 spring-ws-security/pom.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 323b0495..be0d73f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
 		<commons-io.version>2.5</commons-io.version>
 		<dom4j.version>1.6.1</dom4j.version>
 		<easymock.version>3.6</easymock.version>
-		<ehcache.version>2.10.4</ehcache.version>
+		<ehcache.version>2.10.6</ehcache.version>
 		<httpclient.version>4.5.3</httpclient.version>
 		<javax-mail.version>1.6.0</javax-mail.version>
 		<javax-servlet.version>3.1.0</javax-servlet.version>
diff --git a/spring-ws-security/pom.xml b/spring-ws-security/pom.xml
index 9c3962d4..7f948dc3 100644
--- a/spring-ws-security/pom.xml
+++ b/spring-ws-security/pom.xml
@@ -125,6 +125,10 @@
 					<groupId>org.slf4j</groupId>
 					<artifactId>slf4j-api</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>commons-codec</groupId>
+					<artifactId>commons-codec</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>