Author: ningjiang
Date: Fri Aug 20 01:42:59 2010
New Revision: 987363
URL: http://svn.apache.org/viewvc?rev=987363&view=rev
Log:
CAMEL-3062 Upgrade ActiveMQ to 5.4.0
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
camel/trunk/parent/pom.xml
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java?rev=987363&r1=987362&r2=987363&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateHeadersTest.java
Fri Aug 20 01:42:59 2010
@@ -62,9 +62,8 @@ public class ActiveMQPropagateHeadersTes
List<Exchange> list = resultEndpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
- Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
- Destination destination = assertIsInstanceOf(Destination.class,
replyTo);
- assertEquals("ReplyTo", replyQueue.toString(), destination.toString());
+ String replyTo = exchange.getIn().getHeader("JMSReplyTo",
String.class);
+ assertEquals("ReplyTo", replyQueue.toString(), replyTo);
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=987363&r1=987362&r2=987363&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Aug 20 01:42:59 2010
@@ -35,7 +35,7 @@
<properties>
<compiler.fork>false</compiler.fork>
<!-- Note that activemq dependency is only used for testing! -->
- <activemq-version>5.3.2</activemq-version>
+ <activemq-version>5.4.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<aries-blueprint-version>0.1-incubating</aries-blueprint-version>
<axiom-version>1.2.8</axiom-version>