From f0d18816675197fc51c8f424cada2b60621adf28 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@redhat.com>
Date: Fri, 19 Dec 2014 11:51:17 -0600
Subject: [PATCH] ACTIVEMQ6-62 Remove unneeded dependency on jackson

---
 activemq-dto/pom.xml                                         | 5 -----
 .../src/main/java/org/apache/activemq/dto/BrokerDTO.java     | 3 ---
 .../src/main/java/org/apache/activemq/dto/SecurityDTO.java   | 3 ---
 distribution/activemq/pom.xml                                | 5 -----
 distribution/activemq/src/main/assembly/dep.xml              | 1 -
 pom.xml                                                      | 1 -
 6 files changed, 18 deletions(-)

diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml
index f57a571126..6fea333871 100644
--- a/activemq-dto/pom.xml
+++ b/activemq-dto/pom.xml
@@ -22,11 +22,6 @@
          <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson-databind.version}</version>
-      </dependency>
    </dependencies>
 
    <build>
diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java
index c6f8974a49..252b050ef8 100644
--- a/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java
+++ b/activemq-dto/src/main/java/org/apache/activemq/dto/BrokerDTO.java
@@ -16,8 +16,6 @@
  */
 package org.apache.activemq.dto;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElementRef;
@@ -27,7 +25,6 @@ import java.util.List;
 
 @XmlRootElement(name = "broker")
 @XmlAccessorType(XmlAccessType.FIELD)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class")
 public class BrokerDTO
 {
 
diff --git a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java
index 84e44fe4b7..723f92d01a 100644
--- a/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java
+++ b/activemq-dto/src/main/java/org/apache/activemq/dto/SecurityDTO.java
@@ -16,15 +16,12 @@
  */
 package org.apache.activemq.dto;
 
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlType(name = "security")
 @XmlAccessorType(XmlAccessType.FIELD)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.PROPERTY, property = "@class")
 public class SecurityDTO
 {
 }
diff --git a/distribution/activemq/pom.xml b/distribution/activemq/pom.xml
index 9fd862e5a6..e99e202080 100644
--- a/distribution/activemq/pom.xml
+++ b/distribution/activemq/pom.xml
@@ -136,11 +136,6 @@
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-client</artifactId>
        </dependency>
-       <dependency>
-           <groupId>com.fasterxml.jackson.core</groupId>
-           <artifactId>jackson-databind</artifactId>
-           <version>${jackson-databind.version}</version>
-       </dependency>
        <dependency>
            <groupId>org.apache.activemq</groupId>
            <artifactId>activemq-client</artifactId>
diff --git a/distribution/activemq/src/main/assembly/dep.xml b/distribution/activemq/src/main/assembly/dep.xml
index 0c2e3238f4..20770c095b 100644
--- a/distribution/activemq/src/main/assembly/dep.xml
+++ b/distribution/activemq/src/main/assembly/dep.xml
@@ -44,7 +44,6 @@
             <include>io.airlift:airline</include>
             <include>com.google.guava:guava</include>
             <include>javax.inject:javax.inject</include>
-            <include>com.fasterxml.jackson.core:jackson-*</include>
             <include>org.eclipse.jetty.aggregate:jetty-all-server</include>
             <include>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</include>
          </includes>
diff --git a/pom.xml b/pom.xml
index 1e2ba339bf..2e1c4162f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
          (${activemq.version.versionName}, ${activemq.version.incrementingVersion})
       </ActiveMQ-Version>
       <resteasy.version>3.0.9.Final</resteasy.version>
-      <jackson-databind.version>2.3.1</jackson-databind.version>
       <skipUnitTests>true</skipUnitTests>
       <skipJmsTests>true</skipJmsTests>
       <skipBytemanTests>true</skipBytemanTests>