cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1293541 - in /cxf/branches/2.4.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml parent/pom.xml
Date Sat, 25 Feb 2012 07:53:50 GMT
Author: ningjiang
Date: Sat Feb 25 07:53:50 2012
New Revision: 1293541

URL: http://svn.apache.org/viewvc?rev=1293541&view=rev
Log:
Merged revisions 1293337,1293540 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

................
  r1293337 | ningjiang | 2012-02-25 00:48:58 +0800 (Sat, 25 Feb 2012) | 9 lines
  
  Merged revisions 1293326 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1293326 | ningjiang | 2012-02-25 00:30:40 +0800 (Sat, 25 Feb 2012) | 1 line
    
    Updated the xmlsec bundle version with 1.5.0
  ........
................
  r1293540 | ningjiang | 2012-02-25 15:34:45 +0800 (Sat, 25 Feb 2012) | 1 line
  
  Using the latested release xmlsec bundle in the features.xml
................

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
    cxf/branches/2.4.x-fixes/parent/pom.xml

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 25 07:53:50 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1292050,1292373,1292766,1292793,1293258
-/cxf/trunk:1221366,1291943,1292763,1292792,1293255
+/cxf/branches/2.5.x-fixes:1292050,1292373,1292766,1292793,1293258,1293337,1293540
+/cxf/trunk:1221366,1291943,1292763,1292792,1293255,1293326

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

Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1293541&r1=1293540&r2=1293541&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original)
+++ cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml Sat Feb 25
07:53:50 2012
@@ -59,7 +59,7 @@
     </feature>
     <feature name="wss4j" version="${cxf.wss4j.version}" resolver='(obr)'>
         <feature version='[2.4,3)'>opensaml</feature>
-        <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version}</bundle>
+        <bundle dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle>
         <bundle>mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version}</bundle>
     </feature>
 

Modified: cxf/branches/2.4.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1293541&r1=1293540&r2=1293541&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Sat Feb 25 07:53:50 2012
@@ -136,7 +136,7 @@
         <cxf.saaj-impl.bundle.version>1.3.9_2</cxf.saaj-impl.bundle.version>
         <cxf.asm.bundle.version>3.3_2</cxf.asm.bundle.version>
         <cxf.wsdl4j.bundle.version>1.6.2_3</cxf.wsdl4j.bundle.version>
-        <cxf.xmlsec.bundle.version>1.4.5_1</cxf.xmlsec.bundle.version>
+        <cxf.xmlsec.bundle.version>1.5.1</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_1</cxf.rhino.bundle.version>
         <cxf.xmlresolver.bundle.version>1.2_3</cxf.xmlresolver.bundle.version>
         <cxf.xerces.bundle.version>2.9.1_4</cxf.xerces.bundle.version>



Mime
View raw message