6 files changed, 8 insertions, 1 deletions
diff --git a/qpid/java/bdbstore/jmx/build.xml b/qpid/java/bdbstore/jmx/build.xml
index aaba2bc958..d4ce4ea7d1 100644
--- a/qpid/java/bdbstore/jmx/build.xml
+++ b/qpid/java/bdbstore/jmx/build.xml
@@ -23,6 +23,7 @@
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided"/>
 
     <import file="../../module.xml" />
 
diff --git a/qpid/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
index 834f4180b2..df3346788c 100644
--- a/qpid/java/broker-plugins/access-control/build.xml
+++ b/qpid/java/broker-plugins/access-control/build.xml
@@ -23,6 +23,7 @@
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
 
     <property name="broker-plugins-access-control.libs" value=""/>
 
diff --git a/qpid/java/broker-plugins/firewall/build.xml b/qpid/java/broker-plugins/firewall/build.xml
index d50ce5ab42..6ae6a35b89 100644
--- a/qpid/java/broker-plugins/firewall/build.xml
+++ b/qpid/java/broker-plugins/firewall/build.xml
@@ -23,6 +23,7 @@
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
 
     <property name="broker-plugins-firewall.libs" value=""/>
 
diff --git a/qpid/java/broker-plugins/jmx/build.xml b/qpid/java/broker-plugins/jmx/build.xml
index 42804753cb..a5dd87c6f9 100644
--- a/qpid/java/broker-plugins/jmx/build.xml
+++ b/qpid/java/broker-plugins/jmx/build.xml
@@ -37,6 +37,7 @@
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-management-common=provided"/>
 
     <property name="broker-plugins-jmx.libs" value=""/>
 
diff --git a/qpid/java/broker-plugins/management/build.xml b/qpid/java/broker-plugins/management/build.xml
index 16057ece26..daa361b7a2 100644
--- a/qpid/java/broker-plugins/management/build.xml
+++ b/qpid/java/broker-plugins/management/build.xml
@@ -23,6 +23,7 @@
     <property name="module.manifest" value="MANIFEST.MF" />
     <property name="module.plugin" value="true" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
 
     <property name="broker-plugins-management.libs" value=""/>
 
diff --git a/qpid/java/genpom b/qpid/java/genpom
index 07a5b82a1f..6ac0e970cc 100755
--- a/qpid/java/genpom
+++ b/qpid/java/genpom
@@ -111,8 +111,10 @@ for module in module_depends:
       <groupId>%s</groupId>
       <artifactId>%s</artifactId>
       <version>%s</version>
+      <scope>%s</scope>
     </dependency>
-""" % (opts.group, artifactId, opts.version))
+""" % (opts.group, artifactId, opts.version,
+       scopes.get(artifactId, "compile")))
 
 for jar in jars:
   base, ext = os.path.splitext(os.path.basename(jar))