From a73f6ad182126bef6b396214413ef666f2d14232 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 12 Mar 2013 11:27:50 +0000
Subject: 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/qpid@1455497 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/build.xml | 4 ++--
 java/ivy.nexus.xml    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'java')

diff --git a/java/broker/build.xml b/java/broker/build.xml
index e16e0bf52d..1dc498392d 100644
--- a/java/broker/build.xml
+++ b/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/java/ivy.nexus.xml b/java/ivy.nexus.xml
index 36b49f27d9..f47aab7454 100644
--- a/java/ivy.nexus.xml
+++ b/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/>
-- 
cgit v1.2.1