Author: dkulp Date: Wed Oct 14 19:54:38 2009 New Revision: 825245 URL: http://svn.apache.org/viewvc?rev=825245&view=rev Log: Merged revisions 825224 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r825224 | dkulp | 2009-10-14 15:08:32 -0400 (Wed, 14 Oct 2009) | 10 lines Merged revisions 824769 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r824769 | dkulp | 2009-10-13 10:04:13 -0400 (Tue, 13 Oct 2009) | 2 lines Update to activemq 5.3.0 since it's released now and it fixes some dependency issues causing log4j problems in eclipse. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/parent/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=825245&r1=825244&r2=825245&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.1.x-fixes/parent/pom.xml Wed Oct 14 19:54:38 2009 @@ -47,7 +47,7 @@ <!-- please maintain alphabetical order here --> <abdera.version>0.4.0-incubating</abdera.version> - <activemq.version>5.1.0</activemq.version> + <activemq.version>5.3.0</activemq.version> <derby.version>10.2.2.0</derby.version> <jaxb.version>2.1</jaxb.version> <jaxb.impl.version>2.1.9</jaxb.impl.version>
