Author: dkulp
Date: Fri Dec 3 20:55:21 2010
New Revision: 1041996
URL: http://svn.apache.org/viewvc?rev=1041996&view=rev
Log:
Merged revisions 1041993 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1041993 | dkulp | 2010-12-03 15:54:10 -0500 (Fri, 03 Dec 2010) | 1 line
Fix some relative paths to parents
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 3 20:55:21 2010
@@ -1 +1 @@
-/cxf/trunk:1041183,1041790
+/cxf/trunk:1041183,1041790,1041993
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml?rev=1041996&r1=1041995&r2=1041996&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml
Fri Dec 3 20:55:21 2010
@@ -27,6 +27,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
<version>2.3.2-SNAPSHOT</version>
+ <relativePath>../../..</relativePath>
</parent>
<properties>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=1041996&r1=1041995&r2=1041996&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml
Fri Dec 3 20:55:21 2010
@@ -27,6 +27,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
<version>2.3.2-SNAPSHOT</version>
+ <relativePath>../../..</relativePath>
</parent>
<properties>
Modified:
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml?rev=1041996&r1=1041995&r2=1041996&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
(original)
+++
cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml
Fri Dec 3 20:55:21 2010
@@ -27,6 +27,7 @@
<groupId>org.apache.cxf.samples</groupId>
<artifactId>cxf-samples</artifactId>
<version>2.3.2-SNAPSHOT</version>
+ <relativePath>../../..</relativePath>
</parent>
<properties>
