summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-01-24 13:41:46 +0000
committerRobert Gemmell <robbie@apache.org>2014-01-24 13:41:46 +0000
commit284cb000f17c236e7fa98897762a52cda7c6f303 (patch)
tree9bda94d5b66fd7fe7bbff6656964d9fd6a5ca60d /java
parentbee3b7927b5fcd401b4f5867b3069000ea35f727 (diff)
downloadqpid-python-284cb000f17c236e7fa98897762a52cda7c6f303.tar.gz
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/qpid@1560999 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/pom.xml20
-rw-r--r--java/qpid-test-utils/pom.xml14
2 files changed, 14 insertions, 20 deletions
diff --git a/java/pom.xml b/java/pom.xml
index c8875fb39b..54395ed4fe 100644
--- a/java/pom.xml
+++ b/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/java/qpid-test-utils/pom.xml b/java/qpid-test-utils/pom.xml
index 17422d5378..a0acfec072 100644
--- a/java/qpid-test-utils/pom.xml
+++ b/java/qpid-test-utils/pom.xml
@@ -41,6 +41,20 @@
</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>
<version>1.0</version>