geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r412487 - in /geronimo/trunk: modules/client-builder/src/resources/ modules/directory/src/resources/ modules/jetty-builder/pom.xml modules/jetty/pom.xml modules/jetty/src/resources/ modules/pom.xml modules/webservices/src/resources/ pom.xml
Date Wed, 07 Jun 2006 18:57:20 GMT
Author: djencks
Date: Wed Jun  7 11:57:19 2006
New Revision: 412487

URL: http://svn.apache.org/viewvc?rev=412487&view=rev
Log:
GERONIMO-2071 rolling back previous addition of geronimo-dependency.xml files since it breaks
the m1 build

Removed:
    geronimo/trunk/modules/client-builder/src/resources/
    geronimo/trunk/modules/directory/src/resources/
    geronimo/trunk/modules/jetty/src/resources/
    geronimo/trunk/modules/webservices/src/resources/
Modified:
    geronimo/trunk/modules/jetty-builder/pom.xml
    geronimo/trunk/modules/jetty/pom.xml
    geronimo/trunk/modules/pom.xml
    geronimo/trunk/pom.xml

Modified: geronimo/trunk/modules/jetty-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty-builder/pom.xml?rev=412487&r1=412486&r2=412487&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/pom.xml (original)
+++ geronimo/trunk/modules/jetty-builder/pom.xml Wed Jun  7 11:57:19 2006
@@ -72,6 +72,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jetty</artifactId>
+            <version>${geronimoVersion}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/jetty/pom.xml?rev=412487&r1=412486&r2=412487&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (original)
+++ geronimo/trunk/modules/jetty/pom.xml Wed Jun  7 11:57:19 2006
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
-        </dependency>        
+        </dependency>
 
         <dependency>
             <groupId>jetty</groupId>
@@ -74,10 +74,28 @@
             <version>${jettyVersion}</version>
         </dependency>
         <!-- these are included in geronimo-dependency.xml -->
-        <!-- servlet-spec was not needed in M1 -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.4_spec</artifactId>
+           <groupId>springframework</groupId>
+            <artifactId>spring</artifactId>
+            <version>${wadiSpringVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>activecluster</groupId>
+            <artifactId>activecluster</artifactId>
+            <version>${wadiActiveClusterVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-core</artifactId>
+            <version>${wadiVersion}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>wadi</groupId>
+            <artifactId>wadi-jetty5</artifactId>
+            <version>${wadiVersion}</version>
         </dependency>
 
         <dependency>
@@ -109,7 +127,6 @@
             <artifactId>commons-collections</artifactId>
             <version>${commonsCollectionsVersion}</version>
         </dependency>
-
         <dependency>
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>

Modified: geronimo/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/pom.xml?rev=412487&r1=412486&r2=412487&view=diff
==============================================================================
--- geronimo/trunk/modules/pom.xml (original)
+++ geronimo/trunk/modules/pom.xml Wed Jun  7 11:57:19 2006
@@ -62,9 +62,9 @@
                 <module>j2ee</module>
                 <module>j2ee-builder</module>
                 <module>j2ee-schema</module>
-                <module>jetty</module>
+<!--                <module>jetty</module>
                 <module>jetty-builder</module>
-<!--                <module>javamail-transport</module>  -->
+                <module>javamail-transport</module>  -->
                 <module>jmx-remoting</module>
                 <module>kernel</module>
                 <module>management</module>

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/pom.xml?rev=412487&r1=412486&r2=412487&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Wed Jun  7 11:57:19 2006
@@ -213,7 +213,7 @@
         <xfireVersion>20050202</xfireVersion>
         <xmlApisVersion>1.0.b2</xmlApisVersion>
         <xmlbeansVersion>2.0.0</xmlbeansVersion>
-        <xmlbeansMavenPluginVersion>2.0.1-SNAPSHOT</xmlbeansMavenPluginVersion>
+        <xmlbeansMavenPluginVersion>2.0</xmlbeansMavenPluginVersion>
         <xmlParserApisVersion>2.2.1</xmlParserApisVersion>
         <xmlpullVersion>1.1.3.4d_b4_min</xmlpullVersion>
         <xmlResolverVersion>1.1</xmlResolverVersion>
@@ -627,12 +627,6 @@
                 <version>${geronimoVersion}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-jetty</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-                                                                                        
                                                                                         
                                
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-jmx-remoting</artifactId>



Mime
View raw message