Repository: nifi Updated Branches: refs/heads/master e25b26e9c -> 0f8880547
NIFI-5691: - Overriding the version of jackson in aws java sdk. This closes #3066. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0f888054 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0f888054 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0f888054 Branch: refs/heads/master Commit: 0f8880547fad35243dae0d4d4ab6d8a5eb38d516 Parents: e25b26e Author: Matt Gilman <[email protected]> Authored: Fri Oct 12 10:23:47 2018 -0400 Committer: Aldrin Piri <[email protected]> Committed: Fri Oct 12 13:19:43 2018 -0400 ---------------------------------------------------------------------- .../nifi-aws-abstract-processors/pom.xml | 23 ++++++++++++++++++++ .../nifi-aws-service-api/pom.xml | 23 ++++++++++++++++++++ 2 files changed, 46 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0f888054/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml index cdd9325..22f721a 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml @@ -28,6 +28,16 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.amazonaws</groupId> @@ -85,6 +95,19 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-proxy-configuration-api</artifactId> </dependency> + + <!-- overriding jackson-databind in aws-java-sdk-core --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.9.7</version> + </dependency> + <!-- overriding jackson-dataformat-cbor in aws-java-sdk-core --> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + <version>2.9.7</version> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/nifi/blob/0f888054/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml index 3de49a3..b82b75a 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml @@ -27,11 +27,34 @@ <dependency> <groupId>com.amazonaws</groupId> <artifactId>aws-java-sdk-core</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-api</artifactId> </dependency> + + <!-- overriding jackson-databind in aws-java-sdk-core --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.9.7</version> + </dependency> + <!-- overriding jackson-dataformat-cbor in aws-java-sdk-core --> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + <version>2.9.7</version> + </dependency> </dependencies> </project>
