geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r430975 - in /geronimo/trunk: ./ applications/welcome/ configs/ configs/client-system/ configs/console-jetty/ configs/console-tomcat/ configs/geronimo-gbean-deployer/ configs/remote-deploy-jetty/ configs/remote-deploy-tomcat/ configs/upgrad...
Date Sat, 12 Aug 2006 05:11:49 GMT
Author: jdillon
Date: Fri Aug 11 22:11:46 2006
New Revision: 430975

URL: http://svn.apache.org/viewvc?rev=430975&view=rev
Log:
Removed m2-ibiblio-rsync-repository it is not needed, not is it blessed to be used as a real repo
Removed some dependencies which are picked up transitivly

Modified:
    geronimo/trunk/applications/welcome/pom.xml
    geronimo/trunk/configs/client-system/pom.xml
    geronimo/trunk/configs/console-jetty/pom.xml
    geronimo/trunk/configs/console-tomcat/pom.xml
    geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml
    geronimo/trunk/configs/pom.xml
    geronimo/trunk/configs/remote-deploy-jetty/pom.xml
    geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
    geronimo/trunk/configs/upgrade-cli/pom.xml
    geronimo/trunk/configs/upgrade/pom.xml
    geronimo/trunk/modules/activemq-gbean/pom.xml
    geronimo/trunk/modules/axis-builder/pom.xml
    geronimo/trunk/modules/client-builder/pom.xml
    geronimo/trunk/modules/client/pom.xml
    geronimo/trunk/modules/common/pom.xml
    geronimo/trunk/modules/connector-builder/pom.xml
    geronimo/trunk/modules/converter/pom.xml
    geronimo/trunk/modules/core/pom.xml
    geronimo/trunk/modules/deploy-config/pom.xml
    geronimo/trunk/modules/deploy-jsr88/pom.xml
    geronimo/trunk/modules/deploy-tool/pom.xml
    geronimo/trunk/modules/deployment/pom.xml
    geronimo/trunk/modules/hot-deploy/pom.xml
    geronimo/trunk/modules/installer-processing/pom.xml
    geronimo/trunk/modules/installer-support/pom.xml
    geronimo/trunk/modules/j2ee-builder/pom.xml
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/jmx-remoting/pom.xml
    geronimo/trunk/modules/kernel/pom.xml
    geronimo/trunk/modules/mail/pom.xml
    geronimo/trunk/modules/management/pom.xml
    geronimo/trunk/modules/naming-builder/pom.xml
    geronimo/trunk/modules/naming/pom.xml
    geronimo/trunk/modules/security-builder/pom.xml
    geronimo/trunk/modules/security/pom.xml
    geronimo/trunk/modules/test-ddbean/pom.xml
    geronimo/trunk/modules/timer/pom.xml
    geronimo/trunk/modules/tomcat/pom.xml
    geronimo/trunk/modules/transaction/pom.xml
    geronimo/trunk/modules/upgrade/pom.xml
    geronimo/trunk/modules/util/pom.xml
    geronimo/trunk/modules/web-builder/pom.xml
    geronimo/trunk/modules/webservices/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/applications/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/applications/welcome/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/applications/welcome/pom.xml (original)
+++ geronimo/trunk/applications/welcome/pom.xml Fri Aug 11 22:11:46 2006
@@ -53,12 +53,6 @@
     </scm>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -78,6 +72,7 @@
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/client-system/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/client-system/pom.xml (original)
+++ geronimo/trunk/configs/client-system/pom.xml Fri Aug 11 22:11:46 2006
@@ -35,12 +35,6 @@
     
     <dependencies>
 
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
         <!-- To Do - are the deps of g-system needed in the plan.xml ? -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>

Modified: geronimo/trunk/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-jetty/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/console-jetty/pom.xml (original)
+++ geronimo/trunk/configs/console-jetty/pom.xml Fri Aug 11 22:11:46 2006
@@ -173,16 +173,6 @@
         </dependency>
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
         </dependency>

Modified: geronimo/trunk/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/console-tomcat/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/console-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/console-tomcat/pom.xml Fri Aug 11 22:11:46 2006
@@ -173,16 +173,6 @@
         </dependency>
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto</artifactId>
         </dependency>

