From c39f6552f63a942f7f97a70df03c0f8f166a8f56 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 24 Jan 2014 13:41:46 +0000
Subject: QPID-5048: Moved test-scope logging dependencies to being compile
 scope dependencies of qpid-test-utils, which other modules depend on at test
 scope. Workaround for maven scope dependency resolution issue causing system
 test run problems.

Patch supplied by Andrew MacBean <andymacbean@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1560999 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/pom.xml                 | 20 --------------------
 qpid/java/qpid-test-utils/pom.xml | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 20 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index c8875fb39b..54395ed4fe 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -135,26 +135,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j-version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>${slf4j-version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j-version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <modules>
diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml
index 17422d5378..a0acfec072 100644
--- a/qpid/java/qpid-test-utils/pom.xml
+++ b/qpid/java/qpid-test-utils/pom.xml
@@ -40,6 +40,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>${slf4j-version}</version>
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
-- 
cgit v1.2.1