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 2012/03/20 19:35:51 UTC

svn commit: r1303073 - in /cxf/branches/2.4.x-fixes: ./ parent/pom.xml

Author: dkulp
Date: Tue Mar 20 18:35:51 2012
New Revision: 1303073

URL: http://svn.apache.org/viewvc?rev=1303073&view=rev
Log:
Merged revisions 1302580 via  svn merge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes

........
  r1302580 | dkulp | 2012-03-19 14:11:32 -0400 (Mon, 19 Mar 2012) | 1 line
  
  Update asm version
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/parent/pom.xml

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

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=1303073&r1=1303072&r2=1303073&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.4.x-fixes/parent/pom.xml Tue Mar 20 18:35:51 2012
@@ -137,7 +137,7 @@
         <cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
         <cxf.jaxb.bundle.version>2.2.1.1_1</cxf.jaxb.bundle.version>
         <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.asm.bundle.version>3.3.1_1</cxf.asm.bundle.version>
         <cxf.wsdl4j.bundle.version>1.6.2_3</cxf.wsdl4j.bundle.version>
         <cxf.xmlsec.bundle.version>1.5.1</cxf.xmlsec.bundle.version>
         <cxf.rhino.bundle.version>1.7R2_1</cxf.rhino.bundle.version>
@@ -1039,7 +1039,7 @@
             <dependency>
                 <groupId>asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>3.3</version>
+                <version>3.3.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.velocity</groupId>