From 60fe4b0d91a252a38d40749f80dceef9ceed3918 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Thu, 9 Nov 2017 15:21:00 -0500
Subject: [PATCH] NIFI-4593: - Ensuring the necessary jackson dependencies are
 bundled.

---
 .../nifi-hwx-schema-registry-service/pom.xml         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
index 277bd626e5ec..dd3faf0bf716 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
@@ -206,6 +206,18 @@ limitations under the License.
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- explicitly pulling in jackson and excluding above to not conflict with transitive test dependencies from nifi-mock -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         
         <dependency>
             <groupId>junit</groupId>