killbill-aplcache

beatrix: fix commons-io dependency conflict Signed-off-by:

2/15/2013 4:52:15 PM

Changes

beatrix/pom.xml 4(+4 -0)

pom.xml 5(+5 -0)

Details

beatrix/pom.xml 4(+4 -0)

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 5ccf002..9a3403d 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -77,6 +77,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.skife.config</groupId>
             <artifactId>config-magic</artifactId>
         </dependency>

pom.xml 5(+5 -0)

diff --git a/pom.xml b/pom.xml
index c5c94d8..c096c2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,6 +374,11 @@
                 <version>1.2</version>
             </dependency>
             <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.1</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
                 <version>1.2.1</version>