You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/09/11 19:34:12 UTC
svn commit: r813939 - in /cxf/branches/2.1.x-fixes: ./
distribution/bundle/all/pom.xml distribution/bundle/jaxrs/pom.xml
distribution/bundle/minimal/pom.xml
Author: dkulp
Date: Fri Sep 11 17:34:12 2009
New Revision: 813939
URL: http://svn.apache.org/viewvc?rev=813939&view=rev
Log:
Merged revisions 813894 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................
r813894 | dkulp | 2009-09-11 12:02:45 -0400 (Fri, 11 Sep 2009) | 9 lines
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.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml?rev=813939&r1=813938&r2=813939&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml Fri Sep 11 17:34:12 2009
@@ -272,6 +272,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,
@@ -305,6 +307,7 @@
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=813939&r1=813938&r2=813939&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml Fri Sep 11 17:34:12 2009
@@ -118,6 +118,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,
@@ -148,6 +150,7 @@
'=META-INF.cxf'
</Export-Package>
<_failok>true</_failok>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>
Modified: cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml?rev=813939&r1=813938&r2=813939&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml Fri Sep 11 17:34:12 2009
@@ -154,6 +154,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,
@@ -191,6 +194,7 @@
'=schemas.wsdl'
</Export-Package>
<_failok>true</_failok>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
</instructions>
</configuration>
</plugin>