Author: asoldano
Date: Tue Oct 26 11:12:02 2010
New Revision: 1027467
URL: http://svn.apache.org/viewvc?rev=1027467&view=rev
Log:
Merged revisions 1027462 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1027462 | asoldano | 2010-10-26 13:02:10 +0200 (Tue, 26 Oct 2010) | 2 lines
Fix build, properties were renamed
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 11:12:02 2010
@@ -1 +1 @@
-/cxf/trunk:1027274
+/cxf/trunk:1027274,1027462
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 26 11:12:02 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462
Modified:
cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml?rev=1027467&r1=1027466&r2=1027467&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml
(original)
+++ cxf/branches/2.3.x-fixes/systests/container-integration/grizzly/pom.xml Tue
Oct 26 11:12:02 2010
@@ -57,8 +57,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${servlet-api.group}</groupId>
- <artifactId>${servlet-api.artifact}</artifactId>
+ <groupId>${cxf.servlet-api.group}</groupId>
+ <artifactId>${cxf.servlet-api.artifact}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
