cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r757955 - in /cxf/branches/2.1.x-fixes: ./ parent/pom.xml
Date Tue, 24 Mar 2009 19:01:24 GMT
Author: dkulp
Date: Tue Mar 24 19:01:24 2009
New Revision: 757955

URL: http://svn.apache.org/viewvc?rev=757955&view=rev
Log:
Merged revisions 753421 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r753421 | dkulp | 2009-03-13 17:17:29 -0400 (Fri, 13 Mar 2009) | 2 lines
  
  Remove jetty's servlet-api jar from distro
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/parent/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 24 19:01:24 2009
@@ -1 +1 @@
-/cxf/trunk:753380,753397
+/cxf/trunk:753380,753397,753421

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=757955&r1=757954&r2=757955&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Mar 24 19:01:24 2009
@@ -575,6 +575,10 @@
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>servlet-api-2.5</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>servlet-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>



Mime
View raw message