From 66a689df0e78397433bc856ad2c798abba5798e9 Mon Sep 17 00:00:00 2001
From: gtully <gary.tully@gmail.com>
Date: Mon, 28 Jul 2014 15:30:12 +0100
Subject: [PATCH] fix up karaf-itests , related commits
 https://issues.apache.org/jira/browse/AMQ-5224
 https://issues.apache.org/jira/browse/AMQ-5105 Update poms to fully load into
 M2E - 06bb7a2716f0cea216381b03f555dd497cb627ef

---
 .../org/apache/activemq/karaf/itest/activemq-nd-camel.xml    | 2 +-
 .../test/resources/org/apache/activemq/karaf/itest/camel.xml | 2 +-
 activemq-karaf/src/main/resources/features-core.xml          | 5 +++--
 activemq-leveldb-store/pom.xml                               | 4 ++++
 activemq-osgi/pom.xml                                        | 2 +-
 .../org/apache/activemq/partition/PartitionBrokerPlugin.java | 1 -
 activemq-web-console/pom.xml                                 | 3 +--
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq-nd-camel.xml b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq-nd-camel.xml
index af201b64b6..382e5ad818 100644
--- a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq-nd-camel.xml
+++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/activemq-nd-camel.xml
@@ -69,7 +69,7 @@
         </transportConnectors>
     </broker>
 
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61616?jms.dispatchAsync=false"/>
         <property name="userName" value="karaf" />
         <property name="password" value="karaf" />
diff --git a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/camel.xml b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/camel.xml
index 641c46a102..9caa8f7fd8 100644
--- a/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/camel.xml
+++ b/activemq-karaf-itest/src/test/resources/org/apache/activemq/karaf/itest/camel.xml
@@ -23,7 +23,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+    <bean id="activemqConnectionFactory" class="org.apache.activemq.ActiveMQXAConnectionFactory">
         <property name="brokerURL" value="tcp://localhost:61616?jms.dispatchAsync=false"/>
         <property name="userName" value="karaf" />
         <property name="password" value="karaf" />
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 50c1245f2a..23c6c59878 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -57,8 +57,9 @@
       <bundle dependency="true">mvn:org.apache.aries/org.apache.aries.util/${aries-version}</bundle>
       <bundle dependency="true">mvn:org.apache.activemq/activeio-core/${activeio-version}</bundle>
       <bundle dependency="true">mvn:org.codehaus.jettison/jettison/${jettison-version}</bundle>
-      <bundle dependency="true">mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
-      <bundle dependency="true">mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson-version}</bundle>
+      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson-version}</bundle>
+      <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson-version}</bundle>
       <bundle dependency="true">mvn:org.scala-lang/scala-library/${scala-version}</bundle>
     </feature>
   </features>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index c23d6538fa..8dae4ca96b 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -238,6 +238,10 @@
           <groupId>org.eclipse.jdt</groupId>
           <artifactId>core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.codehaus.jackson</groupId>
+          <artifactId>jackson-mapper-asl</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 1609b6beae..839dc2455c 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -49,7 +49,7 @@
       org.apache.http*;resolution:=optional,
       org.apache.xpath*;resolution:=optional,
       org.bouncycastle*;resolution:=optional,
-      org.codehaus.jackson*;resolution:=optional,
+      com.fasterxml.jackson*;resolution:=optional,
       org.codehaus.jettison*;resolution:=optional,
       org.jasypt*;resolution:=optional,
       org.eclipse.jetty*;resolution:=optional,
diff --git a/activemq-partition/src/main/java/org/apache/activemq/partition/PartitionBrokerPlugin.java b/activemq-partition/src/main/java/org/apache/activemq/partition/PartitionBrokerPlugin.java
index f5b4342ae9..418f564cab 100644
--- a/activemq-partition/src/main/java/org/apache/activemq/partition/PartitionBrokerPlugin.java
+++ b/activemq-partition/src/main/java/org/apache/activemq/partition/PartitionBrokerPlugin.java
@@ -19,7 +19,6 @@ package org.apache.activemq.partition;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
 import org.apache.activemq.partition.dto.Partitioning;
-import org.codehaus.jackson.JsonParseException;
 
 import java.io.IOException;
 
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index b3043471e6..8865732136 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -172,8 +172,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.2_spec</artifactId>
-        <version>1.2</version>
+        <artifactId>geronimo-jsp_2.1_spec</artifactId>
         <scope>provided</scope>
     </dependency>