Modified: geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/trunk/configs/geronimo-gbean-deployer/pom.xml Fri Aug 11 22:11:46 2006
@@ -54,11 +54,13 @@
             <version>${pom.version}</version>
         </dependency>
         
+        <!-- Thirdparty Dependencies -->
+        
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>

Modified: geronimo/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/pom.xml (original)
+++ geronimo/trunk/configs/pom.xml Fri Aug 11 22:11:46 2006
@@ -99,6 +99,13 @@
                 
                 <!-- Install as extention to allow 'car' packaging to be used. -->
                 <extensions>true</extensions>
+                
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-jetty/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-jetty/pom.xml Fri Aug 11 22:11:46 2006
@@ -32,6 +32,7 @@
     <packaging>car</packaging>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-remote-deploy</artifactId>
@@ -43,6 +44,7 @@
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/configs/remote-deploy-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/remote-deploy-tomcat/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/remote-deploy-tomcat/pom.xml (original)
+++ geronimo/trunk/configs/remote-deploy-tomcat/pom.xml Fri Aug 11 22:11:46 2006
@@ -32,6 +32,7 @@
     <packaging>car</packaging>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.applications</groupId>
             <artifactId>geronimo-remote-deploy</artifactId>
@@ -43,6 +44,7 @@
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/configs/upgrade-cli/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade-cli/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade-cli/pom.xml (original)
+++ geronimo/trunk/configs/upgrade-cli/pom.xml Fri Aug 11 22:11:46 2006
@@ -98,16 +98,6 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
         
     </dependencies>
     

Modified: geronimo/trunk/configs/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/configs/upgrade/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/configs/upgrade/pom.xml (original)
+++ geronimo/trunk/configs/upgrade/pom.xml Fri Aug 11 22:11:46 2006
@@ -53,16 +53,6 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
         
     </dependencies>
     

Modified: geronimo/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/pom.xml Fri Aug 11 22:11:46 2006
@@ -59,12 +59,6 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -97,16 +91,6 @@
             <groupId>incubator-activemq</groupId>
             <artifactId>activeio-core</artifactId>
             <version>3.0-beta3</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
         </dependency>
         
     </dependencies>

Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -105,16 +105,6 @@
         <!-- Thirdparty Dependencies -->
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
         </dependency>

Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -61,14 +61,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <!-- tranql uses 1.0.3 -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/client/pom.xml (original)
+++ geronimo/trunk/modules/client/pom.xml Fri Aug 11 22:11:46 2006
@@ -49,12 +49,6 @@
     
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -92,6 +86,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
         </dependency>
+        
     </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/common/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/common/pom.xml (original)
+++ geronimo/trunk/modules/common/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,11 +46,13 @@
     </scm>
     
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -76,24 +76,8 @@
         <!-- Thirdparty Dependencies -->
         
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>tranql</groupId>
             <artifactId>tranql</artifactId>
-        </dependency>
-
-        <!-- tranql uses 1.0.3, force 1.0.4  -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
         </dependency>
         
     </dependencies>

Modified: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/converter/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (original)
+++ geronimo/trunk/modules/converter/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,6 +46,7 @@
     </scm>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
@@ -57,16 +58,7 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
+        
     </dependencies>
 </project>
 

Modified: geronimo/trunk/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/core/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/core/pom.xml (original)
+++ geronimo/trunk/modules/core/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,22 +46,7 @@
     </scm>
     
     <dependencies>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
@@ -73,6 +58,8 @@
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/trunk/modules/deploy-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-config/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-config/pom.xml (original)
+++ geronimo/trunk/modules/deploy-config/pom.xml Fri Aug 11 22:11:46 2006
@@ -53,6 +53,7 @@
     </scm>
     
     <dependencies>
+    
         <dependency>
             <groupId>xmlbeans</groupId>
             <artifactId>xbean</artifactId>
