From f0e8b6d9e32f55d464aed55c5bb79081bb16306f Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Thu, 11 Feb 2021 13:41:45 -0500
Subject: Fix jackson version in apex-pdp

The kafka_2.12 jar depends on jackson-module-scala, but the default
version does not work with the version of jackson used by policy.
Modified the dependency tree to include a version that does work.

Issue-ID: POLICY-3005
Change-Id: I06fd5b99d6e5c1053e17a754f22f815062f907b2
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 testsuites/integration/integration-uservice-test/pom.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'testsuites/integration/integration-uservice-test/pom.xml')

diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml
index 17ae2ca8c..b6f84e68f 100644
--- a/testsuites/integration/integration-uservice-test/pom.xml
+++ b/testsuites/integration/integration-uservice-test/pom.xml
@@ -3,7 +3,7 @@
    Copyright (C) 2018 Ericsson. All rights reserved.
    Modifications Copyright (C) 2019-2020 Nordix Foundation.
    Modifications Copyright (C) 2020 Bell Canada.
-   Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+   Modifications Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -143,8 +143,19 @@
                     <groupId>org.apache.zookeeper</groupId>
                     <artifactId>zookeeper</artifactId>
                 </exclusion>
+                <!-- The default jackson module doesn't support the new jackson databind -->
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.module</groupId>
+                    <artifactId>jackson-module-scala_2.12</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-scala_2.12</artifactId>
+            <version>${version.jackson}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.salesforce.kafka.test</groupId>
             <artifactId>kafka-junit4</artifactId>
-- 
cgit 1.2.3-korg