Author: ningjiang
Date: Mon Sep 26 03:19:40 2011
New Revision: 1175649
URL: http://svn.apache.org/viewvc?rev=1175649&view=rev
Log:
Merged revisions 1175648 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1175648 | ningjiang | 2011-09-26 11:05:24 +0800 (Mon, 26 Sep 2011) | 1 line
CXF-3823 cxf-rt-transport-http-jetty should have the dependency of servlet
API 2.5 instead of 3.0
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/parent/pom.xml
cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1175648
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1175649&r1=1175648&r2=1175649&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Mon Sep 26 03:19:40 2011
@@ -81,6 +81,8 @@
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
<cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>
<cxf.servlet-api.version>1.0</cxf.servlet-api.version>
+
<cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
+ <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
<cxf.spring.version>3.0.6.RELEASE</cxf.spring.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
@@ -1084,6 +1086,11 @@
<version>${cxf.servlet-api.version}</version>
</dependency>
<dependency>
+ <groupId>${cxf.servlet-api.group}</groupId>
+ <artifactId>${cxf.servlet-api-2.5.artifact}</artifactId>
+ <version>${cxf.servlet-api-2.5.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.7.1</version>
Modified: cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml?rev=1175649&r1=1175648&r2=1175649&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http-jetty/pom.xml Mon Sep 26
03:19:40 2011
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
+ <artifactId>${cxf.servlet-api-2.5.artifact}</artifactId>
</dependency>
<dependency>