@@ -67,6 +68,7 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-jsr88/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/trunk/modules/deploy-jsr88/pom.xml Fri Aug 11 22:11:46 2006
@@ -48,26 +48,10 @@
     
     <dependencies>
         
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j-remote</artifactId>
-        </dependency>
-
         <!-- Module Dependencies -->
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
@@ -97,6 +81,13 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
         
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>mx4j</groupId>
+            <artifactId>mx4j-remote</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: geronimo/trunk/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deploy-tool/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-tool/pom.xml (original)
+++ geronimo/trunk/modules/deploy-tool/pom.xml Fri Aug 11 22:11:46 2006
@@ -54,18 +54,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-util</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: geronimo/trunk/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/deployment/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/deployment/pom.xml (original)
+++ geronimo/trunk/modules/deployment/pom.xml Fri Aug 11 22:11:46 2006
@@ -51,29 +51,12 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <!-- Thirdparty Dependencies -->
         
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>

Modified: geronimo/trunk/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/hot-deploy/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/hot-deploy/pom.xml (original)
+++ geronimo/trunk/modules/hot-deploy/pom.xml Fri Aug 11 22:11:46 2006
@@ -48,6 +48,7 @@
     </scm>
     
     <dependencies>
+        
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -67,30 +68,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/installer-processing/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-processing/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-processing/pom.xml (original)
+++ geronimo/trunk/modules/installer-processing/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,11 +46,13 @@
     </scm>
     
     <dependencies>
+    
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xerces</artifactId>
             <version>2.4.0</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/installer-support/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/installer-support/pom.xml (original)
+++ geronimo/trunk/modules/installer-support/pom.xml Fri Aug 11 22:11:46 2006
@@ -50,6 +50,7 @@
     </properties>
     
     <dependencies>
+    
         <dependency>
             <groupId>izpack</groupId>
             <artifactId>installer</artifactId>
@@ -61,6 +62,7 @@
             <artifactId>standalone-compiler</artifactId>
             <version>${izpack_version}</version>
         </dependency>
+        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/j2ee-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/j2ee-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/pom.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -55,18 +55,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -60,18 +60,6 @@
             <artifactId>geronimo-jetty</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
 
     </dependencies>
     

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,6 +46,7 @@
     </scm>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>

Modified: geronimo/trunk/modules/jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jmx-remoting/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/jmx-remoting/pom.xml (original)
+++ geronimo/trunk/modules/jmx-remoting/pom.xml Fri Aug 11 22:11:46 2006
@@ -55,11 +55,11 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <!-- all the specs should be added to the classpath transitively -->
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j-remote</artifactId>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/kernel/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/pom.xml (original)
+++ geronimo/trunk/modules/kernel/pom.xml Fri Aug 11 22:11:46 2006
@@ -99,7 +99,7 @@
             </resource>
             
             <resource>
-                <directory>src/META-INF</directory>
+                <directory>${pom.basedir}/src/META-INF</directory>
                 <targetPath>META-INF</targetPath>
             </resource>
         </resources>

Modified: geronimo/trunk/modules/mail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/mail/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/mail/pom.xml (original)
+++ geronimo/trunk/modules/mail/pom.xml Fri Aug 11 22:11:46 2006
@@ -82,23 +82,6 @@
             <artifactId>geronimo-activation_1.0.2_spec</artifactId>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <!--

