summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-03-12 11:27:50 +0000
committerRobert Gemmell <robbie@apache.org>2013-03-12 11:27:50 +0000
commit8f1492142b5a48c6cb6fc3a6a0e6e3fe61248e11 (patch)
treec11600dfbee5d3dec424456bb249618e69a8c699
parent61929f2a04c84a3c0205e7dccaa5a1e535c149d2 (diff)
downloadqpid-python-8f1492142b5a48c6cb6fc3a6a0e6e3fe61248e11.tar.gz
QPID-4645: the firewall plugin no longer exists, functionality is aprt of the access-control plugin now
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1455497 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker/build.xml4
-rw-r--r--qpid/java/ivy.nexus.xml1
2 files changed, 2 insertions, 3 deletions
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index e16e0bf52d..1dc498392d 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -25,9 +25,9 @@
<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 bdbstore/jmx"/>
+ <property name="module.maven.depends" value="broker-plugins/management-http broker-plugins/management-jmx broker-plugins/access-control bdbstore bdbstore/jmx"/>
<!-- 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 -Oqpid-bdbstore-jmx"/>
+ <property name="module.genpom.args" value="-Oqpid-broker-plugins-management-http -Oqpid-broker-plugins-management-jmx -Oqpid-broker-plugins-access-control -Oqpid-bdbstore -Oqpid-bdbstore-jmx"/>
<import file="../module.xml"/>
diff --git a/qpid/java/ivy.nexus.xml b/qpid/java/ivy.nexus.xml
index 36b49f27d9..f47aab7454 100644
--- a/qpid/java/ivy.nexus.xml
+++ b/qpid/java/ivy.nexus.xml
@@ -103,7 +103,6 @@
<artifact name="qpid-ra" type="pom.asc" ext="pom.asc"/>
<artifact name="qpid-ra" type="rar" ext="rar"/>
<artifact name="qpid-ra" type="rar.asc" ext="rar.asc"/>
-
</publications>
<dependencies/>