geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r219816 - in /geronimo/trunk: etc/ modules/assembly/ modules/jetty-builder/ modules/spring-builder/ modules/tomcat-builder/
Date Tue, 19 Jul 2005 23:51:46 GMT
Author: djencks
Date: Tue Jul 19 16:51:46 2005
New Revision: 219816

URL: http://svn.apache.org/viewcvs?rev=219816&view=rev
Log:
dependency cleanup

Modified:
    geronimo/trunk/etc/project.properties
    geronimo/trunk/modules/assembly/maven.xml
    geronimo/trunk/modules/assembly/project.xml
    geronimo/trunk/modules/jetty-builder/maven.xml
    geronimo/trunk/modules/jetty-builder/project.xml
    geronimo/trunk/modules/spring-builder/project.xml
    geronimo/trunk/modules/tomcat-builder/project.xml

Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Tue Jul 19 16:51:46 2005
@@ -72,14 +72,8 @@
 #####################################################
 # Dependency Version
 #####################################################
-
-# hack to work with activemq
-#geronimo_kernel_version=1.0-SNAPSHOT
-#geronimo_system_version=1.0-SNAPSHOT
-
-# actual dependencies
 activeio_version=1.0
-activemq_version=3.1-SNAPSHOT
+activemq_version=3.1-M4
 geronimo_version=1.0-SNAPSHOT
 openejb_version=2.0-SNAPSHOT
 tranql_version=1.0-20050713
@@ -103,9 +97,6 @@
 geronimo_spec_servlet_version=2.4-rc4
 geronimo_spec_qname_version=1.1-rc4
 
-activecluster_version=1.0-SNAPSHOT
-activemq_jetty_version=4.2.20RC0
-ant_version=1.5
 antlr_version=2.7.2
 asm_version=1.4.3
 axion_version=1.0-M3-dev
@@ -116,9 +107,8 @@
 commons_beanutils_version=1.6.1
 commons_cli_version=1.0
 commons_collections_version=3.1
-commons_dbcp_version=1.2
 commons_digester_version=1.6
-commons_discovery_version=SNAPSHOT
+commons_discovery_version=0.2
 commons_el_version=1.0
 commons_io_version=1.0
 commons_fileupload_version=1.0
@@ -132,31 +122,27 @@
 concurrent_version=1.3.4
 derby_version=10.0.2.1
 dom4j_version=1.4
-drools_version=2.0-beta-13
 eclipse_compiler_version=3.0.1
-emberio_version=0.3-alpha
 howl_version=0.1.8
+#security:
 hsqldb_version=1.7.2.2
 jasper_version=5.5.9
 javacc_version=2.1
-jaxb_ri_version=SNAPSHOT
-jdbm_version=0.20-dev
 jelly_velocity_tags_version=1.0
 jetty_version=5.1.4
-jmock_version=1.0.1
-jrms_version=1.1
 juddi_version=SNAPSHOT
 junit_version=3.8.1
-jxta_version=2.0
 log4j_version=1.2.8
 maven_itest_plugin_version=1.0
-maven_version=1.0
+maven_version=1.0.2
 mockobjects_version=0.09
 mx4j_version=3.0.1
 oro_version=2.0.8
 p2psockets_version=1.1.2
 regexp_version=1.3
 scout_version=1.0-SNAPSHOT
+servicemix_spring_version=1.2.2-dev-2
+servicemix_version=1.0-SNAPSHOT
 spring_version=1.1.3
 stax_version=1.1.1-dev
 stax_api_version=1.0
@@ -174,8 +160,6 @@
 xmlpull_version=1.1.3.4d_b4_min
 xpp3_version=1.1.3.3
 xstream_version=1.0.2
-servicemix_version=1.0-SNAPSHOT
-servicemix_spring_version=1.2.2-dev-2
 
 #####################################################
 # Site Colors

Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Tue Jul 19 16:51:46 2005
@@ -145,11 +145,11 @@
             <ant:include name="META-INF/schema/openejb-jar.xsd" />
           </ant:patternset>
         </ant:unzip>
-        <ant:move todir="${distDir}/schema">
-          <ant:fileset dir="${distDir}/META-INF/schema">
-            <ant:include name="*.xsd" />
-          </ant:fileset>
-        </ant:move>
+<!--        <ant:move todir="${distDir}/schema">-->
+<!--          <ant:fileset dir="${distDir}/META-INF/schema">-->
+<!--            <ant:include name="*.xsd" />-->
+<!--          </ant:fileset>-->
+<!--        </ant:move>-->
         <ant:delete dir="${distDir}/META-INF" />
         <ant:fileScanner var="schemaScanner">
             <ant:fileset dir="${distDir}/schema">

Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Tue Jul 19 16:51:46 2005
@@ -508,15 +508,6 @@
             </properties>
         </dependency>
 
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
-            <properties>
-                <repository>true</repository>
-            </properties>
-        </dependency>
-
         <!-- jdbc timer WorkerPersistence -->
         <dependency>
             <groupId>xstream</groupId>

Modified: geronimo/trunk/modules/jetty-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/maven.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/maven.xml (original)
+++ geronimo/trunk/modules/jetty-builder/maven.xml Tue Jul 19 16:51:46 2005
@@ -6,22 +6,20 @@
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-  
+
 
 <!-- $Rev$ $Date$ -->
 
 <project default="default"
-    xmlns:j="jelly:core"
-    xmlns:ant="jelly:ant"
-    xmlns:maven="jelly:maven">
+>
 
 </project>

Modified: geronimo/trunk/modules/jetty-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/project.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/project.xml (original)
+++ geronimo/trunk/modules/jetty-builder/project.xml Tue Jul 19 16:51:46 2005
@@ -284,12 +284,6 @@
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>${xerces_version}</version>

Modified: geronimo/trunk/modules/spring-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/spring-builder/project.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/spring-builder/project.xml (original)
+++ geronimo/trunk/modules/spring-builder/project.xml Tue Jul 19 16:51:46 2005
@@ -60,13 +60,13 @@
             <artifactId>stax</artifactId>
             <version>${stax_version}</version>
         </dependency>
-    
+
         <dependency>
             <groupId>stax</groupId>
             <artifactId>stax-api</artifactId>
             <version>${stax_api_version}</version>
         </dependency>
-    
+
         <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
@@ -267,12 +267,6 @@
             <artifactId>commons-el</artifactId>
             <version>${commons_el_version}</version>
             <url>http://jakarta.apache.org/commons/el/</url>
-        </dependency>
-
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/trunk/modules/tomcat-builder/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/project.xml?rev=219816&r1=219815&r2=219816&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/project.xml (original)
+++ geronimo/trunk/modules/tomcat-builder/project.xml Tue Jul 19 16:51:46 2005
@@ -326,12 +326,6 @@
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>${ant_version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
             <version>${xerces_version}</version>



Mime
View raw message