cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r955746 - in /cxf/branches/2.2.x-fixes: ./ rt/bindings/jbi/pom.xml rt/transports/jbi/pom.xml
Date Thu, 17 Jun 2010 21:04:14 GMT
Author: dkulp
Date: Thu Jun 17 21:04:14 2010
New Revision: 955746

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

........
  r955745 | dkulp | 2010-06-17 17:02:19 -0400 (Thu, 17 Jun 2010) | 1 line
  
  Set version format and allow for "in jdk" versions of various things
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/bindings/jbi/pom.xml
    cxf/branches/2.2.x-fixes/rt/transports/jbi/pom.xml

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

Modified: cxf/branches/2.2.x-fixes/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/bindings/jbi/pom.xml?rev=955746&r1=955745&r2=955746&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/bindings/jbi/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/bindings/jbi/pom.xml Thu Jun 17 21:04:14 2010
@@ -132,12 +132,16 @@
                         <Specification-Version>${project.version}</Specification-Version>
                         <DynamicImport-Package>
                         </DynamicImport-Package>
-                        <Import-Package>*</Import-Package>
+                        <Import-Package>
+                           javax.xml.stream*;version="[0.0,2)",
+                           *
+                        </Import-Package>
                         <Export-Package>
                             org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
                             META-INF.cxf.binding.jbi
                         </Export-Package>
                         <_failok>true</_failok>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/branches/2.2.x-fixes/rt/transports/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/jbi/pom.xml?rev=955746&r1=955745&r2=955746&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/jbi/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/jbi/pom.xml Thu Jun 17 21:04:14 2010
@@ -125,6 +125,9 @@
                         <DynamicImport-Package>
                         </DynamicImport-Package>
                         <Import-Package>
+                            javax.activation;version="[0.0,2)",
+                            javax.annotation;version="[0.0,2)",
+                            javax.jws*;version="[0.0,3)",
                             *
                         </Import-Package>
                         <Export-Package>
@@ -132,6 +135,7 @@
                             META-INF.cxf.transport.jbi
                         </Export-Package>
                         <_failok>true</_failok>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message