Return-Path: 
 <scm-return-14126-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 88911 invoked from network); 14 Aug 2006 23:50:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Aug 2006 23:50:05 -0000
Received: (qmail 48839 invoked by uid 500); 14 Aug 2006 23:50:05 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 48808 invoked by uid 500); 14 Aug 2006 23:50:05 -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 48795 invoked by uid 99); 14 Aug 2006 23:50:05 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Aug 2006 16:50:05 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Aug 2006 16:50:03 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 79EFE1A981A; Mon, 14 Aug 2006 16:49:43 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r431473 - in /geronimo/trunk: ./ applications/
 applications/demo/ configs/client-system/ configs/j2ee-system/
 configs/jsp-examples-jetty/ configs/jsp-examples-tomcat/
 configs/online-deployer/ configs/remote-deploy-jetty/ configs/remote-depl...
Date: Mon, 14 Aug 2006 23:49:40 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060814234943.79EFE1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Mon Aug 14 16:49:39 2006
New Revision: 431473

URL: http://svn.apache.org/viewvc?rev=431473&view=rev
Log:
Removed unused properties in root pom
Organized remaining properties with comments where they are used
Removed extra dependencies from cars that produce executable jars

Modified:
    geronimo/trunk/applications/demo/pom.xml
    geronimo/trunk/applications/pom.xml
    geronimo/trunk/configs/client-system/pom.xml
    geronimo/trunk/configs/j2ee-system/pom.xml
    geronimo/trunk/configs/jsp-examples-jetty/pom.xml
    geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
    geronimo/trunk/configs/online-deployer/pom.xml
    geronimo/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/trunk/configs/servlets-examples-jetty/pom.xml
    geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
    geronimo/trunk/modules/directory/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/demo/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/pom.xml (original)
+++ geronimo/trunk/applications/demo/pom.xml Mon Aug 14 16:49:39 2006
@@ -33,11 +33,14 @@
     <packaging>war</packaging>
     
     <dependencies>
+        
         <!-- Required for JSPC compilation -->
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
+            <scope>provided</scope>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/applications/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/applications/pom.xml (original)
+++ geronimo/trunk/applications/pom.xml Mon Aug 14 16:49:39 2006
@@ -44,15 +44,4 @@
         <module>welcome</module>
     </modules>
     
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>tomcat</groupId>
-                <artifactId>jasper-runtime</artifactId>
-                <version>${tomcatVersion}</version>
-                <scope>provided</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    
 </project>

Modified: geronimo/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/pom.xml (original)
+++ geronimo/trunk/configs/client-system/pom.xml Mon Aug 14 16:49:39 2006
@@ -35,29 +35,10 @@
     
     <dependencies>
         
-        <!--
-        TODO: Check which of these dependencies we need listed here.
-        -->
-        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
         </dependency>
         
         <dependency>

Modified: geronimo/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/j2ee-system/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/trunk/configs/j2ee-system/pom.xml Mon Aug 14 16:49:39 2006
@@ -34,11 +34,6 @@
     
     <dependencies>
         
-        <!--
-        TODO: Check which of these dependencies we need listed here.
-        -->
-        
-        <!-- this forces gbean-deployer to be built before j2ee-system -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
@@ -51,42 +46,6 @@
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-        
-        <!--
-        FIXME: These need to be picked up from lib/endorsed
-        -->
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
         </dependency>
         
     </dependencies>

Modified: geronimo/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-jetty/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-jetty/pom.xml Mon Aug 14 16:49:39 2006
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>geronimo-samples</groupId>
             <artifactId>geronimo-jsp-examples-tomcat</artifactId>
-            <version>${tomcatVersion}</version>
             <type>war</type>
         </dependency>
 

Modified: geronimo/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/jsp-examples-tomcat/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/jsp-examples-tomcat/pom.xml Mon Aug 14 16:49:39 2006
@@ -46,7 +46,6 @@
         <dependency>
             <groupId>geronimo-samples</groupId>
             <artifactId>geronimo-jsp-examples-tomcat</artifactId>
-            <version>${tomcatVersion}</version>
             <type>war</type>
         </dependency>
         

Modified: geronimo/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/online-deployer/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/trunk/configs/online-deployer/pom.xml Mon Aug 14 16:49:39 2006
@@ -32,36 +32,6 @@
     <name>Geronimo Configs :: Online Deployer</name>
     <packaging>car</packaging>
     
-    <dependencies>
-        
-        <!--
-        TODO: Check which of these dependencies we need listed here.
-        -->
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-    
-    </dependencies>
-    
     <build>
         <resources>
             <resource>

