From 43e4de429e0306bb39ccd5a2ead6bd2778fa2a46 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@godaddy.com>
Date: Tue, 28 Aug 2012 09:03:25 -0700
Subject: [PATCH] Fix up some dependencies

---
 pom.xml        |  5 +++++
 server/pom.xml | 10 +++++-----
 utils/pom.xml  | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e21334c07fb..21592c937dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,9 @@
     <cs.pool.version>1.6</cs.pool.version>
     <cs.codec.version>1.6</cs.codec.version>
     <cs.configuration.version>1.8</cs.configuration.version>
+    <cs.collections.version>3.2.1</cs.collections.version>
+    <cs.logging.version>1.1.1</cs.logging.version>
+    <cs.discovery.version>0.5</cs.discovery.version>
     <cs.ejb.version>3.0</cs.ejb.version>
     <cs.junit.version>4.10</cs.junit.version>
     <cs.bcprov.version>1.46</cs.bcprov.version>
@@ -75,6 +78,8 @@
     <cs.hibernate.version>3.5.1-Final</cs.hibernate.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.4</cs.servlet.version>
+    <cs.jstl.version>1.2</cs.jstl.version>
+
     <skipTests>true</skipTests>
 
   </properties>
diff --git a/server/pom.xml b/server/pom.xml
index f8d7985d7da..3731f71bccb 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -59,11 +59,11 @@
       <artifactId>mail</artifactId>
       <version>${cs.mail.version}</version>
     </dependency>
-    <!-- <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-utils</artifactId>
-       <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
-       </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-agent</artifactId>
-       <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope>
-       </dependency> -->
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${cs.jstl.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>
diff --git a/utils/pom.xml b/utils/pom.xml
index a9b276a844d..0124fdb4612 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
+      <artifactId>cglib-nodep</artifactId>
       <version>${cs.cglib.version}</version>
     </dependency>
     <dependency>
@@ -63,6 +63,21 @@
       <artifactId>commons-codec</artifactId>
       <version>${cs.codec.version}</version>
     </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${cs.collections.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-discovery</groupId>
+      <artifactId>commons-discovery</artifactId>
+      <version>${cs.discovery.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${cs.logging.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk16</artifactId>