Author: dkulp
Date: Wed Feb 23 17:56:27 2011
New Revision: 1073851
URL: http://svn.apache.org/viewvc?rev=1073851&view=rev
Log:
Merged revisions 1073848 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1073848 | dkulp | 2011-02-23 12:54:43 -0500 (Wed, 23 Feb 2011) | 1 line
Fix groupId for karaf, updated artifactIds
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml
cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml?rev=1073851&r1=1073850&r2=1073851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/karaf/features/pom.xml Wed Feb 23
17:56:27 2011
@@ -22,12 +22,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>karaf-parent</artifactId>
<version>2.3.3-SNAPSHOT</version>
</parent>
- <groupId>org.apache.camel.karaf</groupId>
+ <groupId>org.apache.cxf.karaf</groupId>
<artifactId>apache-cxf</artifactId>
<packaging>pom</packaging>
<name>CXF :: Apache Karaf :: Features</name>
Modified: cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml?rev=1073851&r1=1073850&r2=1073851&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/karaf/pom.xml Wed Feb 23 17:56:27 2011
@@ -27,8 +27,8 @@
<relativePath>../../parent</relativePath>
</parent>
- <groupId>org.apache.cxf</groupId>
- <artifactId>karaf</artifactId>
+ <groupId>org.apache.cxf.karaf</groupId>
+ <artifactId>karaf-parent</artifactId>
<packaging>pom</packaging>
<version>2.3.3-SNAPSHOT</version>
<name>CXF :: Apache Karaf</name>