Modified: geronimo/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/pom.xml Mon Aug 14 16:49:39 2006
@@ -62,7 +62,7 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${pom.version}/geronimo-remote-deploy-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/pom.xml Mon Aug 14 16:49:39 2006
@@ -62,7 +62,7 @@
                         <deploymentConfig>${openejbDeployer}</deploymentConfig>
                         <deploymentConfig>${axisDeployer}</deploymentConfig>
                     </deploymentConfigs>
-                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${geronimoVersion}/geronimo-remote-deploy-${geronimoVersion}.war</moduleFile>
+                    <moduleFile>${settings.localRepository}/org/apache/geronimo/applications/geronimo-remote-deploy/${pom.version}/geronimo-remote-deploy-${pom.version}.war</moduleFile>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/trunk/configs/servlets-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-jetty/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-jetty/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-jetty/pom.xml Mon Aug 14 16:49:39 2006
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>geronimo-samples</groupId>
             <artifactId>geronimo-servlet-examples-tomcat</artifactId>
-            <version>${tomcatVersion}</version>
             <type>war</type>
         </dependency>
         

Modified: geronimo/trunk/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/servlets-examples-tomcat/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/servlets-examples-tomcat/pom.xml Mon Aug 14 16:49:39 2006
@@ -60,7 +60,6 @@
         <dependency>
             <groupId>geronimo-samples</groupId>
             <artifactId>geronimo-servlet-examples-tomcat</artifactId>
-            <version>${tomcatVersion}</version>
             <type>war</type>
         </dependency>
         

Modified: geronimo/trunk/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/directory/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/modules/directory/pom.xml (original)
+++ geronimo/trunk/modules/directory/pom.xml Mon Aug 14 16:49:39 2006
@@ -65,77 +65,56 @@
         <dependency>
             <groupId>directory</groupId>
             <artifactId>apacheds-core</artifactId>
