geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r885545 - in /geronimo/server/trunk/plugins/tomcat: geronimo-tomcat6/pom.xml pom.xml tomcat6/pom.xml tomcat6/src/main/history/dependencies.xml
Date Mon, 30 Nov 2009 19:16:43 GMT
Author: gawor
Date: Mon Nov 30 19:16:42 2009
New Revision: 885545

URL: http://svn.apache.org/viewvc?rev=885545&view=rev
Log:
util module is merged with catalina module

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=885545&r1=885544&r2=885545&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Mon Nov 30 19:16:42 2009
@@ -61,11 +61,6 @@
 
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
-            <artifactId>util</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${tomcatGroupId}</groupId>
             <artifactId>catalina-ha</artifactId>
         </dependency>
 
@@ -82,11 +77,6 @@
         <!--<scope>test</scope>-->
         <!--</dependency>-->
 
-        <!--<dependency>-->
-        <!--<groupId>${tomcatGroupId}</groupId>-->
-        <!--<artifactId>coyote</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>

Modified: geronimo/server/trunk/plugins/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/pom.xml?rev=885545&r1=885544&r2=885545&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/pom.xml Mon Nov 30 19:16:42 2009
@@ -147,25 +147,6 @@
             </dependency>
             <dependency>
                 <groupId>${tomcatGroupId}</groupId>
-                <artifactId>util</artifactId>
-                <version>${tomcatVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>${tomcatGroupId}</groupId>
-                        <artifactId>juli</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                    </exclusion>
-                 </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>${tomcatGroupId}</groupId>
                 <artifactId>catalina-ha</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
@@ -202,33 +183,6 @@
                     </exclusion>
                  </exclusions>
             </dependency>
-            <!--<dependency>-->
-            <!--<groupId>${tomcatGroupId}</groupId>-->
-            <!--<artifactId>coyote</artifactId>-->
-            <!--<version>${tomcatVersion}</version>-->
-            <!--<exclusions>-->
-            <!--<exclusion>-->
-            <!--<groupId>${tomcatGroupId}</groupId>-->
-            <!--<artifactId>servlet-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--<exclusion>-->
-            <!--<groupId>${tomcatGroupId}</groupId>-->
-            <!--<artifactId>juli</artifactId>-->
-            <!--</exclusion>-->
-            <!--</exclusions>-->
-            <!--</dependency>-->
-            <!--<dependency>-->
-            <!--<groupId>${tomcatGroupId}</groupId>-->
-            <!--<artifactId>juli-adapters</artifactId>-->
-            <!--<version>${tomcatVersion}</version>-->
-            <!--<exclusions>-->
-            <!--<exclusion>-->
-            <!--<groupId>${tomcatGroupId}</groupId>-->
-            <!--<artifactId>servlet-api</artifactId>-->
-            <!--</exclusion>-->
-            <!--</exclusions>-->
-            <!--</dependency>-->
-
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=885545&r1=885544&r2=885545&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Mon Nov 30 19:16:42 2009
@@ -94,10 +94,6 @@
             <artifactId>tribes</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>${tomcatGroupId}</groupId>-->
-        <!--<artifactId>coyote</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=885545&r1=885544&r2=885545&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Mon Nov
30 19:16:42 2009
@@ -47,11 +47,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.ext.tomcat</groupId>
-        <artifactId>util</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>server-security-config</artifactId>
         <type>car</type>



Mime
View raw message