Author: robbie
Date: Fri Jun 29 13:54:07 2012
New Revision: 1355391
URL: http://svn.apache.org/viewvc?rev=1355391&view=rev
Log:
QPID-4098: update POM generation for the plugins to mark the dependencies as
being provided (by the broker itself) at runtime
Modified:
qpid/trunk/qpid/java/bdbstore/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/management/build.xml
qpid/trunk/qpid/java/genpom
Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Fri Jun 29 13:54:07 2012
@@ -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" />
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 29
13:54:07 2012
@@ -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=""/>
Modified: qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/build.xml?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/build.xml Fri Jun 29 13:54:07
2012
@@ -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=""/>
Modified: qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jmx/build.xml?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jmx/build.xml Fri Jun 29 13:54:07 2012
@@ -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=""/>
Modified: qpid/trunk/qpid/java/broker-plugins/management/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/build.xml?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management/build.xml Fri Jun 29
13:54:07 2012
@@ -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=""/>
Modified: qpid/trunk/qpid/java/genpom
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/genpom?rev=1355391&r1=1355390&r2=1355391&view=diff
==============================================================================
--- qpid/trunk/qpid/java/genpom (original)
+++ qpid/trunk/qpid/java/genpom Fri Jun 29 13:54:07 2012
@@ -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))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
