summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/broker/distribution/pom.xml3
-rw-r--r--java/broker/pom.xml7
-rw-r--r--java/common/pom.xml7
3 files changed, 10 insertions, 7 deletions
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>