From 07a4966d10c884e2d7c194af7ab5afb495ab58ea Mon Sep 17 00:00:00 2001 From: Nathan Gough Date: Tue, 16 Mar 2021 16:33:27 -0400 Subject: [PATCH] NIFI-8329 - Updated dependencies with no build failures NIFI-8329 - Removed unnecessary jackson.version from azure bundle to use the global property instead. NIFI-8329 - Updated jackson/jackson-databind version and removed the 'jackson-databind.version' pom property in favor of 'jackson.version' Updated dependencies include the following: - jackson-core - jackson-databind - icu4j - snakeyaml - spring-integration-mail - spring-core and framework modules - activemq-client - activemq-broker - xercesImpl This closes #4911 Signed-off-by: David Handermann --- nifi-commons/nifi-expression-language/pom.xml | 2 +- nifi-commons/nifi-json-utils/pom.xml | 2 +- nifi-commons/nifi-site-to-site-client/pom.xml | 2 +- nifi-commons/nifi-web-utils/pom.xml | 2 +- nifi-external/nifi-spark-receiver/pom.xml | 2 +- .../nifi-avro-bundle/nifi-avro-processors/pom.xml | 2 +- .../nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml | 2 +- .../nifi-aws-bundle/nifi-aws-service-api/pom.xml | 2 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 1 - nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml | 2 +- .../nifi-datadog-reporting-task/pom.xml | 2 +- .../nifi-easyrules-bundle/nifi-easyrules-service/pom.xml | 4 ++-- .../nifi-elasticsearch-client-service-api/pom.xml | 2 +- .../nifi-elasticsearch-client-service/pom.xml | 2 +- .../nifi-elasticsearch-processors/pom.xml | 2 +- .../nifi-elasticsearch-restapi-processors/pom.xml | 2 +- .../nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- .../nifi-extension-utils/nifi-processor-utils/pom.xml | 2 +- .../nifi-flume-bundle/nifi-flume-processors/pom.xml | 2 +- .../nifi-framework/nifi-framework-cluster/pom.xml | 2 +- .../nifi-stateless-bundle/nifi-stateless-engine/pom.xml | 2 +- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +- .../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 6 ++++++ .../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 2 +- .../nifi-graph-bundle/nifi-graph-processors/pom.xml | 2 +- .../nifi-hbase-bundle/nifi-hbase-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-ignite-bundle/pom.xml | 2 +- .../nifi-jms-bundle/nifi-jms-processors/pom.xml | 4 ++-- .../nifi-jolt-record-processors/pom.xml | 6 +++++- .../nifi-kerberos-iaa-providers-bundle/pom.xml | 2 +- .../nifi-mongodb-bundle/nifi-mongodb-services/pom.xml | 2 +- .../nifi-network-bundle/nifi-network-processors/pom.xml | 2 +- .../nifi-network-bundle/nifi-network-utils/pom.xml | 2 +- .../nifi-parquet-bundle/nifi-parquet-processors/pom.xml | 2 +- .../nifi-poi-bundle/nifi-poi-processors/pom.xml | 8 +------- .../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 2 +- .../nifi-redis-bundle/nifi-redis-extensions/pom.xml | 2 +- .../nifi-scripting-processors/pom.xml | 2 +- .../nifi-livy-controller-service/pom.xml | 2 +- .../nifi-standard-bundle/nifi-standard-utils/pom.xml | 2 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 6 +++--- .../nifi-hwx-schema-registry-service/pom.xml | 2 +- .../nifi-record-serialization-services/pom.xml | 2 +- .../nifi-websocket-services-jetty/pom.xml | 6 ------ .../nifi-stateless-system-test-suite/pom.xml | 6 +++--- nifi-toolkit/nifi-toolkit-admin/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-cli/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-s2s/pom.xml | 2 +- nifi-toolkit/nifi-toolkit-tls/pom.xml | 2 +- pom.xml | 3 +-- 50 files changed, 63 insertions(+), 67 deletions(-) diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml index 928441c7ed..e69e85802c 100644 --- a/nifi-commons/nifi-expression-language/pom.xml +++ b/nifi-commons/nifi-expression-language/pom.xml @@ -91,7 +91,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.commons diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml index 77b77642d9..c823284a3c 100644 --- a/nifi-commons/nifi-json-utils/pom.xml +++ b/nifi-commons/nifi-json-utils/pom.xml @@ -32,7 +32,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} compile diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 3e4f58a084..1a1571f8bb 100644 --- a/nifi-commons/nifi-site-to-site-client/pom.xml +++ b/nifi-commons/nifi-site-to-site-client/pom.xml @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml index 85bf817abc..3cb6248809 100644 --- a/nifi-commons/nifi-web-utils/pom.xml +++ b/nifi-commons/nifi-web-utils/pom.xml @@ -68,7 +68,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index b645a88425..2e794a106c 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -43,7 +43,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${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 905196cee3..c7eb58e204 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 @@ -44,7 +44,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} commons-codec 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 bdb9aac95f..08d0c5591e 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 @@ -101,7 +101,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} 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 199a00c29b..44f4bbb45b 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 @@ -51,7 +51,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index a2cf6dcfa4..2bfaed83d5 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -28,7 +28,6 @@ 8.4.0 1.6.0 - 2.10.3 4.2.0 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 c4de817063..0bd5ccd9d2 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml @@ -39,7 +39,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml index f0d1b8474a..dc66890694 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml @@ -67,7 +67,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.google.guava diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml index 6737b8e38b..51089e0dcd 100644 --- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml +++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml @@ -32,7 +32,7 @@ org.yaml snakeyaml - 1.25 + 1.28 org.apache.nifi @@ -62,7 +62,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml index 80bc3dddf0..adb71a092c 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml @@ -46,7 +46,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} compile diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml index 436d8f5a0e..8f58d73841 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml @@ -65,7 +65,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} 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 b88cef4c43..e408e297fc 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 @@ -131,7 +131,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml index 9476425e2b..04f32fb369 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml @@ -85,7 +85,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} 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 59b563fd69..602f056780 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 @@ -88,7 +88,7 @@ org.springframework.integration spring-integration-mail - 4.3.19.RELEASE + 4.3.24.RELEASE org.springframework.retry 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 084374d645..5e772d90f1 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 @@ -64,7 +64,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml index 84d0aa9283..d7644f674e 100644 --- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml +++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml @@ -92,7 +92,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.flume.flume-ng-sinks diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml index 4878c9558d..8132c39fed 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml @@ -113,7 +113,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/pom.xml index 3a5f006087..6c46d603e6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-stateless-bundle/nifi-stateless-engine/pom.xml @@ -85,7 +85,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 9fc5ba28c1..fa134a6c9d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -210,7 +210,7 @@ com.ibm.icu icu4j - 60.2 + 68.2 org.apache.tika diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml index 931b169e7a..fdead71738 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml @@ -106,6 +106,12 @@ 1.14.0-SNAPSHOT test + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + test + diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml index 821be7b554..8febfe43f1 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml @@ -48,7 +48,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml index 40e3f9f161..d18f67bbd7 100644 --- a/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml +++ b/nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml @@ -52,7 +52,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi 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 46d9090d6b..38bc470989 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,7 +60,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml index 83ae13e14d..60be738f2d 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml @@ -30,7 +30,7 @@ nifi-ignite-nar - 4.3.19.RELEASE + 4.3.24.RELEASE diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml index ead22b906f..987abc1916 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml @@ -51,7 +51,7 @@ org.apache.activemq activemq-client - 5.15.11 + 5.15.14 @@ -64,7 +64,7 @@ org.apache.activemq activemq-broker - 5.15.11 + 5.15.14 test diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml index 63d605f76c..b8b70a517a 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml @@ -52,6 +52,10 @@ com.bazaarvoice.jolt json-utils + + com.fasterxml.jackson.core + jackson-core + com.fasterxml.jackson.core jackson-databind @@ -61,7 +65,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.github.ben-manes.caffeine diff --git a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml index 322059613e..770e500a10 100644 --- a/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-kerberos-iaa-providers-bundle/pom.xml @@ -27,7 +27,7 @@ nifi-kerberos-iaa-providers-nar - 4.3.19.RELEASE + 4.3.24.RELEASE diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml index 4749b687f1..9c96bc842a 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-services/pom.xml @@ -55,7 +55,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.mongodb diff --git a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml index c84a3164c6..f1e13d08f9 100644 --- a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors/pom.xml @@ -43,7 +43,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml b/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml index ee2a2d53b7..d2119a5ca9 100644 --- a/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml @@ -26,7 +26,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml index 025fe0ba00..e21aec171f 100644 --- a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml +++ b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-processors/pom.xml @@ -53,7 +53,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.parquet diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml index 5f5f5b3c42..decbc217e4 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml @@ -44,16 +44,10 @@ - - xerces - xerces - 2.4.0 - - xerces xercesImpl - 2.11.0 + 2.12.1 diff --git a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml index 2f21f4bf0d..f78cccbcb7 100644 --- a/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml +++ b/nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml @@ -104,7 +104,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.hadoop 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 d937f52416..67ea977853 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,7 +54,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml index c6d906ab00..206ac9a885 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml @@ -114,7 +114,7 @@ xerces xercesImpl - 2.12.0 + 2.12.1 org.apache.nifi diff --git a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml index d90e944192..34951f8238 100644 --- a/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml +++ b/nifi-nar-bundles/nifi-spark-bundle/nifi-livy-controller-service/pom.xml @@ -49,7 +49,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi 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 c51239ffd2..237ecc61e5 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 @@ -48,7 +48,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index ebb467585f..59625b1028 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -149,7 +149,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core @@ -234,12 +234,12 @@ org.apache.activemq activemq-client - 5.15.11 + 5.15.14 org.apache.activemq activemq-broker - 5.15.11 + 5.15.14 test 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 47e219c048..6863477f41 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 @@ -123,7 +123,7 @@ limitations under the License. com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core 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 ae07c90db1..fed2940c3e 100755 --- 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 @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.commons diff --git a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/pom.xml b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/pom.xml index b22c747e64..ef371ea8b4 100644 --- a/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/pom.xml +++ b/nifi-nar-bundles/nifi-websocket-bundle/nifi-websocket-services-jetty/pom.xml @@ -32,12 +32,6 @@ websocket-server ${jetty.version} - - log4j - log4j - 1.2.17 - test - org.apache.nifi nifi-mock diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml index 02c4a55130..a03f6ce9e4 100644 --- a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml +++ b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml @@ -37,12 +37,12 @@ com.fasterxml.jackson.core jackson-core - 2.9.10 + ${jackson.version} com.fasterxml.jackson.core jackson-databind - 2.9.10 + ${jackson.version} org.apache.nifi.registry @@ -176,4 +176,4 @@ - \ No newline at end of file + diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index fcbab39305..a851aceff9 100644 --- a/nifi-toolkit/nifi-toolkit-admin/pom.xml +++ b/nifi-toolkit/nifi-toolkit-admin/pom.xml @@ -39,7 +39,7 @@ language governing permissions and limitations under the License. --> com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.nifi diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index 624e7ee757..3dd9c82306 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -85,7 +85,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.jline diff --git a/nifi-toolkit/nifi-toolkit-s2s/pom.xml b/nifi-toolkit/nifi-toolkit-s2s/pom.xml index 3e4a8f75f4..f5ca7cbcf4 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/pom.xml +++ b/nifi-toolkit/nifi-toolkit-s2s/pom.xml @@ -41,7 +41,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} com.fasterxml.jackson.core diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index 414cbd48b3..fe65693faa 100644 --- a/nifi-toolkit/nifi-toolkit-tls/pom.xml +++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml @@ -83,7 +83,7 @@ com.fasterxml.jackson.core jackson-databind - ${jackson-databind.version} + ${jackson.version} org.apache.httpcomponents diff --git a/pom.xml b/pom.xml index cd4c5a9d2e..d73907f5ae 100644 --- a/pom.xml +++ b/pom.xml @@ -93,8 +93,7 @@ 1.7.30 2.1.0 9.4.38.v20210224 - 2.9.10 - 2.9.10.8 + 2.12.2 0.8.0 2.5.4 2.22.2