This is an automated email from the ASF dual-hosted git repository. markap14 pushed a commit to branch NIFI-15258 in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 109faf50a0c5f4413a6649fa52366964433d79fe Author: Mark Payne <[email protected]> AuthorDate: Wed Jan 21 15:46:57 2026 -0500 NIFI-15258: Fixes necessary after rebasing against main --- nifi-assembly/pom.xml | 2 +- nifi-commons/nifi-connector-utils/pom.xml | 2 +- .../nifi-connector-mock-api/pom.xml | 4 +- .../nifi-connector-mock-server-nar/pom.xml | 6 +-- .../nifi-connector-mock-server/pom.xml | 12 +++--- .../nifi-connector-mock-integration-tests/pom.xml | 18 ++++----- .../pom.xml | 4 +- .../nifi-connector-mock-test-connectors/pom.xml | 4 +- .../nifi-connector-mock-test-bundle/pom.xml | 2 +- .../nifi-connector-mock/pom.xml | 24 ++++++------ nifi-connector-mock-bundle/pom.xml | 2 +- .../nifi-kafka-to-s3-connector/pom.xml | 2 +- .../src/main/resources/flows/Kafka_to_S3.json | 44 +++++++++++----------- .../nifi-kafka-to-s3-integration-tests/pom.xml | 36 +++++++++--------- .../nifi-kafka-to-s3-nar/pom.xml | 4 +- nifi-connectors/nifi-kafka-to-s3-bundle/pom.xml | 2 +- nifi-connectors/pom.xml | 6 +-- .../kafka/service/Kafka3ConnectionService.java | 3 ++ .../nifi-framework/nifi-framework-core/pom.xml | 3 +- .../configuration/FlowControllerConfiguration.java | 2 +- .../VersionedFlowSynchronizerTest.java | 6 +++ .../org/apache/nifi/web/api/TestFlowResource.java | 2 +- .../tests/system/CalculateConnector.java | 2 +- .../tests/system/DataQueuingConnector.java | 2 +- 24 files changed, 101 insertions(+), 93 deletions(-) diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 1ddf8ea5b5..9933c50316 100644 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -918,7 +918,7 @@ language governing permissions and limitations under the License. --> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <!-- AspectJ library needed by the Java Agent used for native library loading (see bootstrap.conf) --> diff --git a/nifi-commons/nifi-connector-utils/pom.xml b/nifi-commons/nifi-connector-utils/pom.xml index 2794ecbfd6..8e8b3933f7 100644 --- a/nifi-commons/nifi-connector-utils/pom.xml +++ b/nifi-commons/nifi-connector-utils/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-commons</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-utils</artifactId> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-api/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-api/pom.xml index 2d581f17da..f64471bd62 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-api/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-api/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-api</artifactId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-server-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> </dependencies> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-server-nar/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-server-nar/pom.xml index eb4b1e8f72..a5b30a52ec 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-server-nar/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-server-nar/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-server-nar</artifactId> @@ -28,12 +28,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-server</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> </dependencies> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-server/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-server/pom.xml index 040596e620..4643943e29 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-server/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-server/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-server</artifactId> @@ -36,29 +36,29 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-core-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-core</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-property-encryptor</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-server-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/pom.xml index 959ac55052..7b092337a4 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-integration-tests/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-test-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-integration-tests</artifactId> @@ -36,12 +36,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <!-- Test Dependencies --> @@ -55,13 +55,13 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-server-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-test-connectors-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> @@ -69,25 +69,25 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-services-api-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-shared-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-update-attribute-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> </dependencies> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors-nar/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors-nar/pom.xml index 89d3a10121..4581c4af0b 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors-nar/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors-nar/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-test-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-test-connectors-nar</artifactId> @@ -28,7 +28,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-test-connectors</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> </dependencies> </project> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors/pom.xml index 9f2a86cd96..2632c75566 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/nifi-connector-mock-test-connectors/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-test-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-test-connectors</artifactId> @@ -32,7 +32,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/pom.xml index c7b734eb41..20805bacfe 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock-test-bundle/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-test-bundle</artifactId> diff --git a/nifi-connector-mock-bundle/nifi-connector-mock/pom.xml b/nifi-connector-mock-bundle/nifi-connector-mock/pom.xml index 3f6ea8b8cd..740a263a71 100644 --- a/nifi-connector-mock-bundle/nifi-connector-mock/pom.xml +++ b/nifi-connector-mock-bundle/nifi-connector-mock/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock</artifactId> @@ -36,25 +36,25 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-nar-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-properties</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <!-- Dependencies necessary to bootstrap NiFi --> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> @@ -62,22 +62,22 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-property-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-python-framework-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-stateless-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <!-- Logging dependencies to ensure that everything funnels through SLF4J --> @@ -105,19 +105,19 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-jetty-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-provenance-repository-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> </dependencies> diff --git a/nifi-connector-mock-bundle/pom.xml b/nifi-connector-mock-bundle/pom.xml index adb016336e..cae0a25dc3 100644 --- a/nifi-connector-mock-bundle/pom.xml +++ b/nifi-connector-mock-bundle/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connector-mock-bundle</artifactId> diff --git a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/pom.xml b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/pom.xml index 7f95903475..2ba42137da 100644 --- a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/pom.xml +++ b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-kafka-to-s3-connector</artifactId> diff --git a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/src/main/resources/flows/Kafka_to_S3.json b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/src/main/resources/flows/Kafka_to_S3.json index 5df6da47ae..8cfaebc689 100644 --- a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/src/main/resources/flows/Kafka_to_S3.json +++ b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-connector/src/main/resources/flows/Kafka_to_S3.json @@ -24,7 +24,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "max-bin-age": "#{Merge Latency}", @@ -154,7 +154,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-kafka-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Topics": "#{Topic Names}", @@ -345,7 +345,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-aws-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "FullControl User List": "${s3.permissions.full.users}", @@ -758,7 +758,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Schema Branch": null, @@ -898,7 +898,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -916,7 +916,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Schema Branch": null, @@ -1032,7 +1032,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1050,7 +1050,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Schema Branch": null, @@ -1190,7 +1190,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1208,7 +1208,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Schema Branch": null, @@ -1284,7 +1284,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1302,7 +1302,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-aws-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Assume Role STS Region": "us-west-2", @@ -1463,7 +1463,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-aws-service-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } }, { @@ -1471,7 +1471,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-aws-service-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1489,7 +1489,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-record-serialization-services-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "Schema Branch": null, @@ -1653,7 +1653,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1671,7 +1671,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-confluent-platform-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "SSL Context Service": null, @@ -1747,7 +1747,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1765,7 +1765,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-confluent-platform-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": {}, "propertyDescriptors": {}, @@ -1775,7 +1775,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-standard-services-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], @@ -1793,7 +1793,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-kafka-3-service-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" }, "properties": { "ack.wait.time": "10 sec", @@ -1917,7 +1917,7 @@ "bundle": { "group": "org.apache.nifi", "artifact": "nifi-kafka-service-api-nar", - "version": "2.7.0-SNAPSHOT" + "version": "2.8.0-SNAPSHOT" } } ], diff --git a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-integration-tests/pom.xml b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-integration-tests/pom.xml index 345f9b1a38..b7e63e618d 100644 --- a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-integration-tests/pom.xml +++ b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-integration-tests/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-kafka-to-s3-integration-tests</artifactId> @@ -42,12 +42,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-api</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> <!-- Test Containers for Kafka and S3 --> @@ -122,67 +122,67 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-3-service-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-service-api-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-aws-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-aws-service-api-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-services-api-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-shared-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-record-serialization-services-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-confluent-platform-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> @@ -190,25 +190,25 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-jetty-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-provenance-repository-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-mock-server-nar</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <type>nar</type> </dependency> </dependencies> diff --git a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-nar/pom.xml b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-nar/pom.xml index 76e6e97097..6f7f334eab 100644 --- a/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-nar/pom.xml +++ b/nifi-connectors/nifi-kafka-to-s3-bundle/nifi-kafka-to-s3-nar/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-bundle</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-kafka-to-s3-nar</artifactId> @@ -30,7 +30,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-kafka-to-s3-connector</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file diff --git a/nifi-connectors/nifi-kafka-to-s3-bundle/pom.xml b/nifi-connectors/nifi-kafka-to-s3-bundle/pom.xml index 0fbed3c9ea..71f8649563 100644 --- a/nifi-connectors/nifi-kafka-to-s3-bundle/pom.xml +++ b/nifi-connectors/nifi-kafka-to-s3-bundle/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connectors</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-kafka-to-s3-bundle</artifactId> diff --git a/nifi-connectors/pom.xml b/nifi-connectors/pom.xml index 4186b8904d..d0a4d3c9b9 100644 --- a/nifi-connectors/pom.xml +++ b/nifi-connectors/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.nifi</groupId> <artifactId>nifi</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </parent> <artifactId>nifi-connectors</artifactId> @@ -35,8 +35,8 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> -</project> \ No newline at end of file +</project> diff --git a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java index 9ecf11b6f7..c7cc4782ff 100644 --- a/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java +++ b/nifi-extension-bundles/nifi-kafka-bundle/nifi-kafka-service-shared/src/main/java/org/apache/nifi/kafka/service/Kafka3ConnectionService.java @@ -16,7 +16,9 @@ */ package org.apache.nifi.kafka.service; +import org.apache.kafka.clients.admin.Admin; import org.apache.kafka.clients.admin.AdminClientConfig; +import org.apache.kafka.clients.admin.ListTopicsResult; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; @@ -62,6 +64,7 @@ import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.ssl.SSLContextService; import java.time.Duration; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml index 7a3e6a98ac..479567966e 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml @@ -128,7 +128,6 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-expression-language</artifactId> <version>2.8.0-SNAPSHOT</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> @@ -293,7 +292,7 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-connector-utils</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java index cd17fc0349..63c4f11630 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/FlowControllerConfiguration.java @@ -468,7 +468,7 @@ public class FlowControllerConfiguration { @Bean public AssetSynchronizer parameterContextAssetSynchronizer() throws Exception { - return new StandardAssetSynchronizer(flowController(), clusterCoordinator, webClientService(), properties); + return new StandardAssetSynchronizer(flowController(), clusterCoordinator, webClientService(), properties, affectedComponentManager()); } /** diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizerTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizerTest.java index b01317c83e..f526e25cb4 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizerTest.java +++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizerTest.java @@ -18,6 +18,7 @@ package org.apache.nifi.controller.serialization; import org.apache.nifi.cluster.protocol.DataFlow; import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.components.connector.ConnectorRepository; import org.apache.nifi.controller.FlowController; import org.apache.nifi.controller.ReportingTaskNode; import org.apache.nifi.controller.SnippetManager; @@ -51,6 +52,7 @@ import org.mockito.junit.jupiter.MockitoExtension; import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Path; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; @@ -278,5 +280,9 @@ class VersionedFlowSynchronizerTest { when(flowController.getEncryptor()).thenReturn(encryptor); when(flowController.createVersionedComponentStateLookup(any())).thenReturn(stateLookup); when(flowController.getControllerServiceProvider()).thenReturn(controllerServiceProvider); + + final ConnectorRepository connectorRepository = mock(ConnectorRepository.class); + when(connectorRepository.getConnectors()).thenReturn(Collections.emptyList()); + when(flowController.getConnectorRepository()).thenReturn(connectorRepository); } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/TestFlowResource.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/TestFlowResource.java index ea0d3c4fa7..e67680bdb2 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/TestFlowResource.java +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/web/api/TestFlowResource.java @@ -545,7 +545,7 @@ public class TestFlowResource { entity.setFromTimestamp(Instant.now()); // components is null, so clearBulletins will gather all authorized components - when(niFiProperties.isNode()).thenReturn(false); + when(properties.isNode()).thenReturn(false); resource.httpServletRequest = new MockHttpServletRequest(); // Capture the function passed to filterComponents (called 3 times) diff --git a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/CalculateConnector.java b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/CalculateConnector.java index d8763e0587..f3fb33d80b 100644 --- a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/CalculateConnector.java +++ b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/CalculateConnector.java @@ -170,7 +170,7 @@ public class CalculateConnector extends AbstractConnector { final Bundle bundle = new Bundle(); bundle.setGroup("org.apache.nifi"); bundle.setArtifact("nifi-system-test-extensions-nar"); - bundle.setVersion("2.7.0-SNAPSHOT"); + bundle.setVersion("2.8.0-SNAPSHOT"); final VersionedProcessor processor = new VersionedProcessor(); processor.setIdentifier("calculate-processor-id"); diff --git a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/DataQueuingConnector.java b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/DataQueuingConnector.java index f3503b7ed1..920c61480a 100644 --- a/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/DataQueuingConnector.java +++ b/nifi-system-tests/nifi-system-test-extensions-bundle/nifi-system-test-extensions/src/main/java/org/apache/nifi/connectors/tests/system/DataQueuingConnector.java @@ -47,7 +47,7 @@ public class DataQueuingConnector extends AbstractConnector { final Bundle bundle = new Bundle(); bundle.setGroup("org.apache.nifi"); bundle.setArtifact("nifi-system-test-extensions-nar"); - bundle.setVersion("2.7.0-SNAPSHOT"); + bundle.setVersion("2.8.0-SNAPSHOT"); final VersionedProcessor generate = createVersionedProcessor("gen-1", "1234", "GenerateFlowFile", "org.apache.nifi.processors.tests.system.GenerateFlowFile", bundle, Map.of("File Size", "1 KB"), ScheduledState.RUNNING);
