cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1222774 - in /cxf/branches/2.4.x-fixes: ./ osgi/bundle/all/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml
Date Fri, 23 Dec 2011 18:14:35 GMT
Author: dkulp
Date: Fri Dec 23 18:14:34 2011
New Revision: 1222774

URL: http://svn.apache.org/viewvc?rev=1222774&view=rev
Log:
Merged revisions 1222469 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1222469 | ay | 2011-12-22 16:36:40 -0500 (Thu, 22 Dec 2011) | 1 line
  
  specifying cxf version for META-INF.cxf* exports
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
    cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml
    cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml

Propchange: cxf/branches/2.4.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/all/pom.xml Fri Dec 23 18:14:34 2011
@@ -372,8 +372,8 @@
                         <Bundle-Activator>org.apache.cxf.bus.osgi.OSGiExtensionLocator</Bundle-Activator>
                         <Export-Package>
                             org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
-                            '=META-INF.cxf.osgi',
-                            '=META-INF.cxf'
+                            '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean},
+                            '=META-INF.cxf';version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <_failok>true</_failok>
                         <_nouses>true</_nouses>

Modified: cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/jaxrs/pom.xml Fri Dec 23 18:14:34 2011
@@ -172,8 +172,8 @@
                         <Bundle-Activator>org.apache.cxf.bus.osgi.OSGiExtensionLocator</Bundle-Activator>
                         <Export-Package>
                             org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
-                            '=META-INF.cxf.osgi',
-                            '=META-INF.cxf'
+                            '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean},
+                            '=META-INF.cxf';version=${cxf.osgi.version.clean}
                         </Export-Package>
                         <_failok>true</_failok>
                         <_nouses>true</_nouses>

Modified: cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml?rev=1222774&r1=1222773&r2=1222774&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/bundle/minimal/pom.xml Fri Dec 23 18:14:34 2011
@@ -222,8 +222,8 @@
                         <Bundle-Activator>org.apache.cxf.bus.osgi.OSGiExtensionLocator</Bundle-Activator>
                         <Export-Package>
                             org.apache.cxf.*;version=${cxf.osgi.version.clean};-split-package:=merge-first,
-                            '=META-INF.cxf',
-                            '=META-INF.cxf.osgi',
+                            '=META-INF.cxf';version=${cxf.osgi.version.clean},
+                            '=META-INF.cxf.osgi';version=${cxf.osgi.version.clean},
                             '=schemas',
                             '=schemas.configuration',
                             '=schemas.wsdl'



Mime
View raw message