From 28c3bf666cd2406cd334f95559b6e133a1ef65cf Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Mon, 14 Aug 2017 18:02:22 -0400 Subject: [PATCH 1/6] NIFI-4297 Upgraded immediately actionable dependency versions from Meterian report. All tests pass. --- nifi-external/nifi-storm-spout/pom.xml | 1 - .../nifi-azure-bundle/nifi-azure-processors/pom.xml | 6 ++++++ .../nifi-elasticsearch-5-processors/pom.xml | 4 ++-- .../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- .../nifi-solr-bundle/nifi-solr-processors/pom.xml | 12 ++++++++++++ .../nifi-jolt-transform-json-ui/pom.xml | 4 ++-- .../nifi-standard-bundle/nifi-standard-utils/pom.xml | 4 ++-- .../nifi-hwx-schema-registry-service/pom.xml | 8 ++++++++ pom.xml | 8 ++++---- 9 files changed, 37 insertions(+), 12 deletions(-) diff --git a/nifi-external/nifi-storm-spout/pom.xml b/nifi-external/nifi-storm-spout/pom.xml index e62076424d9f..6c9032c11793 100644 --- a/nifi-external/nifi-storm-spout/pom.xml +++ b/nifi-external/nifi-storm-spout/pom.xml @@ -20,7 +20,6 @@ nifi-external 1.5.0-SNAPSHOT - org.apache.nifi nifi-storm-spout diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml index 31593f030e4f..d5f1ec57efc5 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml @@ -37,6 +37,12 @@ com.microsoft.azure azure-storage 5.0.0 + + + com.fasterxml.jackson.core + jackson-core + + org.apache.nifi diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml index 27a12dee65e1..913cca94640a 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-5-processors/pom.xml @@ -62,12 +62,12 @@ language governing permissions and limitations under the License. --> org.apache.logging.log4j log4j-api - 2.7 + 2.8.2 org.apache.logging.log4j log4j-core - 2.7 + 2.8.2 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 67d636e3fac7..267027e1c6d4 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -102,7 +102,7 @@ org.apache.poi poi-scratchpad - 3.14 + 3.15 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index a6bd9698facc..c7255e3e3dbb 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -30,6 +30,12 @@ org.apache.solr solr-solrj ${solr.version} + + + com.fasterxml.jackson.core + jackson-core + + commons-codec @@ -77,6 +83,12 @@ solr-core ${solr.version} test + + + com.fasterxml.jackson.core + jackson-core + + diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml index ada25285d319..2ed6b9a1cdea 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/pom.xml @@ -129,12 +129,12 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-core - 2.6.2 + ${jackson.version} com.fasterxml.jackson.core jackson-annotations - 2.6.2 + ${jackson.version} com.sun.jersey.jersey-test-framework diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml index f42a4031ba3b..77b4d67eaf44 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-utils/pom.xml @@ -38,12 +38,12 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-core - 2.6.2 + ${jackson.version} com.fasterxml.jackson.core jackson-annotations - 2.6.2 + ${jackson.version} 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 dc0f840c0764..1061296181ee 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 @@ -168,6 +168,14 @@ limitations under the License. com.fasterxml.jackson.dataformat jackson-dataformat-yaml + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + org.mozilla rhino diff --git a/pom.xml b/pom.xml index e0e13279a2b0..6a15872e613e 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ 1.7.25 9.4.3.v20170317 4.10.4 - 4.2.4.RELEASE + 4.3.10.RELEASE 4.2.3.RELEASE 1.19 2.7.3 @@ -105,8 +105,8 @@ 1.2.1 2.6.2 1.1.2 - 1.0.1 - 0.3.0 + 1.1.1 + 2.8.6 @@ -806,7 +806,7 @@ com.fasterxml.jackson.core jackson-databind - 2.6.1 + ${jackson.version} org.apache.spark From 10059c8d7348c8530b2a58af40fb3c634007be73 Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Mon, 14 Aug 2017 18:34:33 -0400 Subject: [PATCH 2/6] NIFI-4297 Upgraded jackson-core test dependencies for HBase and Elasticsearch modules. Only 3 instances of jackson-core < 2.8.6 (Google Cloud Platform and Spark Receiver modules). All tests pass. --- .../nifi-elasticsearch-processors/pom.xml | 8 +++++++- .../nifi-hbase-bundle/nifi-hbase-processors/pom.xml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml index 8908d098852c..0489758a943f 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml @@ -76,6 +76,12 @@ language governing permissions and limitations under the License. --> org.elasticsearch elasticsearch ${es.version} + + + com.fasterxml.jackson.core + jackson-core + + com.squareup.okhttp3 @@ -102,7 +108,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-core - 2.5.4 + ${jackson.version} test diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml index 1ec18b37da2b..f221c549e3af 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml @@ -75,7 +75,7 @@ com.fasterxml.jackson.core jackson-core - 2.5.4 + ${jackson.version} test From a74b4202495d2f648c95220b32156be0223b6584 Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Mon, 14 Aug 2017 18:44:35 -0400 Subject: [PATCH 3/6] NIFI-4297 Upgraded version of poi dependency in nifi-email-processors to 3.16. --- .../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml index 267027e1c6d4..aaf586ce946c 100644 --- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml +++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml @@ -102,7 +102,7 @@ org.apache.poi poi-scratchpad - 3.15 + 3.16 org.apache.nifi From f57db387a827cff6f004aaec6e517c696ce122ed Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Wed, 4 Oct 2017 13:26:23 -0700 Subject: [PATCH 4/6] NIFI-4297 Resolving dependency issues after rebasing against 1.5.0-SNAPSHOT. --- .../nifi-framework/nifi-web/nifi-web-security/pom.xml | 5 ----- .../nifi-solr-bundle/nifi-solr-processors/pom.xml | 5 +++++ .../nifi-standard-bundle/nifi-standard-processors/pom.xml | 5 ----- pom.xml | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml index fb7318d28972..8c7a7958dacc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml @@ -20,7 +20,6 @@ nifi-web 1.5.0-SNAPSHOT - org.apache.nifi nifi-web-security @@ -106,10 +105,6 @@ com.google.guava guava - - org.apache.nifi - nifi-security-utils - org.springframework spring-jdbc diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml index c7255e3e3dbb..1068a57dd32f 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-processors/pom.xml @@ -37,6 +37,11 @@ + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + commons-codec commons-codec diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index ae15f4aafac7..21f25093cb92 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -250,11 +250,6 @@ 1.5.0-SNAPSHOT test - - org.apache.nifi - nifi-schema-registry-service-api - test - org.apache.nifi nifi-lookup-services diff --git a/pom.xml b/pom.xml index 6a15872e613e..5a0d0f94ff88 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,7 @@ 2.6.2 1.1.2 1.1.1 + 0.3.0 2.8.6 From 0818cb79f5c285dc206dfc37ab3817e1ece5e7b0 Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Wed, 4 Oct 2017 18:07:01 -0700 Subject: [PATCH 5/6] NIFI-4297 Removed jackson-databind from block in nifi/pom.xml and added explicit reference to ${jackson.version} in all referenced artifacts. --- nifi-commons/nifi-expression-language/pom.xml | 1 + nifi-external/nifi-spark-receiver/pom.xml | 2 +- .../nifi-avro-bundle/nifi-avro-processors/pom.xml | 1 + nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml | 1 + .../nifi-redis-bundle/nifi-redis-extensions/pom.xml | 1 + .../nifi-standard-content-viewer/pom.xml | 1 + .../nifi-standard-processors/pom.xml | 1 + .../nifi-record-serialization-services/pom.xml | 1 + nifi-toolkit/nifi-toolkit-admin/pom.xml | 1 + nifi-toolkit/nifi-toolkit-s2s/pom.xml | 1 + nifi-toolkit/nifi-toolkit-tls/pom.xml | 1 + pom.xml | 10 +++++----- 12 files changed, 16 insertions(+), 6 deletions(-) diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml index 8827ef285f3d..a3f4ce4b9d3b 100644 --- a/nifi-commons/nifi-expression-language/pom.xml +++ b/nifi-commons/nifi-expression-language/pom.xml @@ -77,6 +77,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.commons diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index 6384446a747a..2f2fffd92bdc 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -41,7 +41,7 @@ com.fasterxml.jackson.core jackson-databind - 2.6.5 + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml index 0e413216ced9..6e41f037ad60 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml @@ -41,6 +41,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind + ${jackson.version} commons-codec diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml index c72794eef238..126f76cfaea2 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml @@ -38,6 +38,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml index fd206a420c1c..785170bea99b 100644 --- a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml +++ b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml @@ -54,6 +54,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml index 8ae0bd0c92b1..357bf79eb9f2 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml @@ -46,6 +46,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index 21f25093cb92..cbfeb1a4e0b8 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -180,6 +180,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml index 8ba58a522edd..827ca77b4a45 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml @@ -55,6 +55,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.commons diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index 00b4e74b2e51..8fd2e0d27c95 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -40,6 +40,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.nifi diff --git a/nifi-toolkit/nifi-toolkit-s2s/pom.xml b/nifi-toolkit/nifi-toolkit-s2s/pom.xml index 5dd3c805a1b8..7efb4b001d10 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/pom.xml +++ b/nifi-toolkit/nifi-toolkit-s2s/pom.xml @@ -38,6 +38,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index 0b9adb46f559..e75c00a9b400 100644 --- a/nifi-toolkit/nifi-toolkit-tls/pom.xml +++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml @@ -65,6 +65,7 @@ com.fasterxml.jackson.core jackson-databind + ${jackson.version} org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index 5a0d0f94ff88..0bd5f8740ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -804,11 +804,11 @@ jackson-mapper-asl 1.9.13 - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + + + + org.apache.spark spark-streaming_2.10 From b95c89fb61c14d7ae13a4c96e589df510b8b483f Mon Sep 17 00:00:00 2001 From: Andy LoPresto Date: Thu, 5 Oct 2017 12:15:24 -0700 Subject: [PATCH 6/6] NIFI-4297 Removed jackson-mapper-asl from block in nifi/pom.xml and added explicit reference to ${jackson.old.version} in all referenced artifacts. Removed Jasypt from and added explicit version in test dependency for legacy compatibility. --- nifi-commons/nifi-site-to-site-client/pom.xml | 1 + .../nifi-elasticsearch-processors/pom.xml | 1 + .../nifi-processor-utils/pom.xml | 1 + .../nifi-framework/nifi-framework-core/pom.xml | 1 + .../nifi-hbase-processors/pom.xml | 1 + .../nifi-standard-processors/pom.xml | 1 + .../nifi-record-serialization-services/pom.xml | 1 + nifi-toolkit/nifi-toolkit-admin/pom.xml | 1 + pom.xml | 16 +--------------- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 70d3ead7ff1e..2d166cdb483d 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -48,6 +48,7 @@ org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml index 0489758a943f..e04cf13fe088 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml @@ -99,6 +99,7 @@ language governing permissions and limitations under the License. --> org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml index 03c62c1382d6..7d13506ba84e 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-processor-utils/pom.xml @@ -61,6 +61,7 @@ org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index ff168abea781..549927dc7573 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -165,6 +165,7 @@ org.jasypt jasypt + 1.9.2 test diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml index f221c549e3af..b87ebdb39464 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml @@ -60,6 +60,7 @@ org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml index cbfeb1a4e0b8..73cd525591f7 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml @@ -194,6 +194,7 @@ org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} com.squareup.okhttp3 diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml index 827ca77b4a45..6ee6a9927483 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services/pom.xml @@ -51,6 +51,7 @@ org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} com.fasterxml.jackson.core diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index 8fd2e0d27c95..f49c5ce38d57 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -101,6 +101,7 @@ language governing permissions and limitations under the License. --> org.codehaus.jackson jackson-mapper-asl + ${jackson.old.version} com.fasterxml.jackson.jaxrs diff --git a/pom.xml b/pom.xml index 0bd5f8740ca4..56961ec2a821 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,7 @@ 1.1.1 0.3.0 2.8.6 + 1.9.13 @@ -794,21 +795,6 @@ h2 1.3.176 - - org.jasypt - jasypt - 1.9.2 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - - - - - org.apache.spark spark-streaming_2.10