diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-06-19 14:53:29 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-06-19 14:53:29 +0000 |
| commit | 7e4c859715e60572f391c781944c901ce45db42c (patch) | |
| tree | 59fd4dc2c807946a5fa51cfd8a733d8849aefb0f /qpid/java/broker | |
| parent | 8c8ee073330c02ba451a7a1a57e7da7110e4d8c0 (diff) | |
| download | qpid-python-7e4c859715e60572f391c781944c901ce45db42c.tar.gz | |
Fixed outstanding merge issues and updates to trunk code that were required for sl4j.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@548753 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/pom.xml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml index 58200a81b1..bad0d8a52d 100644 --- a/qpid/java/broker/pom.xml +++ b/qpid/java/broker/pom.xml @@ -49,6 +49,18 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.0</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.4.0</version> + </dependency> + + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -64,7 +76,7 @@ </dependency> <!-- Test Dependencies --> - <dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <version>1.4.0</version> @@ -180,8 +192,8 @@ <tasks> <condition property="broker.dir" - else="${user.dir}${file.separator}broker" - value="${user.dir}"> + else="${user.dir}${file.separator}broker" + value="${user.dir}"> <contains string="${user.dir}" substring="broker" /> </condition> |