You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2017/11/16 20:44:56 UTC

nifi git commit: NIFI-4593: - Ensuring the necessary jackson dependencies are bundled.

Repository: nifi
Updated Branches:
  refs/heads/master 53de8c93b -> 2da72f152


NIFI-4593: - Ensuring the necessary jackson dependencies are bundled.

This closes #2263.

Signed-off-by: Bryan Bende <bb...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2da72f15
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2da72f15
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2da72f15

Branch: refs/heads/master
Commit: 2da72f15243ef62d47369e8a87cc202a82dbe004
Parents: 53de8c9
Author: Matt Gilman <ma...@gmail.com>
Authored: Thu Nov 9 15:21:00 2017 -0500
Committer: Bryan Bende <bb...@apache.org>
Committed: Thu Nov 16 15:44:37 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/nifi/blob/2da72f15/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/pom.xml
----------------------------------------------------------------------
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 277bd62..dd3faf0 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>