QPID-4645: add the broker-plugins and bdbstore moudles as optional dependencies in the broker pom to simplify their use, make the bdbstore plugin match the others by using provided scope for the brokers modules (and the JE dep)

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1455361 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 17 insertions, 2 deletions

diff --git a/java/bdbstore/build.xml b/java/bdbstore/build.xml
index 46809f6a90..1a749fab39 100644
--- a/java/bdbstore/build.xml
+++ b/java/bdbstore/build.xml
@@ -20,6 +20,7 @@
     <property name="module.depends" value="common broker" />
     <property name="module.test.depends" value="client common/tests broker/tests management/common systests broker-plugins/management-jmx" />
     <property name="module.genpom" value="true"/>
+    <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sje=provided"/>
 
     <import file="../module.xml" />
 
diff --git a/java/broker/build.xml b/java/broker/build.xml
index 8581b7c639..594c55a578 100644
--- a/java/broker/build.xml
+++ b/java/broker/build.xml
@@ -24,6 +24,11 @@
     <property name="module.main" value="org.apache.qpid.server.Main"/>
     <property name="module.genpom" value="true"/>
 
+    <!-- Add dependencies to the broker pom for the broker-plugins and bdbstore modules -->
+    <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control broker-plugins/firewall bdbstore"/>
+    <!-- Make them optional -->
+    <property name="module.genpom.args" value="-Oqpid-broker-plugins-management-http -Oqpid-broker-plugins-management-jmx -Oqpid-broker-plugins-access-control -Oqpid-broker-plugins-firewall -Oqpid-bdbstore"/>
+
     <import file="../module.xml"/>
 
     <property name="output.dir" value="${module.precompiled}/org/apache/qpid/server/filter/jms/selector"/>
diff --git a/java/genpom b/java/genpom
index d18b16cefc..43c0132ecf 100755
--- a/java/genpom
+++ b/java/genpom
@@ -40,6 +40,8 @@ parser.add_option("-s", "--search-path", action="append",
 parser.add_option("-S", "--scope", metavar="ARTIFACT=SCOPE", action="append",
                   default=[],
                   help="specify scope for an artifact")
+parser.add_option("-O", "--optional", action="append", default=[],
+                  help="specify dependencies that are optional")
 parser.add_option("-o", "--output")
 parser.add_option("-t", "--type", default="jar", help="packaging type")
 
@@ -113,9 +115,15 @@ for module in module_depends:
       <artifactId>%s</artifactId>
       <version>%s</version>
       <scope>%s</scope>
-    </dependency>
 """ % (opts.group, artifactId, opts.version,
        scopes.get(artifactId, "compile")))
+  if artifactId in opts.optional:
+    deps.append("""      <optional>true</optional>
+""")
+
+  deps.append("""    </dependency>
+""")
+
 
 for jar in jars:
   base, ext = os.path.splitext(os.path.basename(jar))
diff --git a/java/module.xml b/java/module.xml
index 1ff0be4621..ce54e108c5 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -72,6 +72,7 @@
   <property name="module.release.bz2"  location="${module.release}/${module.namever}.tar.bz2"/>
 
   <property name="module.genpom.args"  value=""/>
+  <property name="module.maven.depends"  value=""/>
   <property name="maven.remote.repo"     value="file://${module.release.base}/maven"/>
 
   <property name="broker.log.prefix" value="BROKER: "/> 
@@ -264,7 +265,7 @@
         <arg line="-g ${project.groupid}"/>
         <arg line="-v ${project.version.maven}${maven.version.suffix}"/>
         <arg line="-p qpid"/>
-        <arg line='-m "${module.depends}"'/>
+        <arg line='-m "${module.depends} ${module.maven.depends}"'/>
         <arg line="-a ${module.name}"/>
         <arg line="${module.genpom.args}"/>
         <arg line="${module.libs}"/>