This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 07a4966 NIFI-8329 - Updated dependencies with no build failures 07a4966 is described below commit 07a4966d10c884e2d7c194af7ab5afb495ab58ea Author: Nathan Gough <thena...@gmail.com> AuthorDate: Tue Mar 16 16:33:27 2021 -0400 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 <exceptionfact...@apache.org> --- 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-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml | 2 +- .../nifi-aws-bundle/nifi-aws-abstract-processors/pom.xml | 2 +- nifi-nar-bundles/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-bundle/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-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml | 2 +- .../nifi-extension-utils/nifi-processor-utils/pom.xml | 2 +- nifi-nar-bundles/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-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 6 ++++++ nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 2 +- nifi-nar-bundles/nifi-graph-bundle/nifi-graph-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-ignite-bundle/pom.xml | 2 +- nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors/pom.xml | 4 ++-- .../nifi-jolt-record-bundle/nifi-jolt-record-processors/pom.xml | 6 +++++- nifi-nar-bundles/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-nar-bundles/nifi-network-bundle/nifi-network-utils/pom.xml | 2 +- .../nifi-parquet-bundle/nifi-parquet-processors/pom.xml | 2 +- nifi-nar-bundles/nifi-poi-bundle/nifi-poi-processors/pom.xml | 8 +------- nifi-nar-bundles/nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 2 +- nifi-nar-bundles/nifi-redis-bundle/nifi-redis-extensions/pom.xml | 2 +- .../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 2 +- .../nifi-spark-bundle/nifi-livy-controller-service/pom.xml | 2 +- nifi-nar-bundles/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-bundle/nifi-websocket-services-jetty/pom.xml | 6 ------ nifi-system-tests/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 928441c..e69e858 100644 --- a/nifi-commons/nifi-expression-language/pom.xml +++ b/nifi-commons/nifi-expression-language/pom.xml @@ -91,7 +91,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml index 77b7764..c823284 100644 --- a/nifi-commons/nifi-json-utils/pom.xml +++ b/nifi-commons/nifi-json-utils/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> <dependency> diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml index 3e4f58a..1a1571f 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml index 85bf817..3cb6248 100644 --- a/nifi-commons/nifi-web-utils/pom.xml +++ b/nifi-commons/nifi-web-utils/pom.xml @@ -68,7 +68,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml index b645a88..2e794a1 100644 --- a/nifi-external/nifi-spark-receiver/pom.xml +++ b/nifi-external/nifi-spark-receiver/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> </dependencies> </project> 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 905196c..c7eb58e 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. --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>commons-codec</groupId> 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 bdb9aac..08d0c55 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <!-- overriding jackson-dataformat-cbor in aws-java-sdk-core --> <dependency> 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 199a00c..44f4bbb 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <!-- overriding jackson-dataformat-cbor in aws-java-sdk-core --> <dependency> diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index a2cf6dc..2bfaed8 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -28,7 +28,6 @@ <properties> <azure-storage.version>8.4.0</azure-storage.version> <azure.core.version>1.6.0</azure.core.version> - <jackson.version>2.10.3</jackson.version> <azure-cosmos.version>4.2.0</azure-cosmos.version> </properties> 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 c4de817..0bd5ccd 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> </dependencies> </project> 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 f0d1b84..dc66890 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> 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 6737b8e..51089e0 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 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.25</version> + <version>1.28</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> @@ -62,7 +62,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <!-- test --> <dependency> 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 80bc3dd..adb71a0 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> <scope>compile</scope> </dependency> </dependencies> 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 436d8f5..8f58d73 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> 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 b88cef4..e408e29 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. --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 9476425..04f32fb 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. --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 59b563f..602f056 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 @@ <dependency> <groupId>org.springframework.integration</groupId> <artifactId>spring-integration-mail</artifactId> - <version>4.3.19.RELEASE</version> + <version>4.3.24.RELEASE</version> <exclusions> <exclusion> <groupId>org.springframework.retry</groupId> 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 084374d..5e772d9 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 84d0aa9..d7644f6 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.flume.flume-ng-sinks</groupId> 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 4878c95..8132c39 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> 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 3a5f006..6c46d60 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 9fc5ba2..fa134a6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -210,7 +210,7 @@ <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>60.2</version> + <version>68.2</version> </dependency> <dependency> <groupId>org.apache.tika</groupId> 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 931b169..fdead71 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 @@ <version>1.14.0-SNAPSHOT</version> <scope>test</scope> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> 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 821be7b..8febfe4 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <!-- TODO: Remove this when the next version of google-auth-library-oauth2-http is released and brings this in--> </dependencies> </project> 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 40e3f9f..d18f67b 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 46d9090..38bc470 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml index 83ae13e..60be738 100644 --- a/nifi-nar-bundles/nifi-ignite-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-ignite-bundle/pom.xml @@ -30,7 +30,7 @@ <module>nifi-ignite-nar</module> </modules> <properties> - <spring.version>4.3.19.RELEASE</spring.version> + <spring.version>4.3.24.RELEASE</spring.version> </properties> <dependencyManagement> <dependencies> 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 ead22b9..987abc1 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 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.15.11</version> + <version>5.15.14</version> <exclusions> <!-- --> <exclusion> @@ -64,7 +64,7 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> - <version>5.15.11</version> + <version>5.15.14</version> <scope>test</scope> </dependency> <dependency> 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 63d605f..b8b70a5 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 @@ -54,6 +54,10 @@ <exclusions> <exclusion> <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </exclusion> </exclusions> @@ -61,7 +65,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.github.ben-manes.caffeine</groupId> 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 3220596..770e500 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 @@ <module>nifi-kerberos-iaa-providers-nar</module> </modules> <properties> - <spring.version>4.3.19.RELEASE</spring.version> + <spring.version>4.3.24.RELEASE</spring.version> </properties> <dependencyManagement> <dependencies> 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 4749b68..9c96bc8 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.mongodb</groupId> 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 c84a316..f1e13d0 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 ee2a2d5..d2119a5 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> </dependencies> </project> \ 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 025fe0b..e21aec1 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.parquet</groupId> 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 5f5f5b3..decbc21 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 @@ -46,14 +46,8 @@ <!-- https://mvnrepository.com/artifact/xerces/xerces --> <dependency> <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - <version>2.4.0</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.11.0</version> + <version>2.12.1</version> </dependency> <dependency> 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 2f21f4b..f78cccb 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> 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 d937f52..67ea977 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 c6d906a..206ac9a 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 @@ <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.12.0</version> + <version>2.12.1</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 d90e944..34951f8 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> 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 c51239f..237ecc6 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. --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> </dependencies> <build> diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index ebb4675..59625b1 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -149,7 +149,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> @@ -234,12 +234,12 @@ <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> - <version>5.15.11</version> + <version>5.15.14</version> </dependency> <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-broker</artifactId> - <version>5.15.11</version> + <version>5.15.14</version> <scope>test</scope> </dependency> <dependency> 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 47e219c..6863477 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. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> 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 ae07c90..fed2940 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> 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 b22c747..ef371ea 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 @@ -33,12 +33,6 @@ <version>${jetty.version}</version> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.17</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-mock</artifactId> <version>1.14.0-SNAPSHOT</version> 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 02c4a55..a03f6ce 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 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.9.10</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.9.10</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi.registry</groupId> @@ -176,4 +176,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> diff --git a/nifi-toolkit/nifi-toolkit-admin/pom.xml b/nifi-toolkit/nifi-toolkit-admin/pom.xml index fcbab39..a851ace 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. --> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-toolkit/nifi-toolkit-cli/pom.xml b/nifi-toolkit/nifi-toolkit-cli/pom.xml index 624e7ee..3dd9c82 100644 --- a/nifi-toolkit/nifi-toolkit-cli/pom.xml +++ b/nifi-toolkit/nifi-toolkit-cli/pom.xml @@ -85,7 +85,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.jline</groupId> diff --git a/nifi-toolkit/nifi-toolkit-s2s/pom.xml b/nifi-toolkit/nifi-toolkit-s2s/pom.xml index 3e4a8f7..f5ca7cb 100644 --- a/nifi-toolkit/nifi-toolkit-s2s/pom.xml +++ b/nifi-toolkit/nifi-toolkit-s2s/pom.xml @@ -41,7 +41,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/nifi-toolkit/nifi-toolkit-tls/pom.xml b/nifi-toolkit/nifi-toolkit-tls/pom.xml index 414cbd4..fe65693 100644 --- a/nifi-toolkit/nifi-toolkit-tls/pom.xml +++ b/nifi-toolkit/nifi-toolkit-tls/pom.xml @@ -83,7 +83,7 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>${jackson-databind.version}</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> diff --git a/pom.xml b/pom.xml index cd4c5a9..d73907f 100644 --- a/pom.xml +++ b/pom.xml @@ -93,8 +93,7 @@ <org.slf4j.version>1.7.30</org.slf4j.version> <ranger.version>2.1.0</ranger.version> <jetty.version>9.4.38.v20210224</jetty.version> - <jackson.version>2.9.10</jackson.version> - <jackson-databind.version>2.9.10.8</jackson-databind.version> + <jackson.version>2.12.2</jackson.version> <nifi.registry.version>0.8.0</nifi.registry.version> <nifi.groovy.version>2.5.4</nifi.groovy.version> <surefire.version>2.22.2</surefire.version>