-            <version>${apachedsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory</groupId>
             <artifactId>apacheds-shared</artifactId>
-            <version>${apachedsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-asn1</groupId>
             <artifactId>asn1-codec</artifactId>
-            <version>${asn1Version}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-asn1</groupId>
             <artifactId>asn1-ber</artifactId>
-            <version>${asn1Version}</version>
-            <exclusions>
-                <!--
-                NOTE: Exclude commons-test, no needed for compile, not deployed into any m2 repo.
-                      Where are the sources for this artifact?
-                -->
-                <exclusion>
-                    <groupId>commons-test</groupId>
-                    <artifactId>commons-test</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>directory-asn1</groupId>
             <artifactId>asn1-der</artifactId>
-            <version>${asn1Version}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-shared</groupId>
             <artifactId>apache-ldapber-provider</artifactId>
-            <version>${apachedsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-shared</groupId>
             <artifactId>ldap-common</artifactId>
-            <version>${apachedsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-shared</groupId>
             <artifactId>kerberos-common</artifactId>
-            <version>${kerberosCommonVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-network</groupId>
             <artifactId>mina</artifactId>
-            <version>${minaVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-protocols</groupId>
             <artifactId>kerberos-protocol</artifactId>
-            <version>${kerberosProtocolVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>directory-protocols</groupId>
             <artifactId>ldap-protocol</artifactId>
-            <version>${ldapProtocolVersion}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Mon Aug 14 16:49:39 2006
@@ -74,25 +74,21 @@
         <dependency>
             <groupId>jetty</groupId>
             <artifactId>org.mortbay.jetty</artifactId>
-            <version>${jettyVersion}</version>
         </dependency>
         
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler-jdt</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Mon Aug 14 16:49:39 2006
@@ -127,19 +127,16 @@
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>catalina</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>tomcat-ajp</artifactId>
-            <version>${tomcatAjpVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>catalina-cluster</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <!--
@@ -149,61 +146,51 @@
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>catalina-optional</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>tomcat-coyote</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>tomcat-http</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-compiler-jdt</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>tomcat-util</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>naming-resources</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>servlets-default</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>tomcat</groupId>
             <artifactId>servlets-invoker</artifactId>
-            <version>${tomcatVersion}</version>
         </dependency>
 
         <dependency>
@@ -254,13 +241,11 @@
         <dependency>
             <groupId>wadi</groupId>
             <artifactId>wadi-core</artifactId>
-            <version>${wadiVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>wadi</groupId>
             <artifactId>wadi-tomcat55</artifactId>
-            <version>${wadiVersion}</version>
         </dependency>
         
     </dependencies>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=431473&r1=431472&r2=431473&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Mon Aug 14 16:49:39 2006
@@ -45,46 +45,54 @@
     </scm>
 
     <properties>
+        
         <genesis.version>1.0.0-SNAPSHOT</genesis.version>
 
         <!--
-        HACK: These properties are currently needed in child poms, so we need to keep them around.
-              Usage of these properties should be removed whenever possible.
+        HACK: Used by console-core to generate geronimo-version.properties.
         -->
-
-        <asn1Version>0.3.2</asn1Version>
-        <apachedsVersion>0.9.2</apachedsVersion>
-        <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
-        <backportUtilVersion>2.0_01_pd</backportUtilVersion>
-        <commonsCliVersion>1.0</commonsCliVersion>
-        <commonsLoggingVersion>1.0.4</commonsLoggingVersion>
-        <cglibVersion>2.1_3</cglibVersion>
-        <tomcatVersion>5.5.15</tomcatVersion>
-        <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
-        <derbyVersion>10.1.1.0</derbyVersion>
-        <xpp3Version>1.1.3.3</xpp3Version>
-        <xstreamVersion>1.1.3</xstreamVersion>
-        <xercesVersion>2.6.2</xercesVersion>
-        <xmlApisVersion>1.0.b2</xmlApisVersion>
-        <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
-        <log4jVersion>1.2.8</log4jVersion>
-        <mx4jVersion>3.0.1</mx4jVersion>
         <plutoVersion>1.0.1</plutoVersion>
-        <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
+        <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
+        
+        <!--
+        HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
+        -->
+        <derbyVersion>10.1.1.0</derbyVersion>
+        
+        <!--
+        HACK: Used by jsp and servlet example configs to point to the tomcat deployer
+        -->
+        <tomcatVersion>5.5.15</tomcatVersion>
+        
+        <!--
+        HACK: Used by system-database, uddi-jetty and uddi-tomcat configs.
+        -->
         <tranqlVendorsVersion>1.1</tranqlVendorsVersion>
-        <tranqlConnectorVersion>1.3-SNAPSHOT</tranqlConnectorVersion>
-        <jettyVersion>5.1.10</jettyVersion>
-        <wadiVersion>2.0M1</wadiVersion>
+        
+        <!--
+        HACK: USed by system to build product-versions.properties
+        -->
         <openejbVersion>2.2-SNAPSHOT</openejbVersion>
+        <activeMqVersion>3.2.4-SNAPSHOT</activeMqVersion>
+        <tranqlVersion>1.4-SNAPSHOT</tranqlVersion>
+        
+        <!--
+        HACK: Used by tomcate-builder tests, needs to replace with dependency plugin
+        -->
+        <xercesVersion>2.6.2</xercesVersion>
+        <xmlApisVersion>1.0.b2</xmlApisVersion>
+        
+        <!--
+        HACK: Used by deps below... need to unwrap
+        -->
+        <asn1Version>0.3.2</asn1Version>
+        <apachedsVersion>0.9.2</apachedsVersion>
+        <tomcatAjpVersion>5.5.15</tomcatAjpVersion>
         <kerberosCommonVersion>0.5</kerberosCommonVersion>
         <kerberosProtocolVersion>0.5</kerberosProtocolVersion>
         <ldapProtocolVersion>0.9.2</ldapProtocolVersion>
         <minaVersion>0.7.3</minaVersion>
-        <geronimoSpecQnameVersion>1.0.1</geronimoSpecQnameVersion>
-        <geronimoSpecJ2eeDeploymentVersion>1.0.1</geronimoSpecJ2eeDeploymentVersion>
-        <geronimoSpecJmsVersion>1.0.1</geronimoSpecJmsVersion>
-        <concurrentVersion>1.3.4</concurrentVersion>
-        <jlineVersion>0.9.9</jlineVersion>
+        
     </properties>
 
     <dependencyManagement>
@@ -126,7 +134,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-                <version>${geronimoSpecJ2eeDeploymentVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
@@ -186,7 +194,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-qname_1.1_spec</artifactId>
-                <version>${geronimoSpecQnameVersion}</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>
@@ -206,7 +214,7 @@
             <dependency>
                 <groupId>jline</groupId>
                 <artifactId>jline</artifactId>
-                <version>${jlineVersion}</version>
+                <version>0.9.9</version>
                 <type>jar</type>
             </dependency>
             
@@ -231,7 +239,7 @@
             <dependency>
                 <groupId>backport-util-concurrent</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
-                <version>${backportUtilVersion}</version>
+                <version>2.0_01_pd</version>
             </dependency>
 
             <dependency>
@@ -243,7 +251,7 @@
             <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
-                <version>${cglibVersion}</version>
+                <version>2.1_3</version>
             </dependency>
 
             <dependency>
@@ -255,13 +263,13 @@
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>${commonsLoggingVersion}</version>
+                <version>1.0.4</version>
             </dependency>
 
             <dependency>
                 <groupId>concurrent</groupId>
                 <artifactId>concurrent</artifactId>
-                <version>${concurrentVersion}</version>
+                <version>1.3.4</version>
             </dependency>
 
             <dependency>
@@ -287,19 +295,19 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>${log4jVersion}</version>
+                <version>1.2.8</version>
             </dependency>
 
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j</artifactId>
-                <version>${mx4jVersion}</version>
+                <version>3.0.1</version>
             </dependency>
 
             <dependency>
                 <groupId>mx4j</groupId>
                 <artifactId>mx4j-remote</artifactId>
-                <version>${mx4jVersion}</version>
+                <version>3.0.1</version>
             </dependency>
 
             <dependency>
@@ -371,7 +379,7 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xmlParserAPIs</artifactId>
-                <version>${xmlParserApisVersion}</version>
+                <version>2.2.1</version>
             </dependency>
 
             <dependency>
@@ -401,13 +409,13 @@
             <dependency>
                 <groupId>xpp3</groupId>
                 <artifactId>xpp3</artifactId>
-                <version>${xpp3Version}</version>
+                <version>1.1.3.3</version>
             </dependency>
 
             <dependency>
                 <groupId>xstream</groupId>
                 <artifactId>xstream</artifactId>
-                <version>${xstreamVersion}</version>
+                <version>1.1.3</version>
             </dependency>
 
             <dependency>
@@ -626,7 +634,220 @@
                 <artifactId>juddi</artifactId>
                 <version>0.9rc4</version>
             </dependency>
-
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>geronimo-samples</groupId>
+                <artifactId>geronimo-jsp-examples-tomcat</artifactId>
+                <version>${tomcatVersion}</version>
+                <type>war</type>
+            </dependency>
+            
+            <dependency>
+                <groupId>geronimo-samples</groupId>
+                <artifactId>geronimo-servlet-examples-tomcat</artifactId>
+                <version>${tomcatVersion}</version>
+                <type>war</type>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory</groupId>
+                <artifactId>apacheds-core</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory</groupId>
+                <artifactId>apacheds-shared</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-asn1</groupId>
+                <artifactId>asn1-codec</artifactId>
+                <version>${asn1Version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-asn1</groupId>
+                <artifactId>asn1-ber</artifactId>
+                <version>${asn1Version}</version>
+                <exclusions>
+                    <!--
+                    NOTE: Exclude commons-test, no needed for compile, not deployed into any m2 repo.
+                          Where are the sources for this artifact?
+                    -->
+                    <exclusion>
+                        <groupId>commons-test</groupId>
+                        <artifactId>commons-test</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-asn1</groupId>
+                <artifactId>asn1-der</artifactId>
+                <version>${asn1Version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-shared</groupId>
+                <artifactId>apache-ldapber-provider</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-shared</groupId>
+                <artifactId>ldap-common</artifactId>
+                <version>${apachedsVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-shared</groupId>
+                <artifactId>kerberos-common</artifactId>
+                <version>${kerberosCommonVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-network</groupId>
+                <artifactId>mina</artifactId>
+                <version>${minaVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-protocols</groupId>
+                <artifactId>kerberos-protocol</artifactId>
+                <version>${kerberosProtocolVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>directory-protocols</groupId>
+                <artifactId>ldap-protocol</artifactId>
+                <version>${ldapProtocolVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>jetty</groupId>
+                <artifactId>org.mortbay.jetty</artifactId>
+                <version>5.1.10</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler-jdt</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>catalina</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>tomcat-ajp</artifactId>
+                <version>${tomcatAjpVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>catalina-cluster</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <!--
+              - Required until any realm is provided to Tomcat
+              - See StandardEngine::getRealm() 
+            -->
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>catalina-optional</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>tomcat-coyote</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>tomcat-http</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-compiler-jdt</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>jasper-runtime</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>tomcat-util</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>naming-resources</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>servlets-default</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>tomcat</groupId>
+                <artifactId>servlets-invoker</artifactId>
+                <version>${tomcatVersion}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>wadi</groupId>
+                <artifactId>wadi-core</artifactId>
+                <version>2.0M1</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>wadi</groupId>
+                <artifactId>wadi-tomcat55</artifactId>
+                <version>2.0M1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>