From 7a42009f0e4e38e4f2278d57d0865d2c8ee50bfe Mon Sep 17 00:00:00 2001
From: "sharedocs1@gmail.com"
 <sharedocs1@gmail.com@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Thu, 17 Dec 2009 15:15:26 +0000
Subject: [PATCH] Ensured the core and the httpnio projects use the same
 version of jetty

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2451 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 core/pom.xml               |  7 +++++--
 extensions/httpnio/pom.xml |  3 +--
 project/pom.xml            | 10 +++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 1c91cccbf5..ea861eae78 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -94,7 +94,6 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>7.0.0pre3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -142,11 +141,15 @@
                                 <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
                                 <jarjar destfile="${build.directory}/${build.finalName}-jar-with-dependencies.jar"
                                         update="true">
-                                    <!-- Replace "javax.x.y.." with "org.jclouds.repackaged.javax.x.y..".
+                                    <!-- Replace "x.y.." with "org.jclouds.repackaged.x.y..". Note: can't deal with package-info.class files.
                                       See http://code.google.com/p/jarjar/wiki/CommandLineDocs for more informtion on jarjar rules. -->
                                     <rule pattern="javax.annotation.**" result="${groupId}.repackaged.@0"/>
                                     <rule pattern="javax.inject.**" result="${groupId}.repackaged.@0"/>
                                     <rule pattern="javax.ws.**" result="${groupId}.repackaged.@0"/>
+                                    <!-- google-guava and google-collections -->
+                                    <rule pattern="com.google.common.**" result="${groupId}.repackaged.@0"/>
+                                    <!-- guice -->
+                                    <rule pattern="com.google.inject.**" result="${groupId}.repackaged.@0"/>
                                 </jarjar>
                             </tasks>
                         </configuration>
diff --git a/extensions/httpnio/pom.xml b/extensions/httpnio/pom.xml
index eb96944576..d867bf4c93 100644
--- a/extensions/httpnio/pom.xml
+++ b/extensions/httpnio/pom.xml
@@ -43,11 +43,9 @@
     </scm>
 
     <dependencies>
-        <!-- TODO find out how to get this transatively from core -->
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.16</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -56,4 +54,5 @@
             <version>4.1-alpha1</version>
         </dependency>
     </dependencies>
+    
 </project>
diff --git a/project/pom.xml b/project/pom.xml
index 6bbc0d7374..9d32dc3e42 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -175,6 +175,15 @@
         <jclouds.test.listener>org.jclouds.test.testng.UnitTestStatusListener</jclouds.test.listener>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>7.0.0pre3</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.testng</groupId>
@@ -192,7 +201,6 @@
     </dependencies>
 
     <build>
-    
         <plugins>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>