Author: dkulp
Date: Thu Jun 5 12:54:18 2008
New Revision: 663719
URL: http://svn.apache.org/viewvc?rev=663719&view=rev
Log:
Merged revisions 663712 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r663712 | gnodet | 2008-06-05 15:31:12 -0400 (Thu, 05 Jun 2008) | 1 line
Fix OSGi bundle
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=663719&r1=663718&r2=663719&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Thu Jun 5 12:54:18
2008
@@ -169,6 +169,11 @@
<artifactId>cxf-rt-databinding-aegis</artifactId>
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-jaxb</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -225,6 +230,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -250,6 +256,7 @@
org.apache.xmlbeans*;resolution:=optional,
org.apache.ws.security*;resolution:=optional,
org.codehaus.jra*;resolution:=optional,
+ org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
org.mortbay*;resolution:=optional,
@@ -260,6 +267,8 @@
<Export-Package>
org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
org.xmlsoap.schemas*;version=${pom.version};-split-package:=merge-first,
+ org.xmlsoap.schemas.wsdl.http.*,
+ org.w3._2006._05.addressing.wsdl.*,
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
