felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From walk...@apache.org
Subject svn commit: r940817 - in /felix/trunk: http.jetty/pom.xml http/jetty/pom.xml
Date Tue, 04 May 2010 12:02:43 GMT
Author: walkerr
Date: Tue May  4 12:02:42 2010
New Revision: 940817

URL: http://svn.apache.org/viewvc?rev=940817&view=rev
Log:
FELIX-2292 - update both http implementations to latest jetty 6 (6.1.24) as an interim step
so that we have a "latest jetty 6" version prior to migration to jetty 7

Modified:
    felix/trunk/http.jetty/pom.xml
    felix/trunk/http/jetty/pom.xml

Modified: felix/trunk/http.jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/pom.xml?rev=940817&r1=940816&r2=940817&view=diff
==============================================================================
--- felix/trunk/http.jetty/pom.xml (original)
+++ felix/trunk/http.jetty/pom.xml Tue May  4 12:02:42 2010
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
     <name>Apache Felix HTTP Service Jetty</name>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <artifactId>org.apache.felix.http.jetty</artifactId>
     <dependencies>
         <dependency>
@@ -47,25 +47,27 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>servlet-api-2.5</artifactId>
             <version>6.1.14</version>
         </dependency>
+        -->
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.14</version>
+            <version>6.1.24</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>6.1.14</version>
+            <version>6.1.24</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-sslengine</artifactId>
-            <version>6.1.14</version>
+            <version>6.1.24</version>
         </dependency>
     </dependencies>
     <build>

Modified: felix/trunk/http/jetty/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/pom.xml?rev=940817&r1=940816&r2=940817&view=diff
==============================================================================
--- felix/trunk/http/jetty/pom.xml (original)
+++ felix/trunk/http/jetty/pom.xml Tue May  4 12:02:42 2010
@@ -82,17 +82,17 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.21</version>
+            <version>6.1.24</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-util</artifactId>
-            <version>6.1.21</version>
+            <version>6.1.24</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty-sslengine</artifactId>
-            <version>6.1.21</version>
+            <version>6.1.24</version>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>



Mime
View raw message