From 8f32ca18d5281eaa5baafa769c99fa70c830b14f Mon Sep 17 00:00:00 2001
From: Stephen Vinoski <vinoski@apache.org>
Date: Fri, 24 Nov 2006 23:40:12 +0000
Subject: properly limit scope for test-only dependencies

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@479050 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/pom.xml   |  7 -------
 java/client/pom.xml   |  6 +++++-
 java/cluster/pom.xml  |  5 -----
 java/common/pom.xml   |  5 -----
 java/pom.xml          | 28 +++++++++-------------------
 java/systests/pom.xml |  5 -----
 6 files changed, 14 insertions(+), 42 deletions(-)

(limited to 'java')

diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 4f23c6c63e..5a2c699cc1 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -41,7 +41,6 @@
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-common</artifactId>
         </dependency>
-
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
@@ -66,7 +65,6 @@
             <groupId>backport-util-concurrent</groupId>
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
@@ -75,14 +73,9 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-junit</artifactId>            
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 915f51245c..25372772af 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -77,6 +77,7 @@
             <groupId>jmscts</groupId>
             <artifactId>jmscts</artifactId>
             <version>0.5-b2</version>
+            <scope>test</scope>
             <exclusions>
                 <exclusion>
                     <groupId>jms</groupId>
@@ -85,10 +86,13 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/java/cluster/pom.xml b/java/cluster/pom.xml
index 7b198a70d3..93fe4a7517 100644
--- a/java/cluster/pom.xml
+++ b/java/cluster/pom.xml
@@ -53,11 +53,6 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>      
     </dependency>
-    <dependency>
-      <groupId>ant</groupId>
-      <artifactId>ant-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index b0d68a3559..e655054453 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -47,7 +47,6 @@
 
     <build>
         <plugins>          
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -91,9 +90,5 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-junit</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/java/pom.xml b/java/pom.xml
index e0d1e3154e..5703ded592 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -253,13 +253,11 @@
 
     <dependencyManagement>
         <dependencies>
-
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
                 <version>1.0</version>
             </dependency>
-
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
@@ -270,25 +268,28 @@
                 <artifactId>commons-collections</artifactId>
                 <version>3.1</version>
             </dependency>
-
             <dependency>
                 <groupId>commons-configuration</groupId>
                 <artifactId>commons-configuration</artifactId>
                 <version>1.2</version>
             </dependency>
-
             <dependency>
-
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
                 <version>2.1</version>
+                <exclusions>
+                    <!-- this seems to have a junit compile dependency -->
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
                 <version>1.0.4</version>
             </dependency>
-
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -304,12 +305,6 @@
                 <artifactId>saxon</artifactId>
                 <version>8.7</version>
             </dependency>
-
-            <dependency>
-                <groupId>jython</groupId>
-                <artifactId>jython</artifactId>
-                <version>2.1</version>
-            </dependency>
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
@@ -343,14 +338,9 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.2</version>
-            </dependency>
-            <dependency>
-                <groupId>ant</groupId>
-                <artifactId>ant-junit</artifactId>
-                <version>1.6.5</version>
+                <version>3.8.1</version>
+                <scope>test</scope>
             </dependency>
-
             <dependency>
                 <groupId>org.easymock</groupId>
                 <artifactId>easymockclassextension</artifactId>
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index ae6558340f..bf0afa7eef 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -58,11 +58,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant-junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
-- 
cgit v1.2.1