Return-Path: 
 <scm-return-38610-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 78809 invoked from network); 23 Sep 2009 12:41:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 Sep 2009 12:41:22 -0000
Received: (qmail 76140 invoked by uid 500); 23 Sep 2009 12:41:21 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 76095 invoked by uid 500); 23 Sep 2009 12:41:21 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 76086 invoked by uid 99); 23 Sep 2009 12:41:21 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 12:41:21 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Sep 2009 12:41:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 60EC923888CB; Wed, 23 Sep 2009 12:40:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r818080 - in
 /geronimo/server/trunk/plugins/clustering/plugin-farm-member: pom.xml
 src/main/history/dependencies.xml
Date: Wed, 23 Sep 2009 12:40:57 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090923124057.60EC923888CB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Wed Sep 23 12:40:56 2009
New Revision: 818080

URL: http://svn.apache.org/viewvc?rev=818080&view=rev
Log:
merged in r817913 from 2.2 branch

Modified:
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
    geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml?rev=818080&r1=818079&r2=818080&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/pom.xml Wed Sep 23 12:40:56 2009
@@ -54,6 +54,13 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>jmx-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-farm</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml?rev=818080&r1=818079&r2=818080&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/clustering/plugin-farm-member/src/main/history/dependencies.xml Wed Sep 23 12:40:56 2009
@@ -13,8 +13,8 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-jmx-remoting</artifactId>
-        <type>jar</type>
+        <artifactId>jmx-security</artifactId>
+        <type>car</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>