Modified: geronimo/trunk/modules/management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/management/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/management/pom.xml (original)
+++ geronimo/trunk/modules/management/pom.xml Fri Aug 11 22:11:46 2006
@@ -48,22 +48,18 @@
     </scm>
     
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        </dependency>
-
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
+            <artifactId>geronimo-system</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-system</artifactId>
-            <version>${pom.version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/pom.xml (original)
+++ geronimo/trunk/modules/naming-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -109,28 +109,6 @@
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/naming/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/naming/pom.xml (original)
+++ geronimo/trunk/modules/naming/pom.xml Fri Aug 11 22:11:46 2006
@@ -63,11 +63,6 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
         
     </dependencies>
     

Modified: geronimo/trunk/modules/security-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/pom.xml (original)
+++ geronimo/trunk/modules/security-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -92,25 +92,6 @@
             <version>${pom.version}</version>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        
-        <!-- provided by kernel -->
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/security/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/security/pom.xml (original)
+++ geronimo/trunk/modules/security/pom.xml Fri Aug 11 22:11:46 2006
@@ -87,11 +87,6 @@
         <!-- Thirdparty Dependencies -->
         
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>activeio</groupId>
             <artifactId>activeio</artifactId>
         </dependency>
@@ -101,9 +96,12 @@
             <artifactId>regexp</artifactId>
         </dependency>
         
+        <!-- Test Dependencies -->
+        
         <dependency>
             <groupId>hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
+            <scope>test</scope>
         </dependency>
     
     </dependencies>

Modified: geronimo/trunk/modules/test-ddbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/test-ddbean/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/test-ddbean/pom.xml (original)
+++ geronimo/trunk/modules/test-ddbean/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,16 +46,7 @@
     </scm>
     
     <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
+    
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -72,6 +63,7 @@
             <artifactId>geronimo-service-builder</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/timer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/timer/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/timer/pom.xml (original)
+++ geronimo/trunk/modules/timer/pom.xml Fri Aug 11 22:11:46 2006
@@ -56,6 +56,7 @@
     </properties>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
@@ -97,24 +98,6 @@
         </dependency>
 
         <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-
-        <!-- jdbc timer WorkerPersistence -->
-        <dependency>
-            <groupId>xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-
-        <dependency>
-            <!--License is at http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt -->
-            <!-- it is modified BSD -->
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
         </dependency>
@@ -123,11 +106,7 @@
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/tomcat/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/pom.xml (original)
+++ geronimo/trunk/modules/tomcat/pom.xml Fri Aug 11 22:11:46 2006
@@ -51,6 +51,7 @@
     </properties>
     
     <dependencies>
+    
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jsp_2.0_spec</artifactId>

Modified: geronimo/trunk/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/transaction/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/pom.xml (original)
+++ geronimo/trunk/modules/transaction/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,6 +46,7 @@
     </scm>
     
     <dependencies>
+    
         <!-- temp, for ServerInfo. Remove when it is moved to Kernel-->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
@@ -67,12 +68,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>
@@ -93,24 +88,11 @@
         </dependency>
 
         <dependency>
-            <groupId>concurrent</groupId>
-            <artifactId>concurrent</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.objectweb.howl</groupId>
             <artifactId>howl</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
+        
     </dependencies>
+    
 </project>
 

Modified: geronimo/trunk/modules/upgrade/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/upgrade/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/upgrade/pom.xml (original)
+++ geronimo/trunk/modules/upgrade/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,16 +46,7 @@
     </scm>
     
     <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>

Modified: geronimo/trunk/modules/util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/util/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/util/pom.xml (original)
+++ geronimo/trunk/modules/util/pom.xml Fri Aug 11 22:11:46 2006
@@ -46,10 +46,12 @@
     </scm>
     
     <dependencies>
+    
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
+        
     </dependencies>
     
 </project>

Modified: geronimo/trunk/modules/web-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/web-builder/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/pom.xml (original)
+++ geronimo/trunk/modules/web-builder/pom.xml Fri Aug 11 22:11:46 2006
@@ -121,23 +121,6 @@
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
         
-        <!-- Thirdparty Dependencies -->
-        
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>mx4j</groupId>
-            <artifactId>mx4j</artifactId>
-        </dependency>
-        
     </dependencies>
     
     <build>

Modified: geronimo/trunk/modules/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/webservices/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/modules/webservices/pom.xml (original)
+++ geronimo/trunk/modules/webservices/pom.xml Fri Aug 11 22:11:46 2006
@@ -108,7 +108,12 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>castor</groupId>
             <artifactId>castor</artifactId>
@@ -127,11 +132,6 @@
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxr_1.0_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=430975&r1=430974&r2=430975&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Fri Aug 11 22:11:46 2006
@@ -777,19 +777,6 @@
         -->
         
         <repository>
-            <id>apache</id>
-            <name>Apache Repository</name>
-            <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-
-        <repository>
             <id>apache-snapshots</id>
             <name>Apache Snapshots Repository</name>
             <url>http://people.apache.org/repo/m2-snapshot-repository</url>



Mime
View raw message