Index: console-tomcat/src/conf/geronimo-plugin.xml
===================================================================
--- console-tomcat/src/conf/geronimo-plugin.xml	(revision 398315)
+++ console-tomcat/src/conf/geronimo-plugin.xml	(working copy)
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<geronimo-plugin>
-<configuration>
-<name>Geronimo Admin Console (Tomcat)</name>
-<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
-<category>Core Geronimo</category>
-<description>The web-based administration console for Geronimo.  You can
-reach it via HTTP at /console and use it to configure the Geronimo
-installation as well as services like JDBC connection pools, JMS resources,
-security realms, keystores, etc.  It provides simple statistics on the
-running Geronimo server, as well as letting you review and deploy applications
-and plugins.</description>
-<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
-<geronimo-version>${pom.currentVersion}</geronimo-version>
-<prerequisite>
-<id>geronimo/tomcat//car</id>
-<resource-type>Web Container</resource-type>
-<description>This version of the admin console works with the Geronimo/Tomcat distribution.
-It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
-of the admin console that works with Jetty.  Please install the version appropriate to
-your Geronimo distribution.</description>
-</prerequisite>
-<dependency>geronimo/j2ee-server//car</dependency>
-<dependency>geronimo/j2ee-security//car</dependency>
-<dependency>portlet-api/portlet-api/1.0/jar</dependency>
-<dependency>org.apache.pluto/pluto/1.0.1/jar</dependency>
-<dependency>geronimo/geronimo-console-core//jar</dependency>
-<dependency>geronimo/geronimo-management//jar</dependency>
-<dependency>geronimo/geronimo-test-ddbean//jar</dependency>
-<dependency>geronimo/geronimo-deploy-jsr88//jar</dependency>
-<dependency>geronimo/geronimo-deploy-config//jar</dependency>
-<dependency>geronimo/geronimo-service-builder//jar</dependency>
-<dependency>geronimo/geronimo-connector-builder//jar</dependency>
-<dependency>geronimo/geronimo-naming-builder//jar</dependency>
-<dependency>geronimo/geronimo-security-builder//jar</dependency>
-<dependency>geronimo/geronimo-j2ee-schema//jar</dependency>
-<dependency>xmlbeans/xbean/2.0.0/jar</dependency>
-<dependency>stax/stax-api/1.0/jar</dependency>
-<dependency>activemq/activemq-gbean-management/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>activemq/activemq-gbean/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>activemq/activemq-core/3.2.4-SNAPSHOT/jar</dependency>
-<dependency>geronimo/geronimo-converter//jar</dependency>
-<dependency>geronimo/geronimo-util//jar</dependency>
-</configuration>
-<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
-<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
-</geronimo-plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<geronimo-plugin>
+<configuration>
+<name>Geronimo Admin Console (Tomcat)</name>
+<config-id>${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car</config-id>
+<category>Core Geronimo</category>
+<description>The web-based administration console for Geronimo.  You can
+reach it via HTTP at /console and use it to configure the Geronimo
+installation as well as services like JDBC connection pools, JMS resources,
+security realms, keystores, etc.  It provides simple statistics on the
+running Geronimo server, as well as letting you review and deploy applications
+and plugins.</description>
+<license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+<geronimo-version>${pom.currentVersion}</geronimo-version>
+<prerequisite>
+<id>geronimo/tomcat//car</id>
+<resource-type>Web Container</resource-type>
+<description>This version of the admin console works with the Geronimo/Tomcat distribution.
+It is not intended to run in the Geronimo/Jetty distribution.  There is a separate version
+of the admin console that works with Jetty.  Please install the version appropriate to
+your Geronimo distribution.</description>
+</prerequisite>
+<dependency>geronimo/j2ee-server//car</dependency>
+<dependency>geronimo/j2ee-security//car</dependency>
+<dependency>portlet-api/portlet-api/${portlet_api_version}/jar</dependency>
+<dependency>org.apache.pluto/pluto/${pluto_version}/jar</dependency>
+<dependency>geronimo/geronimo-console-core//jar</dependency>
+<dependency>geronimo/geronimo-management//jar</dependency>
+<dependency>geronimo/geronimo-test-ddbean//jar</dependency>
+<dependency>geronimo/geronimo-deploy-jsr88//jar</dependency>
+<dependency>geronimo/geronimo-deploy-config//jar</dependency>
+<dependency>geronimo/geronimo-service-builder//jar</dependency>
+<dependency>geronimo/geronimo-connector-builder//jar</dependency>
+<dependency>geronimo/geronimo-naming-builder//jar</dependency>
+<dependency>geronimo/geronimo-security-builder//jar</dependency>
+<dependency>geronimo/geronimo-j2ee-schema//jar</dependency>
+<dependency>xmlbeans/xbean/${xmlbeans_version}/jar</dependency>
+<dependency>stax/stax-api/${stax_api_version}/jar</dependency>
+<dependency>activemq/activemq-gbean-management-g1_1/${activemq_version}/jar</dependency>
+<dependency>activemq/activemq-gbean-g1_1/${activemq_version}/jar</dependency>
+<dependency>activemq/activemq-core/${activemq_version}/jar</dependency>
+<dependency>geronimo/geronimo-converter//jar</dependency>
+<dependency>geronimo/geronimo-util//jar</dependency>
+</configuration>
+<source-repository>http://www.geronimoplugins.com/repository/</source-repository>
+<backup-repository>http://www.ibiblio.org/maven2/</backup-repository>
+</geronimo-plugin>
Index: system-database/project.xml
===================================================================
--- system-database/project.xml	(revision 398315)
+++ system-database/project.xml	(working copy)
@@ -269,12 +269,6 @@
             <artifactId>activeio</artifactId>
             <version>${activeio_version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jetty_version}</version>
-        </dependency>
     </dependencies>
 </project>
 
Index: rmi-naming/project.xml
===================================================================
--- rmi-naming/project.xml	(revision 398315)
+++ rmi-naming/project.xml	(working copy)
@@ -355,11 +355,6 @@
              </properties>
         </dependency>
 
-        <dependency>
-            <groupId>jetty</groupId>
-            <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jetty_version}</version>
-        </dependency>
     </dependencies>
 </project>