Author: asoldano
Date: Tue Oct 26 13:47:50 2010
New Revision: 1027557
URL: http://svn.apache.org/viewvc?rev=1027557&view=rev
Log:
Merged revisions 1027553 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1027553 | asoldano | 2010-10-26 15:44:42 +0200 (Tue, 26 Oct 2010) | 2 lines
Fixing another leftover from the build properties rename, causing wrong
META-INF/services/java.xml.ws.spi.Provider prop to be included in installed
artifact when providing -Pjaxws22 profile w/ JDK6
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 26 13:47:50 2010
@@ -1 +1 @@
-/cxf/trunk:1027274,1027462,1027509
+/cxf/trunk:1027274,1027462,1027509,1027553
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 26 13:47:50 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549,1026551,1027244,1027269,1027274,1027462,1027509,1027553
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml?rev=1027557&r1=1027556&r2=1027557&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxws/pom.xml Tue Oct 26 13:47:50 2010
@@ -194,7 +194,7 @@
</dependency>
</dependencies>
<properties>
- <spi-dir>spi-2.2</spi-dir>
+ <cxf.spi-dir>spi-2.2</cxf.spi-dir>
</properties>
<build>
<plugins>
