From 0d53bd99169f1eed245c05fad366372618a648ca Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 12 Jan 2007 11:00:34 +0000
Subject: QPID-278 broker distribution - modified to allow assembly:directory
 builds broker/pom.xml - moved slf4j to common/pom.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@495549 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/distribution/pom.xml | 3 +++
 java/broker/pom.xml              | 7 -------
 java/common/pom.xml              | 7 +++++++
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'java')

diff --git a/java/broker/distribution/pom.xml b/java/broker/distribution/pom.xml
index e16ac35e07..9875e9bf2b 100644
--- a/java/broker/distribution/pom.xml
+++ b/java/broker/distribution/pom.xml
@@ -65,6 +65,9 @@
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>${assembly.version}</version>
                     <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/broker-bin.xml</descriptor>
+                            </descriptors>
                         <finalName>qpid-${pom.version}</finalName>
                         <outputDirectory>${qpid.targetDir}</outputDirectory>
                         <tarLongFileMode>gnu</tarLongFileMode>
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index dd6a2279da..339d90ef9e 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -63,13 +63,6 @@
             <artifactId>commons-lang</artifactId>
         </dependency>
 
-<!-- This is a mina dependency but it isn't being picked up-->
-       <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-       </dependency>
-
-
 <!-- Test Dependencies -->
         <dependency>
             <groupId>junit</groupId>
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 654f6dcde3..3a7d971173 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -74,6 +74,13 @@
             <artifactId>log4j</artifactId>
         </dependency>
 
+
+<!-- This is a mina dependency but it isn't being picked up-->
+       <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+       </dependency>
+
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-java5</artifactId>
-- 
cgit v1.2.1