From bd4ba343399ddd9f2b722d48b21f3258f34f8401 Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Wed, 25 Oct 2023 12:22:26 -0500 Subject: [PATCH] NIFI-12266 Added Standard Shared NAR and BOM (#7925) - Added nifi-standard-shared-nar with common dependencies - Added nifi-standard-shared-bom with provided scope for parent module references --- minifi/minifi-assembly/pom.xml | 5 + .../minifi-standard-nar/pom.xml | 2 +- .../minifi-update-attribute-nar/pom.xml | 2 +- minifi/pom.xml | 6 + nifi-assembly/pom.xml | 6 + nifi-bom/pom.xml | 6 + .../nifi-airtable-nar/pom.xml | 8 +- .../nifi-airtable-processors/pom.xml | 3 +- nifi-nar-bundles/nifi-airtable-bundle/pom.xml | 3 +- .../nifi-avro-bundle/nifi-avro-nar/pom.xml | 6 +- nifi-nar-bundles/nifi-avro-bundle/pom.xml | 3 +- .../nifi-aws-abstract-processors/pom.xml | 1 - .../nifi-aws-bundle/nifi-aws-nar/pom.xml | 4 - .../nifi-aws-processors/pom.xml | 4 + .../nifi-aws-service-api-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-aws-bundle/pom.xml | 3 +- .../nifi-azure-bundle/nifi-azure-nar/pom.xml | 4 - .../nifi-azure-reporting-task/pom.xml | 3 - .../nifi-azure-services-api-nar/pom.xml | 8 +- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 3 +- .../nifi-box-bundle/nifi-box-nar/pom.xml | 4 - .../nifi-box-services-api-nar/pom.xml | 12 +- nifi-nar-bundles/nifi-box-bundle/pom.xml | 3 +- .../nifi-cassandra-nar/pom.xml | 4 - .../nifi-cassandra-services-api-nar/pom.xml | 3 +- .../nifi-cassandra-bundle/pom.xml | 3 +- .../nifi-cdc-mysql-nar/pom.xml | 3 +- nifi-nar-bundles/nifi-cdc/pom.xml | 3 +- .../nifi-cipher-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-cipher-bundle/pom.xml | 3 +- .../nifi-confluent-platform-nar/pom.xml | 3 +- .../nifi-confluent-platform-bundle/pom.xml | 3 +- .../nifi-datadog-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-datadog-bundle/pom.xml | 3 +- .../nifi-dropbox-processors-nar/pom.xml | 4 - .../nifi-dropbox-services-api-nar/pom.xml | 7 +- .../nifi-dropbox-services-nar/pom.xml | 4 - nifi-nar-bundles/nifi-dropbox-bundle/pom.xml | 3 +- .../pom.xml | 7 +- .../pom.xml | 4 - .../nifi-elasticsearch-bundle/pom.xml | 3 +- .../nifi-enrich-nar/pom.xml | 7 +- .../nifi-enrich-processors/pom.xml | 5 - nifi-nar-bundles/nifi-enrich-bundle/pom.xml | 3 +- .../nifi-flow-registry-client-nar/pom.xml | 8 +- .../nifi-flow-registry-client-bundle/pom.xml | 8 +- .../nifi-gcp-bundle/nifi-gcp-nar/pom.xml | 4 - .../nifi-gcp-services-api-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 3 +- .../nifi-geohash-nar/pom.xml | 7 +- .../nifi-geohash-processors/pom.xml | 3 - nifi-nar-bundles/nifi-geohash-bundle/pom.xml | 3 +- .../nifi-groovyx-nar/pom.xml | 5 +- .../nifi-groovyx-processors/pom.xml | 5 - nifi-nar-bundles/nifi-groovyx-bundle/pom.xml | 3 +- .../nifi-hadoop-libraries-nar/pom.xml | 7 +- .../nifi-hadoop-libraries-bundle/pom.xml | 3 +- .../pom.xml | 7 +- .../nifi-hashicorp-vault-nar/pom.xml | 4 - .../nifi-hashicorp-vault-bundle/pom.xml | 3 +- .../nifi-hbase-bundle/nifi-hbase-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-hbase-bundle/pom.xml | 3 +- .../nifi-hubspot-nar/pom.xml | 8 +- nifi-nar-bundles/nifi-hubspot-bundle/pom.xml | 3 +- .../nifi-jms-cf-service-nar/pom.xml | 7 +- .../nifi-jms-processors-nar/pom.xml | 4 - nifi-nar-bundles/nifi-jms-bundle/pom.xml | 3 +- .../nifi-jolt-record-nar/pom.xml | 7 +- .../nifi-jolt-record-bundle/pom.xml | 8 +- .../nifi-jslt-bundle/nifi-jslt-nar/pom.xml | 2 +- nifi-nar-bundles/nifi-jslt-bundle/pom.xml | 3 +- .../nifi-kafka-2-6-nar/pom.xml | 7 +- .../nifi-kafka-2-6-processors/pom.xml | 2 - nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 3 +- nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 3 +- .../nifi-language-translation-nar/pom.xml | 2 +- .../nifi-language-translation-bundle/pom.xml | 3 +- .../pom.xml | 3 +- nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 3 +- .../nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-mqtt-bundle/pom.xml | 3 +- .../nifi-network-processors-nar/pom.xml | 9 +- nifi-nar-bundles/nifi-network-bundle/pom.xml | 3 +- .../nifi-opentelemetry-nar/pom.xml | 3 +- .../nifi-opentelemetry-bundle/pom.xml | 3 +- .../nifi-parquet-nar/pom.xml | 4 - nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 3 +- .../nifi-pgp-service-api-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-pgp-bundle/pom.xml | 3 +- .../nifi-poi-bundle/nifi-poi-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-poi-bundle/pom.xml | 3 +- .../nifi-py4j-bundle/nifi-py4j-nar/pom.xml | 3 +- nifi-nar-bundles/nifi-py4j-bundle/pom.xml | 3 +- .../nifi-redis-service-api-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-redis-bundle/pom.xml | 3 +- .../nifi-registry-nar/pom.xml | 2 +- .../nifi-registry-service/pom.xml | 1 - nifi-nar-bundles/nifi-registry-bundle/pom.xml | 3 +- .../nifi-salesforce-nar/pom.xml | 9 +- .../nifi-salesforce-bundle/pom.xml | 3 +- .../nifi-scripting-nar/pom.xml | 4 +- .../nifi-scripting-bundle/pom.xml | 3 +- .../nifi-shopify-nar/pom.xml | 8 +- nifi-nar-bundles/nifi-shopify-bundle/pom.xml | 3 +- .../nifi-site-to-site-reporting-nar/pom.xml | 8 +- .../pom.xml | 3 +- .../nifi-slack-bundle/nifi-slack-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-slack-bundle/pom.xml | 3 +- .../nifi-smb-client-api-nar/pom.xml | 8 +- nifi-nar-bundles/nifi-smb-bundle/pom.xml | 8 +- .../nifi-snmp-bundle/nifi-snmp-nar/pom.xml | 6 +- nifi-nar-bundles/nifi-snmp-bundle/pom.xml | 3 +- .../nifi-snowflake-processors/pom.xml | 3 - .../nifi-snowflake-services-api-nar/pom.xml | 3 +- .../nifi-snowflake-services/pom.xml | 7 - .../nifi-snowflake-bundle/pom.xml | 3 +- .../nifi-social-media-nar/pom.xml | 2 +- .../nifi-social-media-bundle/pom.xml | 3 +- .../nifi-solr-bundle/nifi-solr-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-solr-bundle/pom.xml | 3 +- .../nifi-splunk-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-splunk-bundle/pom.xml | 3 +- .../nifi-standard-content-viewer/pom.xml | 8 - .../nifi-standard-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-standard-bundle/pom.xml | 3 +- .../nifi-hbase_2-client-service-nar/pom.xml | 7 +- .../pom.xml | 3 +- .../nifi-key-service-nar/pom.xml | 3 +- .../nifi-key-service-bundle/pom.xml | 3 +- .../nifi-lookup-services-nar/pom.xml | 3 +- .../nifi-lookup-services/.gitignore | 1 - .../nifi-lookup-services-bundle/pom.xml | 3 +- .../nifi-oauth2-provider-nar/pom.xml | 7 +- .../nifi-oauth2-provider-bundle/pom.xml | 18 +- .../nifi-proxy-configuration/pom.xml | 5 - .../pom.xml | 3 +- .../pom.xml | 3 +- .../nifi-record-sink-service-nar/pom.xml | 7 +- .../nifi-record-sink-service/pom.xml | 1 - .../nifi-record-sink-service-bundle/pom.xml | 3 +- .../pom.xml | 3 +- .../nifi-web-client-provider-bundle/pom.xml | 3 +- .../nifi-standard-shared-bom/pom.xml | 180 ++++++++++++++++++ .../nifi-standard-shared-nar/pom.xml | 137 +++++++++++++ .../nifi-standard-shared-bundle/pom.xml | 32 ++++ .../nifi-stateless-processor-nar/pom.xml | 3 +- .../nifi-stateless-processor-tests/pom.xml | 6 + .../src/test/assembly/dependencies.xml | 1 + .../nifi-stateless-processor-bundle/pom.xml | 3 +- .../nifi-zendesk-nar/pom.xml | 7 +- nifi-nar-bundles/nifi-zendesk-bundle/pom.xml | 4 +- nifi-nar-bundles/pom.xml | 1 + 152 files changed, 569 insertions(+), 449 deletions(-) delete mode 100644 nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/.gitignore create mode 100644 nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml create mode 100644 nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml create mode 100644 nifi-nar-bundles/nifi-standard-shared-bundle/pom.xml diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml index d28f679361..d890585bac 100644 --- a/minifi/minifi-assembly/pom.xml +++ b/minifi/minifi-assembly/pom.xml @@ -174,6 +174,11 @@ limitations under the License. nifi-standard-services-api-nar nar + + org.apache.nifi + nifi-standard-shared-nar + nar + org.apache.nifi nifi-record-serialization-services-nar diff --git a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml index 7130d35360..2af9d363aa 100644 --- a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml +++ b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml @@ -43,7 +43,7 @@ limitations under the License. org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml index 5931fe5a5b..9db4538841 100644 --- a/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml +++ b/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml @@ -39,7 +39,7 @@ limitations under the License. org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/minifi/pom.xml b/minifi/pom.xml index 8bdb78b72c..ad9ff08f71 100644 --- a/minifi/pom.xml +++ b/minifi/pom.xml @@ -251,6 +251,12 @@ limitations under the License. 2.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-standard-shared-nar + 2.0.0-SNAPSHOT + nar + org.apache.nifi nifi-record-serialization-services-nar diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 913bbd9f73..99d073bfff 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -247,6 +247,12 @@ language governing permissions and limitations under the License. --> 2.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-standard-shared-nar + 2.0.0-SNAPSHOT + nar + org.apache.nifi nifi-ssl-context-service-nar diff --git a/nifi-bom/pom.xml b/nifi-bom/pom.xml index 4397c65cd6..2979021a64 100644 --- a/nifi-bom/pom.xml +++ b/nifi-bom/pom.xml @@ -198,6 +198,12 @@ 2.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-standard-shared-nar + 2.0.0-SNAPSHOT + nar + diff --git a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml index 14a398966c..b9eba3f981 100644 --- a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml +++ b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-nar/pom.xml @@ -26,10 +26,7 @@ nifi-airtable-nar nar - - true - true - + org.apache.nifi @@ -38,8 +35,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml index 2c5918b244..f910dc435a 100644 --- a/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml +++ b/nifi-nar-bundles/nifi-airtable-bundle/nifi-airtable-processors/pom.xml @@ -25,6 +25,7 @@ 4.0.0 nifi-airtable-processors + org.apache.nifi @@ -33,8 +34,6 @@ org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT - provided org.apache.nifi diff --git a/nifi-nar-bundles/nifi-airtable-bundle/pom.xml b/nifi-nar-bundles/nifi-airtable-bundle/pom.xml index cbe8ba80dc..1e7cbd5b13 100644 --- a/nifi-nar-bundles/nifi-airtable-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-airtable-bundle/pom.xml @@ -18,9 +18,10 @@ - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml index b93277f0d2..5f9fa8b8da 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-nar/pom.xml @@ -24,10 +24,6 @@ nifi-avro-nar nar - - true - true - @@ -37,7 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml index d1026843da..087b63cd96 100644 --- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-avro-bundle 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 470e9136ac..c40c81ae98 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 @@ -129,7 +129,6 @@ com.github.ben-manes.caffeine caffeine - 2.9.2 diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml index 4d5666228c..5d00d3decc 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-nar/pom.xml @@ -24,10 +24,6 @@ nifi-aws-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml index e05190e778..627b4f8b7f 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/pom.xml @@ -141,6 +141,10 @@ com.amazonaws aws-java-sdk-textract + + org.bouncycastle + bcprov-jdk18on + org.testcontainers localstack diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml index 2e598a3931..015b8fc30c 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api-nar/pom.xml @@ -24,16 +24,11 @@ nifi-aws-service-api-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml index 6f45e4ede1..4e55f825db 100644 --- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-aws-bundle diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml index d7e9cd451f..6b66997514 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-nar/pom.xml @@ -24,10 +24,6 @@ nifi-azure-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml index 88e4f4f58d..0b339a5038 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-reporting-task/pom.xml @@ -24,7 +24,6 @@ org.apache.nifi nifi-api - 2.0.0-SNAPSHOT org.apache.nifi @@ -59,8 +58,6 @@ org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml index f4c0c5c7a8..767034d80e 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api-nar/pom.xml @@ -24,16 +24,10 @@ nifi-azure-services-api-nar nar - - true - true - - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index 23a11d643e..1a4a497285 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-azure-bundle diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml index 59827cc41c..24c010405c 100644 --- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml +++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-nar/pom.xml @@ -24,10 +24,6 @@ nifi-box-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml index 103d06e3b6..80eabaa0f1 100644 --- a/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-box-bundle/nifi-box-services-api-nar/pom.xml @@ -24,21 +24,11 @@ nifi-box-services-api-nar nar - - false - true - org.apache.nifi - nifi-api - 2.0.0-SNAPSHOT - - - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-box-bundle/pom.xml b/nifi-nar-bundles/nifi-box-bundle/pom.xml index 542d0f785c..c4d161b4f1 100644 --- a/nifi-nar-bundles/nifi-box-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-box-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-box-bundle diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml index a0dabf0f84..3063f64ef8 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-nar/pom.xml @@ -24,10 +24,6 @@ nifi-cassandra-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml index 9cd881a9e2..4195bfe32f 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api-nar/pom.xml @@ -27,8 +27,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml index c1d47932a4..0107c8de15 100644 --- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml index 68aa5f0830..832394706a 100644 --- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-nar/pom.xml @@ -29,8 +29,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-cdc/pom.xml b/nifi-nar-bundles/nifi-cdc/pom.xml index 86158bb586..f1c14bafda 100644 --- a/nifi-nar-bundles/nifi-cdc/pom.xml +++ b/nifi-nar-bundles/nifi-cdc/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-cdc pom diff --git a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml index 59e664836f..de4a206fd4 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/nifi-cipher-nar/pom.xml @@ -24,10 +24,6 @@ nifi-cipher-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml index ebeb4b460a..ada527c591 100644 --- a/nifi-nar-bundles/nifi-cipher-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-cipher-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-cipher-bundle diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml index 2028b97cea..157c302596 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-platform-nar/pom.xml @@ -21,8 +21,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml index 516340a758..98c90e0816 100644 --- a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml @@ -12,9 +12,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-confluent-platform-bundle pom diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml index fce0cce8cc..1f21b84b3c 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml @@ -22,10 +22,7 @@ nifi-datadog-nar nar - - true - true - + org.apache.nifi @@ -33,7 +30,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml index 41ea3efa4c..afb350217a 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml @@ -16,9 +16,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-datadog-bundle diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml index 523a0a606b..0f8c1643e1 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml +++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-processors-nar/pom.xml @@ -24,10 +24,6 @@ nifi-dropbox-processors-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml index a20ebae88d..f7719b672f 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-api-nar/pom.xml @@ -25,10 +25,6 @@ nifi-dropbox-services-api-nar 2.0.0-SNAPSHOT nar - - true - true - @@ -38,8 +34,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml index a85e74837a..edafec8e54 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml +++ b/nifi-nar-bundles/nifi-dropbox-bundle/nifi-dropbox-services-nar/pom.xml @@ -24,10 +24,6 @@ nifi-dropbox-services-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml index dc7c2d293f..cb55114231 100644 --- a/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-dropbox-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-dropbox-bundle diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml index 2d6d574a8e..2001341232 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api-nar/pom.xml @@ -24,16 +24,11 @@ nifi-elasticsearch-client-service-api-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml index fa27ad8b52..b8e41de055 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-nar/pom.xml @@ -24,10 +24,6 @@ nifi-elasticsearch-client-service-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml index 809cc44c31..824089080d 100644 --- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml @@ -13,9 +13,10 @@ language governing permissions and limitations under the License. --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-elasticsearch-bundle diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml index f88e1fc235..17011cb486 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml +++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-nar/pom.xml @@ -23,16 +23,11 @@ nifi-enrich-nar nar NiFi Enrichment NAR - - true - true - org.apache.nifi - nifi-standard-services-api-nar - ${project.version} + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml index ce50a8ad79..c2225f0268 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml +++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/pom.xml @@ -20,10 +20,7 @@ nifi-enrich-bundle 2.0.0-SNAPSHOT - - nifi-enrich-processors - org.apache.nifi @@ -63,8 +60,6 @@ org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test commons-net diff --git a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml index cea52c61cc..db16ae71ff 100644 --- a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-enrich-bundle diff --git a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml index 271c2cdc98..3a200371c7 100644 --- a/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml +++ b/nifi-nar-bundles/nifi-flow-registry-client-bundle/nifi-flow-registry-client-nar/pom.xml @@ -25,11 +25,6 @@ nifi-flow-registry-client-nar nar - - true - true - - org.apache.nifi @@ -38,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml b/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml index 77f79ce2b5..fbd693822b 100644 --- a/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-flow-registry-client-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-flow-registry-client-bundle @@ -28,9 +29,4 @@ nifi-flow-registry-client-services nifi-flow-registry-client-nar - - - - - diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml index 8a72fd7602..b4a71b996e 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-nar/pom.xml @@ -24,10 +24,6 @@ nifi-gcp-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/pom.xml index 74a6319bfd..a01c5b504f 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api-nar/pom.xml @@ -24,16 +24,11 @@ nifi-gcp-services-api-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml index b7430b190f..aa6366fe25 100644 --- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-gcp-bundle diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml index 5e9fef87f2..c94989c9cc 100644 --- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml +++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-nar/pom.xml @@ -24,16 +24,11 @@ nifi-geohash-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - ${project.version} + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml index 6be468f9db..57aa7034be 100644 --- a/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml +++ b/nifi-nar-bundles/nifi-geohash-bundle/nifi-geohash-processors/pom.xml @@ -33,7 +33,6 @@ org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT ch.hsr @@ -58,8 +57,6 @@ org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test org.apache.nifi diff --git a/nifi-nar-bundles/nifi-geohash-bundle/pom.xml b/nifi-nar-bundles/nifi-geohash-bundle/pom.xml index 8e9905d4de..29117fcbc6 100644 --- a/nifi-nar-bundles/nifi-geohash-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-geohash-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-geohash-bundle diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml index daaddd896f..3cdc979d3b 100644 --- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml +++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml @@ -25,16 +25,13 @@ nifi-groovyx-nar nar - true - true 1.10.14 org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml index b7bc6699f3..77dec1f8c3 100644 --- a/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml +++ b/nifi-nar-bundles/nifi-groovyx-bundle/nifi-groovyx-processors/pom.xml @@ -34,7 +34,6 @@ org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT org.apache.nifi @@ -71,14 +70,10 @@ org.apache.nifi nifi-dbcp-service-api - 2.0.0-SNAPSHOT - provided org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test org.apache.nifi diff --git a/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml b/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml index eb2b6da8b3..7dd1f390d3 100644 --- a/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-groovyx-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-groovyx-bundle diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml index e3a730493e..cb2f8d0d28 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml @@ -17,15 +17,10 @@ nifi-hadoop-libraries-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml index 38dac73aba..99d00666e3 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-hadoop-libraries-bundle pom diff --git a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api-nar/pom.xml index 53963024a7..939e9916aa 100644 --- a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-client-service-api-nar/pom.xml @@ -24,16 +24,11 @@ nifi-hashicorp-vault-client-service-api-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-nar/pom.xml b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-nar/pom.xml index c7f7422fbb..a59dae3ae0 100644 --- a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/nifi-hashicorp-vault-nar/pom.xml @@ -24,10 +24,6 @@ nifi-hashicorp-vault-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/pom.xml b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/pom.xml index f7e6995b9a..112208d1a4 100644 --- a/nifi-nar-bundles/nifi-hashicorp-vault-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hashicorp-vault-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-hashicorp-vault-bundle pom diff --git a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-nar/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-nar/pom.xml index 4800ab79ce..276aab3129 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/nifi-hbase-nar/pom.xml @@ -22,15 +22,10 @@ nifi-hbase-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-hbase-bundle/pom.xml b/nifi-nar-bundles/nifi-hbase-bundle/pom.xml index 23ae2462da..5cf2776c9e 100644 --- a/nifi-nar-bundles/nifi-hbase-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hbase-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-hbase-bundle diff --git a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-nar/pom.xml b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-nar/pom.xml index c1cabf48df..c16508d3f1 100644 --- a/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hubspot-bundle/nifi-hubspot-nar/pom.xml @@ -24,10 +24,7 @@ nifi-hubspot-nar nar - - true - true - + org.apache.nifi @@ -36,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-hubspot-bundle/pom.xml b/nifi-nar-bundles/nifi-hubspot-bundle/pom.xml index f052fad3a7..4b2a17e43a 100644 --- a/nifi-nar-bundles/nifi-hubspot-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hubspot-bundle/pom.xml @@ -15,9 +15,10 @@ --> - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service-nar/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service-nar/pom.xml index c70f4e3d4c..9bb655d445 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-cf-service-nar/pom.xml @@ -22,15 +22,10 @@ nifi-jms-cf-service-nar nar NiFi NAR for interacting with JMS-based messaging systems - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/pom.xml index 3eaf230b77..2d1e12172a 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/nifi-jms-processors-nar/pom.xml @@ -22,10 +22,6 @@ nifi-jms-processors-nar nar NiFi NAR for interacting with JMS-based messaging systems - - true - true - org.apache.nifi diff --git a/nifi-nar-bundles/nifi-jms-bundle/pom.xml b/nifi-nar-bundles/nifi-jms-bundle/pom.xml index 288921faa1..253ea143df 100644 --- a/nifi-nar-bundles/nifi-jms-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-jms-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-jms-bundle pom diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-nar/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-nar/pom.xml index 9672280d31..7d72f78cf5 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-nar/pom.xml +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/nifi-jolt-record-nar/pom.xml @@ -24,16 +24,11 @@ nifi-jolt-record-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml b/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml index 07f0597383..d4bf8a10dc 100644 --- a/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-jolt-record-bundle @@ -41,11 +42,6 @@ nifi-jolt-record-processors 2.0.0-SNAPSHOT - - org.apache.nifi - nifi-utils - 2.0.0-SNAPSHOT - org.apache.nifi nifi-record-serialization-service-api diff --git a/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-nar/pom.xml b/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-nar/pom.xml index d0bcef1991..69567974d1 100644 --- a/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-nar/pom.xml +++ b/nifi-nar-bundles/nifi-jslt-bundle/nifi-jslt-nar/pom.xml @@ -33,7 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-jslt-bundle/pom.xml b/nifi-nar-bundles/nifi-jslt-bundle/pom.xml index 15f731c138..91cd2d5bda 100644 --- a/nifi-nar-bundles/nifi-jslt-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-jslt-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom org.apache.nifi diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml index 0922063802..400692589b 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml @@ -22,10 +22,6 @@ nifi-kafka-2-6-nar nar NiFi NAR for interacting with Apache Kafka 2.6 - - true - true - org.apache.nifi @@ -33,8 +29,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml index 3f71ae7ddf..21aac4295f 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-2-6-processors/pom.xml @@ -93,8 +93,6 @@ org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test org.apache.nifi diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml index 742a77a0e0..c5bb469ad1 100644 --- a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-kafka-bundle pom diff --git a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml index 5332031f5b..f3243a98c3 100644 --- a/nifi-nar-bundles/nifi-kudu-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-kudu-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-kudu-bundle diff --git a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml index 552fce16c2..efa45cab84 100644 --- a/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml +++ b/nifi-nar-bundles/nifi-language-translation-bundle/nifi-language-translation-nar/pom.xml @@ -33,7 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml b/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml index ddc283816c..b67e6fb162 100644 --- a/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-language-translation-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-language-translation-bundle diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml index b71681b576..50a0847e05 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/nifi-mongodb-client-service-api-nar/pom.xml @@ -28,8 +28,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml index fb1f904197..cc0cafc909 100644 --- a/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mongodb-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-mongodb-bundle diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml index 0b457d144b..0ddddc5871 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml +++ b/nifi-nar-bundles/nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml @@ -22,15 +22,10 @@ nifi-mqtt-nar nar NiFi NAR for interacting with MQTT brokers - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-mqtt-bundle/pom.xml b/nifi-nar-bundles/nifi-mqtt-bundle/pom.xml index 115549f1b9..3603a3f629 100644 --- a/nifi-nar-bundles/nifi-mqtt-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-mqtt-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-mqtt-bundle pom diff --git a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors-nar/pom.xml b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors-nar/pom.xml index ad13b76adc..3d4a5eb4bb 100644 --- a/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors-nar/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/nifi-network-processors-nar/pom.xml @@ -24,10 +24,6 @@ nifi-network-processors-nar nar - - true - true - @@ -35,5 +31,10 @@ nifi-network-processors 2.0.0-SNAPSHOT + + org.apache.nifi + nifi-standard-shared-nar + nar + diff --git a/nifi-nar-bundles/nifi-network-bundle/pom.xml b/nifi-nar-bundles/nifi-network-bundle/pom.xml index 9feb0bddf9..c6663ceb3d 100644 --- a/nifi-nar-bundles/nifi-network-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-network-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-network-bundle diff --git a/nifi-nar-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-nar/pom.xml b/nifi-nar-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-nar/pom.xml index dadb18c743..38cc7951c2 100644 --- a/nifi-nar-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-nar/pom.xml +++ b/nifi-nar-bundles/nifi-opentelemetry-bundle/nifi-opentelemetry-nar/pom.xml @@ -33,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml b/nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml index be8694ff57..24cff46159 100644 --- a/nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-opentelemetry-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-opentelemetry-bundle diff --git a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-nar/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-nar/pom.xml index 1ee98c7aeb..d41575af1b 100644 --- a/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-nar/pom.xml +++ b/nifi-nar-bundles/nifi-parquet-bundle/nifi-parquet-nar/pom.xml @@ -24,10 +24,6 @@ nifi-parquet-nar nar - - true - true - diff --git a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml index 07903defda..df8f35da77 100644 --- a/nifi-nar-bundles/nifi-parquet-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-parquet-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-parquet-bundle diff --git a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service-api-nar/pom.xml index 475ece1618..840a2122a5 100644 --- a/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-pgp-bundle/nifi-pgp-service-api-nar/pom.xml @@ -24,10 +24,6 @@ nifi-pgp-service-api-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-pgp-bundle/pom.xml b/nifi-nar-bundles/nifi-pgp-bundle/pom.xml index 14c49b6a1d..bd7af3db00 100644 --- a/nifi-nar-bundles/nifi-pgp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-pgp-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-pgp-bundle diff --git a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml index e082a25af5..2ffe006a1a 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/nifi-poi-nar/pom.xml @@ -24,10 +24,6 @@ nifi-poi-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-poi-bundle/pom.xml b/nifi-nar-bundles/nifi-poi-bundle/pom.xml index 6e638524ed..39f717b79f 100644 --- a/nifi-nar-bundles/nifi-poi-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-poi-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-poi-bundle diff --git a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-nar/pom.xml b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-nar/pom.xml index 1273650138..2186806bfa 100644 --- a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-nar/pom.xml +++ b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-nar/pom.xml @@ -38,8 +38,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-py4j-bundle/pom.xml b/nifi-nar-bundles/nifi-py4j-bundle/pom.xml index d0a99eb7ae..68cc3261ed 100644 --- a/nifi-nar-bundles/nifi-py4j-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-py4j-bundle/pom.xml @@ -17,9 +17,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/pom.xml index 919326030d..f766c1eb0c 100644 --- a/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-redis-bundle/nifi-redis-service-api-nar/pom.xml @@ -24,16 +24,11 @@ nifi-redis-service-api-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-redis-bundle/pom.xml b/nifi-nar-bundles/nifi-redis-bundle/pom.xml index 62d3c833f1..99b62cbf16 100644 --- a/nifi-nar-bundles/nifi-redis-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-redis-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-redis-bundle diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml index 8508b1d148..a743de66df 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-nar/pom.xml @@ -21,7 +21,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar 2.0.0-SNAPSHOT nar diff --git a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml index 222073a47d..b879530b07 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/nifi-registry-service/pom.xml @@ -43,7 +43,6 @@ language governing permissions and limitations under the License. --> org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT org.apache.commons diff --git a/nifi-nar-bundles/nifi-registry-bundle/pom.xml b/nifi-nar-bundles/nifi-registry-bundle/pom.xml index b635aa00e4..0541e3ff84 100644 --- a/nifi-nar-bundles/nifi-registry-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-registry-bundle/pom.xml @@ -12,9 +12,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-registry-bundle pom diff --git a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml index 73ed49af41..c5cfffcdd2 100644 --- a/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml +++ b/nifi-nar-bundles/nifi-salesforce-bundle/nifi-salesforce-nar/pom.xml @@ -22,12 +22,8 @@ 4.0.0 nifi-salesforce-nar - nar - - true - true - + org.apache.nifi @@ -36,8 +32,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-salesforce-bundle/pom.xml b/nifi-nar-bundles/nifi-salesforce-bundle/pom.xml index c7016621f7..c32ec00c72 100644 --- a/nifi-nar-bundles/nifi-salesforce-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-salesforce-bundle/pom.xml @@ -15,9 +15,10 @@ --> - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml index 3ba4c6e0ab..9f8ef07470 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/pom.xml @@ -25,8 +25,6 @@ nifi-scripting-nar nar - true - true 1.10.14 @@ -37,7 +35,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar 2.0.0-SNAPSHOT nar diff --git a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml index 0cd80e87df..d83d5ad4c9 100644 --- a/nifi-nar-bundles/nifi-scripting-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-scripting-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-scripting-bundle diff --git a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-nar/pom.xml b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-nar/pom.xml index a9ab0882c4..d4b12f4985 100644 --- a/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-nar/pom.xml +++ b/nifi-nar-bundles/nifi-shopify-bundle/nifi-shopify-nar/pom.xml @@ -22,12 +22,8 @@ 4.0.0 nifi-shopify-nar - nar - - true - true - + org.apache.nifi @@ -36,7 +32,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar 2.0.0-SNAPSHOT nar diff --git a/nifi-nar-bundles/nifi-shopify-bundle/pom.xml b/nifi-nar-bundles/nifi-shopify-bundle/pom.xml index f919692052..b1b4cbd84e 100644 --- a/nifi-nar-bundles/nifi-shopify-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-shopify-bundle/pom.xml @@ -15,9 +15,10 @@ --> - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-nar/pom.xml b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-nar/pom.xml index efe6b21b8d..de9500e1cb 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-nar/pom.xml +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/nifi-site-to-site-reporting-nar/pom.xml @@ -22,10 +22,7 @@ nifi-site-to-site-reporting-nar nar - - true - true - + org.apache.nifi @@ -33,8 +30,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml index 9a1e7da5dd..ff0f645d32 100644 --- a/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-site-to-site-reporting-bundle/pom.xml @@ -16,9 +16,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-site-to-site-reporting-bundle diff --git a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml index 9fea5bafd1..2dad97538a 100644 --- a/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml +++ b/nifi-nar-bundles/nifi-slack-bundle/nifi-slack-nar/pom.xml @@ -24,10 +24,6 @@ nifi-slack-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-slack-bundle/pom.xml b/nifi-nar-bundles/nifi-slack-bundle/pom.xml index 173d03e6db..449bfb964f 100644 --- a/nifi-nar-bundles/nifi-slack-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-slack-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-slack-bundle diff --git a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api-nar/pom.xml b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api-nar/pom.xml index e0fa81f724..3aad997442 100644 --- a/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-smb-bundle/nifi-smb-client-api-nar/pom.xml @@ -24,16 +24,10 @@ nifi-smb-client-api-nar nar - - true - true - - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-smb-bundle/pom.xml b/nifi-nar-bundles/nifi-smb-bundle/pom.xml index d58d31c89f..e3667bd159 100644 --- a/nifi-nar-bundles/nifi-smb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-smb-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-smb-bundle @@ -53,11 +54,6 @@ mbassador 1.3.2 - - org.apache.nifi - nifi-mock - 2.0.0-SNAPSHOT - diff --git a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml index 19cd5ee193..8dbebc3fb0 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml +++ b/nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-nar/pom.xml @@ -22,10 +22,6 @@ nifi-snmp-nar nar - - true - true - org.apache.nifi @@ -33,7 +29,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml index a9f58f7f43..da1ef896a4 100644 --- a/nifi-nar-bundles/nifi-snmp-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-snmp-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-snmp-bundle pom diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/pom.xml index 6adc23df8f..ddf5dd293d 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-processors/pom.xml @@ -35,8 +35,6 @@ org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT - provided org.apache.nifi @@ -58,7 +56,6 @@ commons-io commons-io - provided com.squareup.okhttp3 diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services-api-nar/pom.xml index ae6c5bc315..65db772090 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services-api-nar/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services-api-nar/pom.xml @@ -35,8 +35,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services/pom.xml index 9fe977b50f..3b2a87ce64 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/nifi-snowflake-services/pom.xml @@ -66,25 +66,18 @@ org.apache.nifi nifi-utils - 2.0.0-SNAPSHOT - provided org.apache.nifi nifi-api - 2.0.0-SNAPSHOT org.apache.nifi nifi-proxy-configuration-api - 2.0.0-SNAPSHOT - provided org.apache.nifi nifi-mock - 2.0.0-SNAPSHOT - test org.apache.nifi diff --git a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml index e2da9899e7..1e2bfd8e43 100644 --- a/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-snowflake-bundle/pom.xml @@ -13,9 +13,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-snowflake-bundle diff --git a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml index 8796079ea9..6ad9830a97 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml +++ b/nifi-nar-bundles/nifi-social-media-bundle/nifi-social-media-nar/pom.xml @@ -33,7 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml index 1778f78329..25eb0e090c 100644 --- a/nifi-nar-bundles/nifi-social-media-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-social-media-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-social-media-bundle diff --git a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml index 5de3897200..728335e003 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/nifi-solr-nar/pom.xml @@ -24,10 +24,6 @@ nifi-solr-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-solr-bundle/pom.xml b/nifi-nar-bundles/nifi-solr-bundle/pom.xml index 5e96b1daf5..2d2c5061b9 100644 --- a/nifi-nar-bundles/nifi-solr-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-solr-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-solr-bundle pom diff --git a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/pom.xml b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/pom.xml index a5c5cc310e..05fcb5a6a1 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/pom.xml +++ b/nifi-nar-bundles/nifi-splunk-bundle/nifi-splunk-nar/pom.xml @@ -24,10 +24,6 @@ nifi-splunk-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml index 50f7042a33..bb375856a5 100644 --- a/nifi-nar-bundles/nifi-splunk-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-splunk-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-splunk-bundle 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 cd4ecaa907..3966e24c94 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 @@ -18,15 +18,10 @@ org.apache.nifi nifi-standard-content-viewer war - - true - true - org.apache.commons commons-lang3 - provided org.apache.nifi @@ -40,13 +35,10 @@ commons-codec commons-codec - ${org.apache.commons.codec.version} - provided commons-io commons-io - provided com.fasterxml.jackson.core diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml index e43c381f13..8d6df4ebec 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml @@ -22,15 +22,10 @@ nifi-standard-nar nar NiFi Standard Extensions NAR - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/pom.xml index a3a8527e58..9dcbcf2f64 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@ -16,9 +16,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-standard-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/pom.xml index 7826392192..c1ac96edee 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service-nar/pom.xml @@ -24,16 +24,11 @@ nifi-hbase_2-client-service-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml index a769b3c92b..b9fa810df4 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-hbase_2-client-service-bundle diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service-nar/pom.xml index 59f875de89..f434da15cd 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/nifi-key-service-nar/pom.xml @@ -24,8 +24,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/pom.xml index 0c45f341b4..662c3ca75e 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-key-service-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-key-service-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/pom.xml index 1f4e1ca2e0..9c957a5eea 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services-nar/pom.xml @@ -24,8 +24,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/.gitignore b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/.gitignore deleted file mode 100644 index ae3c172604..0000000000 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml index 99409daa84..fc7892be97 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-lookup-services-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-nar/pom.xml index f3c69b74ef..8e563046c7 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/nifi-oauth2-provider-nar/pom.xml @@ -24,16 +24,11 @@ nifi-oauth2-provider-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/pom.xml index 4a41d91d2c..ace93512f0 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-oauth2-provider-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-oauth2-provider-bundle @@ -28,19 +29,4 @@ nifi-oauth2-provider-service nifi-oauth2-provider-nar - - - - - org.apache.rat - apache-rat-plugin - - - src/test/resources/fake.keytab - src/test/resources/krb5.conf - - - - - diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/pom.xml index 151ab17055..578f314f1b 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-proxy-configuration-bundle/nifi-proxy-configuration/pom.xml @@ -37,10 +37,5 @@ org.apache.nifi nifi-proxy-configuration-api - - org.apache.nifi - nifi-standard-utils - 2.0.0-SNAPSHOT - \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services-nar/pom.xml index 95a04e29e5..ab5fc89b5f 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/nifi-record-serialization-services-nar/pom.xml @@ -28,8 +28,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml index 1c7a1935e3..6871e74fef 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-serialization-services-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-record-serialization-services-bundle diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service-nar/pom.xml index e9402ddad7..1031b834ba 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service-nar/pom.xml @@ -22,16 +22,11 @@ nifi-record-sink-service-nar nar - - true - true - org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/pom.xml index 8e688b99f6..a27efde278 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/nifi-record-sink-service/pom.xml @@ -66,7 +66,6 @@ org.apache.nifi nifi-mock - test org.apache.nifi diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/pom.xml index f5987c2515..27257b3c14 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-record-sink-service-bundle/pom.xml @@ -15,9 +15,10 @@ --> 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-record-sink-service-bundle diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service-nar/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service-nar/pom.xml index b4481e0359..66cd1d79c4 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service-nar/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/nifi-web-client-provider-service-nar/pom.xml @@ -30,8 +30,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/pom.xml index 64dde049f0..a9cf0c140d 100644 --- a/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-standard-services/nifi-web-client-provider-bundle/pom.xml @@ -16,9 +16,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-standard-services 2.0.0-SNAPSHOT + ../../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-web-client-provider-bundle pom diff --git a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml new file mode 100644 index 0000000000..6edaa9d1c1 --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-bom/pom.xml @@ -0,0 +1,180 @@ + + + 4.0.0 + + org.apache.nifi + nifi-standard-shared-bundle + 2.0.0-SNAPSHOT + + nifi-standard-shared-bom + pom + Configuration module with managed scope for use with modules that have nifi-standard-shared-nar as the parent NAR + + + + + commons-codec + commons-codec + ${org.apache.commons.codec.version} + provided + + + org.apache.commons + commons-compress + ${org.apache.commons.compress.version} + provided + + + commons-io + commons-io + ${org.apache.commons.io.version} + provided + + + org.apache.commons + commons-lang3 + ${org.apache.commons.lang3.version} + provided + + + commons-net + commons-net + ${org.apache.commons.net.version} + provided + + + org.apache.commons + commons-text + ${org.apache.commons.text.version} + provided + + + + org.bouncycastle + bcprov-jdk18on + ${org.bouncycastle.version} + provided + + + org.bouncycastle + bcpkix-jdk18on + ${org.bouncycastle.version} + provided + + + org.bouncycastle + bcutil-jdk18on + ${org.bouncycastle.version} + provided + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.bom.version} + provided + + + com.fasterxml.jackson.core + jackson-core + ${jackson.bom.version} + provided + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.bom.version} + provided + + + + com.github.ben-manes.caffeine + caffeine + ${caffeine.version} + provided + + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + provided + + + com.squareup.okio + okio + ${okio.version} + provided + + + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin.version} + provided + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + provided + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + provided + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + ${kotlin.version} + provided + + + + io.netty + netty-handler + ${netty.4.version} + provided + + + io.netty + netty-common + ${netty.4.version} + provided + + + io.netty + netty-transport + ${netty.4.version} + provided + + + io.netty + netty-buffer + ${netty.4.version} + provided + + + io.netty + netty-codec + ${netty.4.version} + provided + + + + diff --git a/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml new file mode 100644 index 0000000000..6648212a1a --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-shared-bundle/nifi-standard-shared-nar/pom.xml @@ -0,0 +1,137 @@ + + + 4.0.0 + + org.apache.nifi + nifi-standard-shared-bundle + 2.0.0-SNAPSHOT + + nifi-standard-shared-nar + nar + NAR with set of shared dependencies applicable across multiple components with managed version numbers + + + + org.apache.nifi + nifi-standard-services-api-nar + 2.0.0-SNAPSHOT + nar + + + + commons-codec + commons-codec + + + org.apache.commons + commons-compress + + + commons-io + commons-io + + + org.apache.commons + commons-lang3 + + + commons-net + commons-net + + + org.apache.commons + commons-text + + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + + org.bouncycastle + bcprov-jdk18on + + + org.bouncycastle + bcpkix-jdk18on + + + org.bouncycastle + bcutil-jdk18on + + + + com.github.ben-manes.caffeine + caffeine + + + + com.squareup.okhttp3 + okhttp + + + com.squareup.okio + okio + + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + + io.netty + netty-handler + + + io.netty + netty-common + + + io.netty + netty-transport + + + io.netty + netty-buffer + + + io.netty + netty-codec + + + diff --git a/nifi-nar-bundles/nifi-standard-shared-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-shared-bundle/pom.xml new file mode 100644 index 0000000000..d09713129e --- /dev/null +++ b/nifi-nar-bundles/nifi-standard-shared-bundle/pom.xml @@ -0,0 +1,32 @@ + + + + 4.0.0 + + + org.apache.nifi + nifi-nar-bundles + 2.0.0-SNAPSHOT + + + nifi-standard-shared-bundle + pom + + + nifi-standard-shared-bom + nifi-standard-shared-nar + + diff --git a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-nar/pom.xml b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-nar/pom.xml index 5a1fcdc00a..8bd55800f0 100644 --- a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-nar/pom.xml +++ b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-nar/pom.xml @@ -32,8 +32,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/pom.xml b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/pom.xml index e02a48012b..b34ab809e2 100644 --- a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/pom.xml +++ b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/pom.xml @@ -110,6 +110,12 @@ 2.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-standard-shared-nar + 2.0.0-SNAPSHOT + nar + org.apache.nifi nifi-standard-services-api-nar diff --git a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/assembly/dependencies.xml b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/assembly/dependencies.xml index 1d9b2624d8..4fb1657562 100644 --- a/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/assembly/dependencies.xml +++ b/nifi-nar-bundles/nifi-stateless-processor-bundle/nifi-stateless-processor-tests/src/test/assembly/dependencies.xml @@ -31,6 +31,7 @@ *:nifi-stateless-bootstrap *:nifi-stateless-nar *:nifi-standard-nar + *:nifi-standard-shared-nar *:nifi-standard-services-api-nar *:nifi-jetty-bundle *:nifi-update-attribute-nar diff --git a/nifi-nar-bundles/nifi-stateless-processor-bundle/pom.xml b/nifi-nar-bundles/nifi-stateless-processor-bundle/pom.xml index 942d939023..b41bd239b5 100644 --- a/nifi-nar-bundles/nifi-stateless-processor-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-stateless-processor-bundle/pom.xml @@ -15,9 +15,10 @@ --> - nifi-nar-bundles + nifi-standard-shared-bom org.apache.nifi 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom 4.0.0 diff --git a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-nar/pom.xml b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-nar/pom.xml index 13b5a6a81d..b9407cb295 100644 --- a/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-nar/pom.xml +++ b/nifi-nar-bundles/nifi-zendesk-bundle/nifi-zendesk-nar/pom.xml @@ -24,10 +24,6 @@ nifi-zendesk-nar nar - - true - true - @@ -37,8 +33,7 @@ org.apache.nifi - nifi-standard-services-api-nar - 2.0.0-SNAPSHOT + nifi-standard-shared-nar nar diff --git a/nifi-nar-bundles/nifi-zendesk-bundle/pom.xml b/nifi-nar-bundles/nifi-zendesk-bundle/pom.xml index 0f090efa2c..cf5fa5828a 100644 --- a/nifi-nar-bundles/nifi-zendesk-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-zendesk-bundle/pom.xml @@ -17,9 +17,10 @@ 4.0.0 + nifi-standard-shared-bom org.apache.nifi - nifi-nar-bundles 2.0.0-SNAPSHOT + ../nifi-standard-shared-bundle/nifi-standard-shared-bom nifi-zendesk-bundle @@ -29,5 +30,4 @@ nifi-zendesk-processors nifi-zendesk-nar - diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml index ec8c44db47..1b040d8072 100755 --- a/nifi-nar-bundles/pom.xml +++ b/nifi-nar-bundles/pom.xml @@ -28,6 +28,7 @@ nifi-framework-bundle + nifi-standard-shared-bundle nifi-hadoop-bundle nifi-hadoop-libraries-bundle nifi-jetty-bundle