Author: dkulp
Date: Fri Sep 11 16:02:45 2009
New Revision: 813894
URL: http://svn.apache.org/viewvc?rev=813894&view=rev
Log:
Merged revisions 812216 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r812216 | gnodet | 2009-09-07 12:18:26 -0400 (Mon, 07 Sep 2009) | 1 line
CXF-2425: OSGi metadata does not handle well multiple versions of CXF bundle
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml?rev=813894&r1=813893&r2=813894&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/all/pom.xml Fri Sep 11
16:02:45 2009
@@ -271,6 +271,8 @@
com.ctc.wstx.*
</DynamicImport-Package>
<Import-Package>
+ !org.apache.cxf.*,
+ !META-INF.cxf,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
@@ -304,6 +306,7 @@
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=813894&r1=813893&r2=813894&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/jaxrs/pom.xml Fri Sep 11
16:02:45 2009
@@ -117,6 +117,8 @@
com.ctc.wstx.*
</DynamicImport-Package>
<Import-Package>
+ !org.apache.cxf.*,
+ !META-INF.cxf,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
com.sun*;resolution:=optional,
@@ -147,6 +149,7 @@
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml?rev=813894&r1=813893&r2=813894&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/distribution/bundle/minimal/pom.xml Fri Sep 11
16:02:45 2009
@@ -158,6 +158,9 @@
com.sun.xml.internal.bind.api.*
</DynamicImport-Package>
<Import-Package>
+ !org.apache.cxf.*,
+ !META-INF.cxf,
+ !schemas*,
org.apache.cxf.tools.*;version=${pom.version};resolution:=optional,
antlr*;resolution:=optional,
com.ibm*;resolution:=optional,
@@ -195,6 +198,7 @@
'=schemas.wsdl'
</Export-Package>
<_failok>true</_failok>
+
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
