You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/07/19 16:31:45 UTC

svn commit: r1148359 - in /geronimo/server/trunk: plugins/tomcat/geronimo-tomcat7/pom.xml plugins/tomcat/tomcat7/src/main/history/dependencies.xml pom.xml

Author: xuhaihong
Date: Tue Jul 19 14:31:44 2011
New Revision: 1148359

URL: http://svn.apache.org/viewvc?rev=1148359&view=rev
Log:
Update Tomcat version to 7.0.19.1-SNAPSHOT

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

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=1148359&r1=1148358&r2=1148359&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/pom.xml Tue Jul 19 14:31:44 2011
@@ -81,6 +81,12 @@
             <version>${openwebbeansVersion}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-ejb</artifactId>
+            <version>${openwebbeansVersion}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.xbean</groupId>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1148359&r1=1148358&r2=1148359&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Tue Jul 19 14:31:44 2011
@@ -57,6 +57,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-j2ee-schema</artifactId>
         <type>jar</type>
@@ -108,6 +113,21 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-javaagent</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-jee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
+        <artifactId>openejb-loader</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-multicast</artifactId>
         <type>jar</type>
     </dependency>
@@ -123,6 +143,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-ee</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans-ee-common</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1148359&r1=1148358&r2=1148359&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Jul 19 14:31:44 2011
@@ -66,7 +66,7 @@
         FIXME: STOP using properties for dependency versions unless you absolutly need them,
                ie. you have a hundred dependencies that all use the same version.
         -->
-        <tomcatVersion>7.0.18.1-SNAPSHOT</tomcatVersion>
+        <tomcatVersion>7.0.19.1-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
         <openejbVersion>4.0.0-SNAPSHOT</openejbVersion>