Return-Path: 
 <activemq-commits-return-4074-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 26919 invoked from network); 17 Nov 2006 00:56:50 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Nov 2006 00:56:50 -0000
Received: (qmail 43425 invoked by uid 500); 17 Nov 2006 00:57:00 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 43399 invoked by uid 500); 17 Nov 2006 00:57:00 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 43390 invoked by uid 99); 17 Nov 2006 00:57:00 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 16:57:00 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 16:56:49 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 15EB31A9846; Thu, 16 Nov 2006 16:56:18 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r476007 - in /incubator/activemq/trunk:
 activemq-console/pom.xml
 activemq-core/pom.xml assembly/pom.xml pom.xml
Date: Fri, 17 Nov 2006 00:56:17 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061117005618.15EB31A9846@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chirino
Date: Thu Nov 16 16:56:16 2006
New Revision: 476007

URL: http://svn.apache.org/viewvc?view=rev&rev=476007
Log:
More Java 5 Ehancements.
 - Use activeio-3.1 snapshot since that has been upgraded to Java 5
 - Don't need mx4j since Java 5 includes a JMX server


Modified:
    incubator/activemq/trunk/activemq-console/pom.xml
    incubator/activemq/trunk/activemq-core/pom.xml
    incubator/activemq/trunk/assembly/pom.xml
    incubator/activemq/trunk/pom.xml

Modified: incubator/activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-console/pom.xml?view=diff&rev=476007&r1=476006&r2=476007
==============================================================================
--- incubator/activemq/trunk/activemq-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-console/pom.xml Thu Nov 16 16:56:16 2006
@@ -62,27 +62,6 @@
     </dependency>
 
     <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-jmx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-remote</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-tools</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-impl</artifactId>
-    </dependency>
-    
-    <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
     </dependency>

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/pom.xml?view=diff&rev=476007&r1=476006&r2=476007
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Thu Nov 16 16:56:16 2006
@@ -387,26 +387,7 @@
           <groupId>activesoap</groupId>
           <artifactId>jaxp-api</artifactId>
         </dependency>
-        <dependency>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j-jmx</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j-remote</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j-tools</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j-impl</artifactId>
-        </dependency>
+
       </dependencies>
     </profile>
   </profiles>

Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/pom.xml?view=diff&rev=476007&r1=476006&r2=476007
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Thu Nov 16 16:56:16 2006
@@ -122,14 +122,6 @@
       <groupId>xmlpull</groupId>
       <artifactId>xmlpull</artifactId>
     </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-remote</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>log4j</groupId>

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/pom.xml?view=diff&rev=476007&r1=476006&r2=476007
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Thu Nov 16 16:56:16 2006
@@ -214,7 +214,7 @@
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activeio-core</artifactId>
-        <version>3.x-incubator-SNAPSHOT</version>
+        <version>3.1-incubator-SNAPSHOT</version>
       </dependency>
 	  <dependency>
         <groupId>org.apache.activemq</groupId>
@@ -289,34 +289,6 @@
             <artifactId>qdox</artifactId>
           </exclusion>
         </exclusions>
-        <!--
-          <exclusions>
-          <exclusion>
-          <groupId>backport-util-concurrent</groupId>
-          <artifactId>backport-util-concurrent</artifactId>
-          </exclusion>
-          <exclusion>
-          <groupId>ant</groupId>
-          <artifactId>ant</artifactId>
-          </exclusion>
-          <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-          </exclusion>
-          <exclusion>
-          <groupId>mx4j</groupId>
-          <artifactId>mx4j</artifactId>
-          </exclusion>
-          <exclusion>
-          <groupId>qdox</groupId>
-          <artifactId>qdox</artifactId>
-          </exclusion>
-          <exclusion>
-          <groupId>stax</groupId>
-          <artifactId>stax-api</artifactId>
-          </exclusion>
-          </exclusions>
-        -->
 
       </dependency>
 
@@ -525,31 +497,6 @@
         <artifactId>jmdns</artifactId>
         <version>1.0-RC2</version>
       </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-jmx</artifactId>
-        <version>${mx4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-remote</artifactId>
-        <version>${mx4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-tools</artifactId>
-        <version>${mx4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j-impl</artifactId>
-        <version>${mx4j-version}</version>
-      </dependency>
 
       <dependency>
         <groupId>xstream</groupId>
@@ -940,7 +887,6 @@
     <junit-version>3.8.1</junit-version>
     <jxta-version>2.0</jxta-version>
     <log4j-version>1.2.12</log4j-version>
-    <mx4j-version>2.1.1</mx4j-version>
     <org-apache-derby-version>10.1.1.0</org-apache-derby-version>
     <org-apache-geronimo-specs-version>1.0</org-apache-geronimo-specs-version>
     <org-apache-maven-surefire-plugin-version>2.2</org-apache-maven-surefire-plugin-version>