You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/12/12 08:16:55 UTC
svn commit: r1213156 - in /cxf/branches/2.4.x-fixes: ./
systests/databinding/ systests/jaxrs/ systests/jaxws/
systests/transport-jms/ systests/transports/ systests/uncategorized/
systests/ws-security/ systests/ws-specs/
Author: ningjiang
Date: Mon Dec 12 07:16:54 2011
New Revision: 1213156
URL: http://svn.apache.org/viewvc?rev=1213156&view=rev
Log:
Merged revisions 1213150 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1213150 | ningjiang | 2011-12-12 14:43:00 +0800 (Mon, 12 Dec 2011) | 1 line
CXF-3974 Clean up the servlet api dependency of CXF systest
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
cxf/branches/2.4.x-fixes/systests/transports/pom.xml
cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
cxf/branches/2.4.x-fixes/systests/ws-specs/pom.xml
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1213150
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/databinding/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/databinding/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/databinding/pom.xml Mon Dec 12 07:16:54 2011
@@ -187,10 +187,6 @@
</profiles>
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxrs/pom.xml Mon Dec 12 07:16:54 2011
@@ -77,10 +77,6 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
<version>${cxf.jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/jaxws/pom.xml Mon Dec 12 07:16:54 2011
@@ -73,10 +73,6 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</dependency>
Modified: cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transport-jms/pom.xml Mon Dec 12 07:16:54 2011
@@ -92,10 +92,6 @@
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/transports/pom.xml Mon Dec 12 07:16:54 2011
@@ -68,10 +68,6 @@
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/uncategorized/pom.xml Mon Dec 12 07:16:54 2011
@@ -101,10 +101,6 @@
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-security/pom.xml Mon Dec 12 07:16:54 2011
@@ -95,10 +95,6 @@
</build>
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>
Modified: cxf/branches/2.4.x-fixes/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/ws-specs/pom.xml?rev=1213156&r1=1213155&r2=1213156&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/ws-specs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/systests/ws-specs/pom.xml Mon Dec 12 07:16:54 2011
@@ -72,10 +72,6 @@
</build>
<dependencies>
<dependency>
- <groupId>${cxf.servlet-api.group}</groupId>
- <artifactId>${cxf.servlet-api.artifact}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
<version>${project.version}</version>