You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2022/04/04 18:28:55 UTC
[nifi] branch support/nifi-1.16 created (now 5ef8f3b426)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
at 5ef8f3b426 NIFI-9860 Upgraded JRuby from 9.2.6.0 to 9.3.4.0
This branch includes the following new commits:
new 17b191f707 NIFI-9868
new d02d119bfa NIFI-9793 Added wait for Controller Service run status in tests
new 0d3ad93120 NIFI-1468 Added tests to handle invalid cipher streams missing Salt/IV
new db07fbeae1 NIFI-8124 Added Cookie Strategy property to InvokeHTTP
new 817434a941 NIFI-9827: Upgrading AWS Java SDK to 1.12.182 to pick up new AWS Regions
new 79b375fc83 NIFI-7262 Added debug logging for the generated query in PutCassandraRecord. (#5898)
new 854c419635 NIFI-9835: Fixed threading bug in which NioAsyncLoadBalanceClient calls LoadBalanceSession.isComplete() followed by LoadBalanceSession.isCanceled() but it's possible for the complete flag to change before the canceled flag (they are not updated atomically). So changed to use a single LoadBalanceSessionState enum that represents the state. Also made the private StandardProcessSession.commit(boolean) method synchronized. When a processor is terminated (as is the case in [...]
new ca585899d9 NIFI-9834: When calling ByteArrayContentRepository.read() on a null Content Claim, return an empty ByteArrayInputStream instead of throwing NullPointerException
new 7a1c743e5e NIFI-9773 Refactored nifi-system-tests using JUnit 5
new 2cfef542e6 NIFI-9701 - Corrected No Tracking strategy to create one flow file when using a Record Writer
new 7f8aa88842 NIFI-9841 Improved Encryptor test reliability
new e40b14e37f NIFI-9838: Added Client Certificate attributes to ListenTCPRecord FlowFiles
new 9e4e4ebec9 NIFI-9842 Refactored nifi-commons using JUnit 5
new beb20ddc4a NIFI-9839: Fixed bug in which Process Group would return true for isEmpty even if it has a Controller Service (#5910)
new b4ada2271b NIFI-9702 ListSFTP will set mime.type when Record Writer configured
new 035b64d723 NIFI-9836: fix database selection during nifi registry startup (#5907)
new fb299b3f87 NIFI-9787: Increasing visibility of selected slickgrid row with 1px b… (#5857)
new ba27edd33e NIFI-9844 Refactored Encryptor tests using JUnit 5
new 65c7e9929e NIFI-9816 Added lang attribute to html tag for WCAG 2.1 Accessibility
new daafd08aae NIFI-9820 Reduced Kudu Client Worker Count default setting
new e430349be5 NIFI-9824 - Address WARN log message in ProcessorAuditor on action RunOnce
new b146e07de3 NIFI-7254 Upgraded geoip2 from 2.12.0 to 2.16.1
new d805360157 NIFI-9847: Switched LifecycleState to use a WeakHashMap to track Acti… (#5917)
new cbb81d0b33 NIFI-9845 Fix NiFi Registry database ITs
new 17c386df0c NIFI-9852 Upgraded Spring Framework from 5.3.16 to 5.3.18
new 3b3853a0a0 NIFI-9854: Include slf4j-api as runtime scope for nifi-stateless-system-test-suite; When constructing the classes to block for the stateless ClassLoader, allow through any classes that come from Java Home's lib/ directory
new 0ecc9cf314 NIFI-9859 Upgraded Apache Curator from 5.2.0 to 5.2.1
new 126ab0b8d8 NIFI-9853: Refactored StandardProcessGroupSynchronizer to make use of… (#5919)
new decf86840f NIFI-9858 Refactored nifi-system-test-suite using generated certificates
new 869422d24d NIFI-9846 Implement pagination listing for Azure List processors
new 5ef8f3b426 NIFI-9860 Upgraded JRuby from 9.2.6.0 to 9.3.4.0
The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[nifi] 24/31: NIFI-9845 Fix NiFi Registry database ITs
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit cbb81d0b33c8f62e6a850e6d66255bd14d28e12c
Author: Bryan Bende <bb...@gmail.com>
AuthorDate: Tue Mar 29 11:44:59 2022 -0400
NIFI-9845 Fix NiFi Registry database ITs
- remove unsupported DB test containers, update admin guide
This closes #5914.
Signed-off-by: Kevin Doran <kd...@apache.org>
---
.../src/main/asciidoc/administration-guide.adoc | 2 +-
.../nifi-registry-core/nifi-registry-test/pom.xml | 10 ------
.../nifi/registry/db/MySql6DataSourceFactory.java | 37 ----------------------
.../nifi/registry/db/MySql7DataSourceFactory.java | 37 ----------------------
...ctory.java => Postgres14DataSourceFactory.java} | 6 ++--
nifi-registry/nifi-registry-core/pom.xml | 35 +++++++-------------
nifi-registry/pom.xml | 26 +++++++++++++++
7 files changed, 41 insertions(+), 112 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
index 7609c40069..f8c6f8839f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
+++ b/nifi-registry/nifi-registry-core/nifi-registry-docs/src/main/asciidoc/administration-guide.adoc
@@ -1131,7 +1131,7 @@ providing 2 total locations, including `nifi.registry.extension.dir.1`.
The metadata database maintains the knowledge of which buckets exist, which versioned items belong to which buckets, as well as the version history for each item.
-Currently, NiFi Registry supports using H2, Postgres (9.x, 10.x), and MySQL (5.6, 5.7, 8.0) for the relational database engine.
+Currently, NiFi Registry supports using H2, Postgres (10.x - 13.x), and MySQL (8.0) for the relational database engine.
NOTE: NiFi Registry 0.1.0 only supports H2.
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
index 53d201294b..a3046233b8 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/pom.xml
@@ -40,29 +40,19 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>${testcontainers.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
- <version>${testcontainers.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mariadb</artifactId>
- <version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
- <version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
deleted file mode 100644
index 69fc9875d1..0000000000
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql6DataSourceFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.registry.db;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.testcontainers.containers.MySQLContainer;
-
-@Configuration
-@Profile("mysql-56")
-public class MySql6DataSourceFactory extends MySqlDataSourceFactory {
-
- private static final MySQLContainer MYSQL_CONTAINER = new MySqlCustomContainer("mysql:5.6");
-
- static {
- MYSQL_CONTAINER.start();
- }
-
- @Override
- protected MySQLContainer mysqlContainer() {
- return MYSQL_CONTAINER;
- }
-}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql7DataSourceFactory.java b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql7DataSourceFactory.java
deleted file mode 100644
index d0a1fdeaf6..0000000000
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/MySql7DataSourceFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.registry.db;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.testcontainers.containers.MySQLContainer;
-
-@Configuration
-@Profile({"mysql", "mysql-57"})
-public class MySql7DataSourceFactory extends MySqlDataSourceFactory {
-
- private static final MySQLContainer MYSQL_CONTAINER = new MySqlCustomContainer("mysql:5.7");
-
- static {
- MYSQL_CONTAINER.start();
- }
-
- @Override
- protected MySQLContainer mysqlContainer() {
- return MYSQL_CONTAINER;
- }
-}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/PostgresDataSourceFactory.java b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres14DataSourceFactory.java
similarity index 93%
rename from nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/PostgresDataSourceFactory.java
rename to nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres14DataSourceFactory.java
index 01fe05d789..19b8346897 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/PostgresDataSourceFactory.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-test/src/main/java/org/apache/nifi/registry/db/Postgres14DataSourceFactory.java
@@ -29,10 +29,10 @@ import javax.sql.DataSource;
import java.sql.SQLException;
@Configuration
-@Profile("postgres")
-public class PostgresDataSourceFactory extends TestDataSourceFactory {
+@Profile("postgres-14")
+public class Postgres14DataSourceFactory extends TestDataSourceFactory {
- private static final PostgreSQLContainer POSTGRESQL_CONTAINER = new PostgreSQLContainer();
+ private static final PostgreSQLContainer POSTGRESQL_CONTAINER = new PostgreSQLContainer("postgres:14");
static {
POSTGRESQL_CONTAINER.start();
diff --git a/nifi-registry/nifi-registry-core/pom.xml b/nifi-registry/nifi-registry-core/pom.xml
index e3de7df6df..5fb211babb 100644
--- a/nifi-registry/nifi-registry-core/pom.xml
+++ b/nifi-registry/nifi-registry-core/pom.xml
@@ -172,20 +172,7 @@
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
- <id>mysql5.7-test</id>
- <phase>verify</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <spring.profiles.active>mysql-57</spring.profiles.active>
- </systemPropertyVariables>
- </configuration>
- </execution>
- <execution>
- <id>mysql58-test</id>
+ <id>mysql8-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -198,7 +185,7 @@
</configuration>
</execution>
<execution>
- <id>postgres-test</id>
+ <id>postgres10-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -206,12 +193,12 @@
</goals>
<configuration>
<systemPropertyVariables>
- <spring.profiles.active>postgres</spring.profiles.active>
+ <spring.profiles.active>postgres-10</spring.profiles.active>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
- <id>postgres10-test</id>
+ <id>postgres11-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -219,12 +206,12 @@
</goals>
<configuration>
<systemPropertyVariables>
- <spring.profiles.active>postgres-10</spring.profiles.active>
+ <spring.profiles.active>postgres-11</spring.profiles.active>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
- <id>postgres11-test</id>
+ <id>postgres12-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -232,12 +219,12 @@
</goals>
<configuration>
<systemPropertyVariables>
- <spring.profiles.active>postgres-11</spring.profiles.active>
+ <spring.profiles.active>postgres-12</spring.profiles.active>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
- <id>postgres12-test</id>
+ <id>postgres13-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -245,12 +232,12 @@
</goals>
<configuration>
<systemPropertyVariables>
- <spring.profiles.active>postgres-12</spring.profiles.active>
+ <spring.profiles.active>postgres-13</spring.profiles.active>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
- <id>postgres13-test</id>
+ <id>postgres14-test</id>
<phase>verify</phase>
<goals>
<goal>integration-test</goal>
@@ -258,7 +245,7 @@
</goals>
<configuration>
<systemPropertyVariables>
- <spring.profiles.active>postgres-13</spring.profiles.active>
+ <spring.profiles.active>postgres-14</spring.profiles.active>
</systemPropertyVariables>
</configuration>
</execution>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 70488529c9..f581b7b848 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -216,6 +216,32 @@
<version>${nifi.groovy.version}</version>
<type>test</type>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>${testcontainers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mysql</artifactId>
+ <version>${testcontainers.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>mariadb</artifactId>
+ <version>${testcontainers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${testcontainers.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
[nifi] 22/31: NIFI-7254 Upgraded geoip2 from 2.12.0 to 2.16.1
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b146e07de33b428bbeebfff175e158e3599f9e2d
Author: Mike Thomsen <mt...@apache.org>
AuthorDate: Mon Mar 28 08:10:19 2022 -0400
NIFI-7254 Upgraded geoip2 from 2.12.0 to 2.16.1
- Replaced custom DatabaseReader with standard DatabaseReader implementation
This closes #5909
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi-enrich-processors/pom.xml | 7 +-
.../apache/nifi/processors/AbstractEnrichIP.java | 2 +-
.../org/apache/nifi/processors/GeoEnrichIP.java | 5 +-
.../apache/nifi/processors/GeoEnrichIPRecord.java | 17 +-
.../org/apache/nifi/processors/ISPEnrichIP.java | 5 +-
.../nifi/processors/maxmind/DatabaseReader.java | 272 ---------------------
.../apache/nifi/processors/GeoEnrichTestUtils.java | 224 +++++++++++++----
.../apache/nifi/processors/TestGeoEnrichIP.java | 2 +-
.../nifi/processors/TestGeoEnrichIPRecord.java | 33 ++-
.../apache/nifi/processors/TestISPEnrichIP.java | 33 ++-
.../nifi-lookup-services/pom.xml | 1 -
.../apache/nifi/lookup/maxmind/DatabaseReader.java | 262 --------------------
.../nifi/lookup/maxmind/IPLookupService.java | 1 +
nifi-nar-bundles/pom.xml | 6 +
14 files changed, 239 insertions(+), 631 deletions(-)
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 0f396594f8..11c38e73c0 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
@@ -41,7 +41,6 @@
<dependency>
<groupId>com.maxmind.geoip2</groupId>
<artifactId>geoip2</artifactId>
- <version>2.12.0</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -90,6 +89,12 @@
<version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jr</groupId>
+ <artifactId>jackson-jr-objects</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
index 9711534db2..ab0fb9faaf 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/AbstractEnrichIP.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.annotation.lifecycle.OnStopped;
import org.apache.nifi.components.PropertyDescriptor;
@@ -28,7 +29,6 @@ import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessorInitializationContext;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.StopWatch;
import java.io.File;
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIP.java
index 8e657ecbab..763bd5b7ff 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIP.java
@@ -16,6 +16,8 @@
*/
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
import com.maxmind.geoip2.model.CityResponse;
import com.maxmind.geoip2.record.Subdivision;
import org.apache.commons.lang3.StringUtils;
@@ -32,7 +34,6 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.StopWatch;
import java.io.IOException;
@@ -100,7 +101,7 @@ public class GeoEnrichIP extends AbstractEnrichIP {
try {
response = dbReader.city(inetAddress);
stopWatch.stop();
- } catch (final IOException ex) {
+ } catch (GeoIp2Exception | IOException ex) {
// Note IOException is captured again as dbReader also makes InetAddress.getByName() calls.
// Most name or IP resolutions failure should have been triggered in the try loop above but
// environmental conditions may trigger errors during the second resolution as well.
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java
index 4c83d50dce..5fff3a6f64 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/GeoEnrichIPRecord.java
@@ -16,6 +16,7 @@
*/
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.CityResponse;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
@@ -30,7 +31,6 @@ import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.record.path.FieldValue;
import org.apache.nifi.record.path.RecordPath;
import org.apache.nifi.record.path.RecordPathResult;
@@ -102,14 +102,6 @@ public class GeoEnrichIPRecord extends AbstractEnrichIP {
.addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
.build();
- public static final PropertyDescriptor GEO_ACCURACY = new PropertyDescriptor.Builder()
- .name("geo-enrich-ip-accuracy-record-path")
- .displayName("Accuracy Radius Record Path")
- .description("Record path for putting the accuracy radius if provided by the database (in Kilometers)")
- .required(false)
- .addValidator(StandardValidators.NON_EMPTY_EL_VALIDATOR)
- .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
- .build();
public static final PropertyDescriptor GEO_LATITUDE = new PropertyDescriptor.Builder()
.name("geo-enrich-ip-latitude-record-path")
.displayName("Latitude Record Path")
@@ -161,11 +153,11 @@ public class GeoEnrichIPRecord extends AbstractEnrichIP {
)));
public static final List<PropertyDescriptor> GEO_PROPERTIES = Collections.unmodifiableList(Arrays.asList(
- GEO_CITY, GEO_ACCURACY, GEO_LATITUDE, GEO_LONGITUDE, GEO_COUNTRY, GEO_COUNTRY_ISO, GEO_POSTAL_CODE
+ GEO_CITY, GEO_LATITUDE, GEO_LONGITUDE, GEO_COUNTRY, GEO_COUNTRY_ISO, GEO_POSTAL_CODE
));
private static final List<PropertyDescriptor> DESCRIPTORS = Collections.unmodifiableList(Arrays.asList(
- GEO_DATABASE_FILE, READER, WRITER, SPLIT_FOUND_NOT_FOUND, IP_RECORD_PATH, GEO_CITY, GEO_ACCURACY, GEO_LATITUDE,
+ GEO_DATABASE_FILE, READER, WRITER, SPLIT_FOUND_NOT_FOUND, IP_RECORD_PATH, GEO_CITY, GEO_LATITUDE,
GEO_LONGITUDE, GEO_COUNTRY, GEO_COUNTRY_ISO, GEO_POSTAL_CODE
));
@@ -321,14 +313,13 @@ public class GeoEnrichIPRecord extends AbstractEnrichIP {
}
boolean city = update(GEO_CITY, cached, record, response.getCity().getName());
- boolean accuracy = update(GEO_ACCURACY, cached, record, response.getCity().getConfidence());
boolean country = update(GEO_COUNTRY, cached, record, response.getCountry().getName());
boolean iso = update(GEO_COUNTRY_ISO, cached, record, response.getCountry().getIsoCode());
boolean lat = update(GEO_LATITUDE, cached, record, response.getLocation().getLatitude());
boolean lon = update(GEO_LONGITUDE, cached, record, response.getLocation().getLongitude());
boolean postal = update(GEO_POSTAL_CODE, cached, record, response.getPostal().getCode());
- retVal = (city || accuracy || country || iso || lat || lon || postal);
+ retVal = (city || country || iso || lat || lon || postal);
return retVal;
}
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/ISPEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/ISPEnrichIP.java
index 781fb71c47..7365c2f960 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/ISPEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/ISPEnrichIP.java
@@ -16,6 +16,8 @@
*/
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
+import com.maxmind.geoip2.exception.GeoIp2Exception;
import com.maxmind.geoip2.model.IspResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.EventDriven;
@@ -31,7 +33,6 @@ import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.exception.ProcessException;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.StopWatch;
import java.io.IOException;
@@ -93,7 +94,7 @@ public class ISPEnrichIP extends AbstractEnrichIP {
try {
response = dbReader.isp(inetAddress);
stopWatch.stop();
- } catch (final IOException ex) {
+ } catch (GeoIp2Exception | IOException ex) {
// Note IOException is captured again as dbReader also makes InetAddress.getByName() calls.
// Most name or IP resolutions failure should have been triggered in the try loop above but
// environmental conditions may trigger errors during the second resolution as well.
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/maxmind/DatabaseReader.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/maxmind/DatabaseReader.java
deleted file mode 100644
index 8cbc74aa99..0000000000
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/main/java/org/apache/nifi/processors/maxmind/DatabaseReader.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.processors.maxmind;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.maxmind.db.Metadata;
-import com.maxmind.db.Reader;
-import com.maxmind.db.Reader.FileMode;
-import com.maxmind.geoip2.GeoIp2Provider;
-import com.maxmind.geoip2.model.AnonymousIpResponse;
-import com.maxmind.geoip2.model.CityResponse;
-import com.maxmind.geoip2.model.ConnectionTypeResponse;
-import com.maxmind.geoip2.model.CountryResponse;
-import com.maxmind.geoip2.model.DomainResponse;
-import com.maxmind.geoip2.model.IspResponse;
-import com.maxmind.geoip2.record.Traits;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * <p>
- * This class was copied from https://raw.githubusercontent.com/maxmind/GeoIP2-java/master/src/main/java/com/maxmind/geoip2/DatabaseReader.java It is written by Maxmind and it is available under
- * Apache Software License V2
- *
- * The modification we're making to the code below is to stop using exceptions for mainline flow control. Specifically we don't want to throw an exception simply because an address was not found.
- * </p>
- *
- * Instances of this class provide a reader for the GeoIP2 database format. IP addresses can be looked up using the <code>get</code> method.
- */
-public class DatabaseReader implements GeoIp2Provider, Closeable {
-
- private final Reader reader;
- private final ObjectMapper om;
- private List<String> locales;
-
- private DatabaseReader(final Builder builder) throws IOException {
- if (builder.stream != null) {
- this.reader = new Reader(builder.stream);
- } else if (builder.database != null) {
- this.reader = new Reader(builder.database, builder.mode);
- } else {
- // This should never happen. If it does, review the Builder class
- // constructors for errors.
- throw new IllegalArgumentException("Unsupported Builder configuration: expected either File or URL");
- }
-
- this.om = new ObjectMapper();
- this.om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,false);
- this.om.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
- InjectableValues inject = new InjectableValues.Std().addValue("locales", builder.locales);
- this.om.setInjectableValues(inject);
-
- this.locales = builder.locales;
- }
-
- /**
- * <p>
- * Constructs a Builder for the DatabaseReader. The file passed to it must be a valid GeoIP2 database file.
- * </p>
- *
- * <p>
- * <code>Builder</code> creates instances of <code>DatabaseReader</code> from values set by the methods.
- * </p>
- *
- * <p>
- * Only the values set in the <code>Builder</code> constructor are required.
- * </p>
- */
- public final static class Builder {
-
- final File database;
- final InputStream stream;
-
- List<String> locales = Arrays.asList("en");
- FileMode mode = FileMode.MEMORY_MAPPED;
-
- /**
- * @param stream the stream containing the GeoIP2 database to use.
- */
- public Builder(InputStream stream) {
- this.stream = stream;
- this.database = null;
- }
-
- /**
- * @param database the GeoIP2 database file to use.
- */
- public Builder(File database) {
- this.database = database;
- this.stream = null;
- }
-
- /**
- * @param val List of locale codes to use in name property from most preferred to least preferred.
- * @return Builder object
- */
- public Builder locales(List<String> val) {
- this.locales = val;
- return this;
- }
-
- /**
- * @param val The file mode used to open the GeoIP2 database
- * @return Builder object
- * @throws java.lang.IllegalArgumentException if you initialized the Builder with a URL, which uses {@link FileMode#MEMORY}, but you provided a different FileMode to this method.
- */
- public Builder fileMode(FileMode val) {
- if (this.stream != null && !FileMode.MEMORY.equals(val)) {
- throw new IllegalArgumentException(
- "Only FileMode.MEMORY is supported when using an InputStream.");
- }
- this.mode = val;
- return this;
- }
-
- /**
- * @return an instance of <code>DatabaseReader</code> created from the fields set on this builder.
- * @throws IOException if there is an error reading the database
- */
- public DatabaseReader build() throws IOException {
- return new DatabaseReader(this);
- }
- }
-
- /**
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return An object of type T with the data for the IP address or null if no information could be found for the given IP address
- * @throws IOException if there is an error opening or reading from the file.
- */
- private <T> T get(InetAddress ipAddress, Class<T> cls, boolean hasTraits, String type) throws IOException {
- String databaseType = this.getMetadata().getDatabaseType();
- if (!databaseType.contains(type)) {
- String caller = Thread.currentThread().getStackTrace()[2].getMethodName();
- throw new UnsupportedOperationException("Invalid attempt to open a " + databaseType + " database using the " + caller + " method");
- }
-
- ObjectNode node = (ObjectNode) this.reader.get(ipAddress);
-
- if (node == null) {
- return null;
- }
-
- InjectableValues inject = new JsonInjector(ipAddress.getHostAddress());
- return this.om.reader(inject).treeToValue(node, cls);
- }
-
-
- /**
- * <p>
- * Closes the database.
- * </p>
- * <p>
- * If you are using <code>FileMode.MEMORY_MAPPED</code>, this will
- * <em>not</em> unmap the underlying file due to a limitation in Java's <code>MappedByteBuffer</code>. It will however set the reference to the buffer to <code>null</code>, allowing the garbage
- * collector to collect it.
- * </p>
- *
- * @throws IOException if an I/O error occurs.
- */
- @Override
- public void close() throws IOException {
- this.reader.close();
- }
-
- @Override
- public CountryResponse country(InetAddress ipAddress) throws IOException {
- return get(ipAddress, CountryResponse.class, true, "Country");
- }
-
- @Override
- public CityResponse city(InetAddress ipAddress) throws IOException {
- return get(ipAddress, CityResponse.class, true, "City");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Anonymous IP.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a AnonymousIpResponse for the requested IP address.
- * @throws IOException if there is an IO error
- */
- public AnonymousIpResponse anonymousIp(InetAddress ipAddress) throws IOException {
- return get(ipAddress, AnonymousIpResponse.class, false, "GeoIP2-Anonymous-IP");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Connection Type database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a ConnectTypeResponse for the requested IP address.
- * @throws IOException if there is an IO error
- */
- public ConnectionTypeResponse connectionType(InetAddress ipAddress) throws IOException {
- return get(ipAddress, ConnectionTypeResponse.class, false,"GeoIP2-Connection-Type");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Domain database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a DomainResponse for the requested IP address.
- * @throws IOException if there is an IO error
- */
- public DomainResponse domain(InetAddress ipAddress) throws IOException {
- return get(ipAddress, DomainResponse.class, false, "GeoIP2-Domain");
- }
-
- /**
- * Look up an IP address in a GeoIP2 ISP database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return an IspResponse for the requested IP address.
- * @throws IOException if there is an IO error
- */
- public IspResponse isp(InetAddress ipAddress) throws IOException {
- return get(ipAddress, IspResponse.class, false, "GeoIP2-ISP");
- }
-
- /**
- * @return the metadata for the open MaxMind DB file.
- */
- public Metadata getMetadata() {
- return this.reader.getMetadata();
- }
-
- private class JsonInjector extends InjectableValues {
- private final String ip;
-
- JsonInjector(final String ip) {
- this.ip = ip;
- }
-
- @Override
- public Object findInjectableValue(final Object valueId, final DeserializationContext ctxt, final BeanProperty forProperty, final Object beanInstance) throws JsonMappingException {
- if ("ip_address".equals(valueId)) {
- return ip;
- } else if ("traits".equals(valueId)) {
- return new Traits(ip);
- } else if ("locales".equals(valueId)) {
- return locales;
- }
-
- return null;
- }
- }
-}
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/GeoEnrichTestUtils.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/GeoEnrichTestUtils.java
index 834e99cb3f..6aee2df45e 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/GeoEnrichTestUtils.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/GeoEnrichTestUtils.java
@@ -19,6 +19,7 @@ package org.apache.nifi.processors;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jr.ob.JSON;
import com.maxmind.geoip2.model.CityResponse;
import java.util.Collections;
@@ -26,32 +27,93 @@ import java.util.Collections;
public class GeoEnrichTestUtils {
public static CityResponse getFullCityResponse() throws Exception {
// Taken from MaxMind unit tests.
- final String maxMindCityResponse = "{\"city\":{\"confidence\":76,"
- + "\"geoname_id\":9876,\"names\":{\"en\":\"Minneapolis\""
- + "}},\"continent\":{\"code\":\"NA\","
- + "\"geoname_id\":42,\"names\":{" + "\"en\":\"North America\""
- + "}},\"country\":{\"confidence\":99,"
- + "\"iso_code\":\"US\",\"geoname_id\":1,\"names\":{"
- + "\"en\":\"United States of America\"" + "}" + "},"
- + "\"location\":{" + "\"accuracy_radius\":1500,"
- + "\"latitude\":44.98," + "\"longitude\":93.2636,"
- + "\"metro_code\":765," + "\"time_zone\":\"America/Chicago\""
- + "}," + "\"postal\":{\"confidence\": 33, \"code\":\"55401\"},"
- + "\"registered_country\":{" + "\"geoname_id\":2,"
- + "\"iso_code\":\"CA\"," + "\"names\":{" + "\"en\":\"Canada\""
- + "}" + "}," + "\"represented_country\":{" + "\"geoname_id\":3,"
- + "\"iso_code\":\"GB\"," + "\"names\":{"
- + "\"en\":\"United Kingdom\"" + "}," + "\"type\":\"C<military>\""
- + "}," + "\"subdivisions\":[{" + "\"confidence\":88,"
- + "\"geoname_id\":574635," + "\"iso_code\":\"MN\"," + "\"names\":{"
- + "\"en\":\"Minnesota\"" + "}" + "}," + "{\"iso_code\":\"TT\"}],"
- + "\"traits\":{" + "\"autonomous_system_number\":1234,"
- + "\"autonomous_system_organization\":\"AS Organization\","
- + "\"domain\":\"example.com\"," + "\"ip_address\":\"1.2.3.4\","
- + "\"is_anonymous_proxy\":true,"
- + "\"is_satellite_provider\":true," + "\"isp\":\"Comcast\","
- + "\"organization\":\"Blorg\"," + "\"user_type\":\"college\""
- + "}," + "\"maxmind\":{\"queries_remaining\":11}" + "}";
+ final String maxMindCityResponse = JSON.std
+ .composeString()
+ .startObject()
+ .startObjectField("maxmind")
+ .put("queries_remaining", 11)
+ .end()
+ .startObjectField("registered_country")
+ .put("geoname_id", 2)
+ .startObjectField("names")
+ .put("en", "Canada")
+ .end()
+ .put("is_in_european_union", false)
+ .put("iso_code", "CA")
+ .end()
+ .startObjectField("traits")
+ .put("is_anonymous_proxy", true)
+ .put("autonomous_system_number", 1234)
+ .put("isp", "Comcast")
+ .put("ip_address", "1.2.3.4")
+ .put("is_satellite_provider", true)
+ .put("autonomous_system_organization", "AS Organization")
+ .put("organization", "Blorg")
+ .put("domain", "example.com")
+ // These are here just to simplify the testing. We expect the
+ // difference
+ .put("is_anonymous", false)
+ .put("is_anonymous_vpn", false)
+ .put("is_hosting_provider", false)
+ .put("is_legitimate_proxy", false)
+ .put("is_public_proxy", false)
+ .put("is_residential_proxy", false)
+ .put("is_tor_exit_node", false)
+ .put("network", "1.2.3.0/24")
+ .end()
+ .startObjectField("country")
+ .startObjectField("names")
+ .put("en", "United States of America")
+ .end()
+ .put("geoname_id", 1)
+ .put("is_in_european_union", false)
+ .put("iso_code", "US")
+ .end()
+ .startObjectField("continent")
+ .startObjectField("names")
+ .put("en", "North America")
+ .end()
+ .put("code", "NA")
+ .put("geoname_id", 42)
+ .end()
+ .startObjectField("location")
+ .put("time_zone", "America/Chicago")
+ .put("metro_code", 765)
+ .put("latitude", 44.98)
+ .put("longitude", 93.2636)
+ .end()
+ .startArrayField("subdivisions")
+ .startObject()
+ .put("iso_code", "MN")
+ .put("geoname_id", 574635)
+ .startObjectField("names")
+ .put("en", "Minnesota")
+ .end()
+ .end()
+ .startObject()
+ .put("iso_code", "TT")
+ .end()
+ .end()
+ .startObjectField("represented_country")
+ .put("geoname_id", 3)
+ .startObjectField("names")
+ .put("en", "United Kingdom")
+ .end()
+ .put("type", "C<military>")
+ .put("is_in_european_union", true)
+ .put("iso_code", "GB")
+ .end()
+ .startObjectField("postal")
+ .put("code", "55401")
+ .end()
+ .startObjectField("city")
+ .put("geoname_id", 9876)
+ .startObjectField("names")
+ .put("en", "Minneapolis")
+ .end()
+ .end()
+ .end()
+ .finish();
InjectableValues inject = new InjectableValues.Std().addValue("locales", Collections.singletonList("en"));
ObjectMapper mapper = new ObjectMapper();
@@ -62,31 +124,91 @@ public class GeoEnrichTestUtils {
public static CityResponse getNullLatAndLongCityResponse() throws Exception {
// Taken from MaxMind unit tests and modified.
- final String maxMindCityResponse = "{" + "\"city\":{" + "\"confidence\":76,"
- + "\"geoname_id\":9876," + "\"names\":{" + "\"en\":\"Minneapolis\""
- + "}" + "}," + "\"continent\":{" + "\"code\":\"NA\","
- + "\"geoname_id\":42," + "\"names\":{" + "\"en\":\"North America\""
- + "}" + "}," + "\"country\":{" + "\"confidence\":99,"
- + "\"iso_code\":\"US\"," + "\"geoname_id\":1," + "\"names\":{"
- + "\"en\":\"United States of America\"" + "}" + "},"
- + "\"location\":{" + "\"accuracy_radius\":1500,"
- + "\"metro_code\":765," + "\"time_zone\":\"America/Chicago\""
- + "}," + "\"postal\":{\"confidence\": 33, \"code\":\"55401\"},"
- + "\"registered_country\":{" + "\"geoname_id\":2,"
- + "\"iso_code\":\"CA\"," + "\"names\":{" + "\"en\":\"Canada\""
- + "}" + "}," + "\"represented_country\":{" + "\"geoname_id\":3,"
- + "\"iso_code\":\"GB\"," + "\"names\":{"
- + "\"en\":\"United Kingdom\"" + "}," + "\"type\":\"C<military>\""
- + "}," + "\"subdivisions\":[{" + "\"confidence\":88,"
- + "\"geoname_id\":574635," + "\"iso_code\":\"MN\"," + "\"names\":{"
- + "\"en\":\"Minnesota\"" + "}" + "}," + "{\"iso_code\":\"TT\"}],"
- + "\"traits\":{" + "\"autonomous_system_number\":1234,"
- + "\"autonomous_system_organization\":\"AS Organization\","
- + "\"domain\":\"example.com\"," + "\"ip_address\":\"1.2.3.4\","
- + "\"is_anonymous_proxy\":true,"
- + "\"is_satellite_provider\":true," + "\"isp\":\"Comcast\","
- + "\"organization\":\"Blorg\"," + "\"user_type\":\"college\""
- + "}," + "\"maxmind\":{\"queries_remaining\":11}" + "}";
+ final String maxMindCityResponse = JSON.std
+ .composeString()
+ .startObject()
+ .startObjectField("maxmind")
+ .put("queries_remaining", 11)
+ .end()
+ .startObjectField("registered_country")
+ .put("geoname_id", 2)
+ .startObjectField("names")
+ .put("en", "Canada")
+ .end()
+ .put("is_in_european_union", false)
+ .put("iso_code", "CA")
+ .end()
+ .startObjectField("traits")
+ .put("is_anonymous_proxy", true)
+ .put("autonomous_system_number", 1234)
+ .put("isp", "Comcast")
+ .put("ip_address", "1.2.3.4")
+ .put("is_satellite_provider", true)
+ .put("autonomous_system_organization", "AS Organization")
+ .put("organization", "Blorg")
+ .put("domain", "example.com")
+ // These are here just to simplify the testing. We expect the
+ // difference
+ .put("is_anonymous", false)
+ .put("is_anonymous_vpn", false)
+ .put("is_hosting_provider", false)
+ .put("is_legitimate_proxy", false)
+ .put("is_public_proxy", false)
+ .put("is_residential_proxy", false)
+ .put("is_tor_exit_node", false)
+ .put("network", "1.2.3.0/24")
+ .end()
+ .startObjectField("country")
+ .startObjectField("names")
+ .put("en", "United States of America")
+ .end()
+ .put("geoname_id", 1)
+ .put("is_in_european_union", false)
+ .put("iso_code", "US")
+ .end()
+ .startObjectField("continent")
+ .startObjectField("names")
+ .put("en", "North America")
+ .end()
+ .put("code", "NA")
+ .put("geoname_id", 42)
+ .end()
+ .startObjectField("location")
+ .put("time_zone", "America/Chicago")
+ .put("metro_code", 765)
+ .end()
+ .startArrayField("subdivisions")
+ .startObject()
+ .put("iso_code", "MN")
+ .put("geoname_id", 574635)
+ .startObjectField("names")
+ .put("en", "Minnesota")
+ .end()
+ .end()
+ .startObject()
+ .put("iso_code", "TT")
+ .end()
+ .end()
+ .startObjectField("represented_country")
+ .put("geoname_id", 3)
+ .startObjectField("names")
+ .put("en", "United Kingdom")
+ .end()
+ .put("type", "C<military>")
+ .put("is_in_european_union", true)
+ .put("iso_code", "GB")
+ .end()
+ .startObjectField("postal")
+ .put("code", "55401")
+ .end()
+ .startObjectField("city")
+ .put("geoname_id", 9876)
+ .startObjectField("names")
+ .put("en", "Minneapolis")
+ .end()
+ .end()
+ .end()
+ .finish();
InjectableValues inject = new InjectableValues.Std().addValue("locales", Collections.singletonList("en"));
ObjectMapper mapper = new ObjectMapper();
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
index f7a32559b3..ede5a39013 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIP.java
@@ -16,11 +16,11 @@
*/
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.CityResponse;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIPRecord.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIPRecord.java
index d80105a803..301fc9a4cd 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIPRecord.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestGeoEnrichIPRecord.java
@@ -17,6 +17,7 @@
package org.apache.nifi.processors;
+import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.CityResponse;
import org.apache.avro.Schema;
import org.apache.commons.io.IOUtils;
@@ -27,7 +28,6 @@ import org.apache.nifi.controller.ControllerService;
import org.apache.nifi.json.JsonRecordSetWriter;
import org.apache.nifi.json.JsonTreeReader;
import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.schema.access.SchemaAccessUtils;
import org.apache.nifi.serialization.RecordReaderFactory;
import org.apache.nifi.serialization.RecordSetWriterFactory;
@@ -37,9 +37,8 @@ import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.codehaus.jackson.map.ObjectMapper;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.InputStream;
import java.net.InetAddress;
@@ -50,13 +49,15 @@ import java.util.List;
import java.util.Map;
import static org.apache.nifi.processors.GeoEnrichTestUtils.getFullCityResponse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class TestGeoEnrichIPRecord {
private TestRunner runner;
private DatabaseReader reader;
- @Before
+ @BeforeEach
public void setup() throws Exception {
reader = mock(DatabaseReader.class);
final CityResponse cityResponse = getFullCityResponse();
@@ -90,7 +91,6 @@ public class TestGeoEnrichIPRecord {
runner.enableControllerService(writer);
runner.setProperty(GeoEnrichIPRecord.GEO_CITY, "/geo/city");
- runner.setProperty(GeoEnrichIPRecord.GEO_ACCURACY, "/geo/accuracy");
runner.setProperty(GeoEnrichIPRecord.GEO_COUNTRY, "/geo/country");
runner.setProperty(GeoEnrichIPRecord.GEO_COUNTRY_ISO, "/geo/country_iso");
runner.setProperty(GeoEnrichIPRecord.GEO_POSTAL_CODE, "/geo/country_postal");
@@ -131,20 +131,19 @@ public class TestGeoEnrichIPRecord {
ObjectMapper mapper = new ObjectMapper();
List<Map<String, Object>> result = (List<Map<String, Object>>)mapper.readValue(content, List.class);
- Assert.assertNotNull(result);
- Assert.assertEquals(1, result.size());
+ assertNotNull(result);
+ assertEquals(1, result.size());
Map<String, Object> element = result.get(0);
Map<String, Object> geo = (Map<String, Object>) element.get("geo");
- Assert.assertNotNull(geo);
- Assert.assertNotNull(geo.get("accuracy"));
- Assert.assertNotNull(geo.get("city"));
- Assert.assertNotNull(geo.get("country"));
- Assert.assertNotNull(geo.get("country_iso"));
- Assert.assertNotNull(geo.get("country_postal"));
- Assert.assertNotNull(geo.get("lat"));
- Assert.assertNotNull(geo.get("lon"));
+ assertNotNull(geo);
+ assertNotNull(geo.get("city"));
+ assertNotNull(geo.get("country"));
+ assertNotNull(geo.get("country_iso"));
+ assertNotNull(geo.get("country_postal"));
+ assertNotNull(geo.get("lat"));
+ assertNotNull(geo.get("lon"));
}
class TestableGeoEnrichIPRecord extends GeoEnrichIPRecord {
@@ -153,7 +152,7 @@ public class TestGeoEnrichIPRecord {
@Override
protected List<PropertyDescriptor> getSupportedPropertyDescriptors() {
return Collections.unmodifiableList(Arrays.asList(
- READER, WRITER, IP_RECORD_PATH, SPLIT_FOUND_NOT_FOUND, GEO_CITY, GEO_ACCURACY, GEO_LATITUDE, GEO_LONGITUDE, GEO_COUNTRY, GEO_COUNTRY_ISO, GEO_POSTAL_CODE
+ READER, WRITER, IP_RECORD_PATH, SPLIT_FOUND_NOT_FOUND, GEO_CITY, GEO_LATITUDE, GEO_LONGITUDE, GEO_COUNTRY, GEO_COUNTRY_ISO, GEO_POSTAL_CODE
));
}
@OnScheduled
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
index cf2ed045b7..e3eab7e0cf 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
+++ b/nifi-nar-bundles/nifi-enrich-bundle/nifi-enrich-processors/src/test/java/org/apache/nifi/processors/TestISPEnrichIP.java
@@ -19,11 +19,12 @@ package org.apache.nifi.processors;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.InjectableValues;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jr.ob.JSON;
+import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.IspResponse;
import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processors.maxmind.DatabaseReader;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -255,7 +256,7 @@ public class TestISPEnrichIP {
}
private IspResponse getIspResponse(final String ipAddress) throws Exception {
- final String maxMindIspResponse = "{\n" +
+ String maxMindIspResponse = "{\n" +
" \"isp\" : \"Apache NiFi - Test ISP\",\n" +
" \"organization\" : \"Apache NiFi - Test Organization\",\n" +
" \"autonomous_system_number\" : 1337,\n" +
@@ -263,6 +264,18 @@ public class TestISPEnrichIP {
" \"ip_address\" : \"" + ipAddress + "\"\n" +
" }\n";
+ maxMindIspResponse = JSON.std
+ .composeString()
+ .startObject()
+ .put("autonomous_system_number", 1337)
+ .put("autonomous_system_organization", "Apache NiFi - Test Chocolate")
+ .put("isp", "Apache NiFi - Test ISP")
+ .put("organization", "Apache NiFi - Test Organization")
+ .put("ip_address", "1.1.1.1")
+ .put("network", "1.1.1.0/24")
+ .end()
+ .finish();
+
InjectableValues inject = new InjectableValues.Std().addValue("locales", Collections.singletonList("en"));
ObjectMapper mapper = new ObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -273,12 +286,16 @@ public class TestISPEnrichIP {
}
private IspResponse getIspResponseWithoutASNDetail(final String ipAddress) throws Exception {
- final String maxMindIspResponse = "{\n" +
- " \"isp\" : \"Apache NiFi - Test ISP\",\n" +
- " \"organization\" : \"Apache NiFi - Test Organization\",\n" +
- " \"autonomous_system_number\" : null,\n" +
- " \"ip_address\" : \"" + ipAddress + "\"\n" +
- " }\n";
+ final String maxMindIspResponse = JSON.std
+ .composeString()
+ .startObject()
+ .put("autonomous_system_number", null)
+ .put("isp", "Apache NiFi - Test ISP")
+ .put("organization", "Apache NiFi - Test Organization")
+ .put("ip_address", ipAddress)
+ .put("network", "1.1.1.0/24")
+ .end()
+ .finish();
InjectableValues inject = new InjectableValues.Std().addValue("locales", Collections.singletonList("en"));
ObjectMapper mapper = new ObjectMapper();
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
index 142155f931..c6d2c4d1c8 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/pom.xml
@@ -75,7 +75,6 @@
<dependency>
<groupId>com.maxmind.geoip2</groupId>
<artifactId>geoip2</artifactId>
- <version>2.12.0</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/DatabaseReader.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/DatabaseReader.java
deleted file mode 100644
index 93fe31e3ca..0000000000
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/DatabaseReader.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.lookup.maxmind;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.List;
-
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.maxmind.db.Metadata;
-import com.maxmind.db.Reader;
-import com.maxmind.db.Reader.FileMode;
-import com.maxmind.geoip2.GeoIp2Provider;
-import com.maxmind.geoip2.exception.GeoIp2Exception;
-import com.maxmind.geoip2.model.AnonymousIpResponse;
-import com.maxmind.geoip2.model.CityResponse;
-import com.maxmind.geoip2.model.ConnectionTypeResponse;
-import com.maxmind.geoip2.model.CountryResponse;
-import com.maxmind.geoip2.model.DomainResponse;
-import com.maxmind.geoip2.model.IspResponse;
-import com.maxmind.geoip2.record.Traits;
-
-/**
- * <p>
- * This class was copied from https://raw.githubusercontent.com/maxmind/GeoIP2-java/master/src/main/java/com/maxmind/geoip2/DatabaseReader.java It is written by Maxmind and it is available under
- * Apache Software License V2
- *
- * The modification we're making to the code below is to stop using exceptions for mainline flow control. Specifically we don't want to throw an exception simply because an address was not found.
- * </p>
- *
- * Instances of this class provide a reader for the GeoIP2 database format. IP addresses can be looked up using the <code>get</code> method.
- */
-public class DatabaseReader implements GeoIp2Provider, Closeable {
-
- private final Reader reader;
- private final ObjectMapper om;
-
- private DatabaseReader(final Builder builder) throws IOException {
- if (builder.stream != null) {
- this.reader = new Reader(builder.stream);
- } else if (builder.database != null) {
- this.reader = new Reader(builder.database, builder.mode);
- } else {
- // This should never happen. If it does, review the Builder class
- // constructors for errors.
- throw new IllegalArgumentException("Unsupported Builder configuration: expected either File or URL");
- }
-
- this.om = new ObjectMapper();
- this.om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
- this.om.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
- InjectableValues inject = new InjectableValues.Std().addValue("locales", builder.locales);
- this.om.setInjectableValues(inject);
- }
-
- /**
- * <p>
- * Constructs a Builder for the DatabaseReader. The file passed to it must be a valid GeoIP2 database file.
- * </p>
- * <p>
- * <code>Builder</code> creates instances of <code>DatabaseReader</code> from values set by the methods.
- * </p>
- * <p>
- * Only the values set in the <code>Builder</code> constructor are required.
- * </p>
- */
- public final static class Builder {
-
- final File database;
- final InputStream stream;
-
- List<String> locales = Collections.singletonList("en");
- FileMode mode = FileMode.MEMORY_MAPPED;
-
- /**
- * @param stream the stream containing the GeoIP2 database to use.
- */
- public Builder(InputStream stream) {
- this.stream = stream;
- this.database = null;
- }
-
- /**
- * @param database the GeoIP2 database file to use.
- */
- public Builder(File database) {
- this.database = database;
- this.stream = null;
- }
-
- /**
- * @param val List of locale codes to use in name property from most preferred to least preferred.
- * @return Builder object
- */
- public Builder locales(List<String> val) {
- this.locales = val;
- return this;
- }
-
- /**
- * @param val The file mode used to open the GeoIP2 database
- * @return Builder object
- * @throws java.lang.IllegalArgumentException if you initialized the Builder with a URL, which uses {@link FileMode#MEMORY}, but you provided a different FileMode to this method.
- */
- public Builder fileMode(FileMode val) {
- if (this.stream != null && !FileMode.MEMORY.equals(val)) {
- throw new IllegalArgumentException("Only FileMode.MEMORY is supported when using an InputStream.");
- }
-
- this.mode = val;
- return this;
- }
-
- /**
- * @return an instance of <code>DatabaseReader</code> created from the fields set on this builder.
- * @throws IOException if there is an error reading the database
- */
- public DatabaseReader build() throws IOException {
- return new DatabaseReader(this);
- }
- }
-
- /**
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return An object of type T with the data for the IP address or null if no information could be found for the given IP address
- * @throws IOException if there is an error opening or reading from the file.
- */
- private <T> T get(InetAddress ipAddress, Class<T> cls, boolean hasTraits, String type) throws IOException {
- ObjectNode node = (ObjectNode) this.reader.get(ipAddress);
- if (node == null) {
- return null;
- }
-
- InjectableValues inject = new JsonInjector(ipAddress.getHostAddress());
- return this.om.reader(inject).treeToValue(node, cls);
- }
-
- /**
- * <p>
- * Closes the database.
- * </p>
- * <p>
- * If you are using <code>FileMode.MEMORY_MAPPED</code>, this will
- * <em>not</em> unmap the underlying file due to a limitation in Java's <code>MappedByteBuffer</code>. It will however set the reference to the buffer to <code>null</code>, allowing the garbage
- * collector to collect it.
- * </p>
- *
- * @throws IOException if an I/O error occurs.
- */
- @Override
- public void close() throws IOException {
- this.reader.close();
- }
-
- @Override
- public CountryResponse country(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, CountryResponse.class, true, "Country");
- }
-
- @Override
- public CityResponse city(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, CityResponse.class, true, "City");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Anonymous IP.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a AnonymousIpResponse for the requested IP address.
- * @throws IOException if there is an IO error
- */
- public AnonymousIpResponse anonymousIp(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, AnonymousIpResponse.class, false, "GeoIP2-Anonymous-IP");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Connection Type database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a ConnectTypeResponse for the requested IP address.
- * @throws GeoIp2Exception if there is an error looking up the IP
- * @throws IOException if there is an IO error
- */
- public ConnectionTypeResponse connectionType(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, ConnectionTypeResponse.class, false,
- "GeoIP2-Connection-Type");
- }
-
- /**
- * Look up an IP address in a GeoIP2 Domain database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return a DomainResponse for the requested IP address.
- * @throws GeoIp2Exception if there is an error looking up the IP
- * @throws IOException if there is an IO error
- */
- public DomainResponse domain(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, DomainResponse.class, false, "GeoIP2-Domain");
- }
-
- /**
- * Look up an IP address in a GeoIP2 ISP database.
- *
- * @param ipAddress IPv4 or IPv6 address to lookup.
- * @return an IspResponse for the requested IP address.
- * @throws GeoIp2Exception if there is an error looking up the IP
- * @throws IOException if there is an IO error
- */
- public IspResponse isp(InetAddress ipAddress) throws IOException {
- return this.get(ipAddress, IspResponse.class, false, "GeoIP2-ISP");
- }
-
- /**
- * @return the metadata for the open MaxMind DB file.
- */
- public Metadata getMetadata() {
- return this.reader.getMetadata();
- }
-
- private class JsonInjector extends InjectableValues {
- private final String ip;
-
- JsonInjector(final String ip) {
- this.ip = ip;
- }
-
- @Override
- public Object findInjectableValue(final Object valueId, final DeserializationContext ctxt, final BeanProperty forProperty, final Object beanInstance) throws JsonMappingException {
- if ("ip_address".equals(valueId)) {
- return ip;
- } else if ("traits".equals(valueId)) {
- return new Traits(ip);
- }
-
- return null;
- }
- }
-}
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
index 819b90f3ec..bd93a1e7ee 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-lookup-services-bundle/nifi-lookup-services/src/main/java/org/apache/nifi/lookup/maxmind/IPLookupService.java
@@ -18,6 +18,7 @@
package org.apache.nifi.lookup.maxmind;
import com.maxmind.db.InvalidDatabaseException;
+import com.maxmind.geoip2.DatabaseReader;
import com.maxmind.geoip2.model.AnonymousIpResponse;
import com.maxmind.geoip2.model.CityResponse;
import com.maxmind.geoip2.model.ConnectionTypeResponse;
diff --git a/nifi-nar-bundles/pom.xml b/nifi-nar-bundles/pom.xml
index 3fde78c74e..36ddd76152 100755
--- a/nifi-nar-bundles/pom.xml
+++ b/nifi-nar-bundles/pom.xml
@@ -358,6 +358,12 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>com.maxmind.geoip2</groupId>
+ <artifactId>geoip2</artifactId>
+ <version>2.16.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
[nifi] 03/31: NIFI-1468 Added tests to handle invalid cipher streams missing Salt/IV
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 0d3ad93120734f87cd319cb5f2882b68bbe62583
Author: Emilio Setiadarma <em...@gmail.com>
AuthorDate: Wed Mar 16 10:48:57 2022 -0700
NIFI-1468 Added tests to handle invalid cipher streams missing Salt/IV
- Updated PasswordBasedEncryptorGroovyTest and KeyedEncryptorGroovyTest
This closes #5877
Signed-off-by: David Handermann <ex...@apache.org>
---
.../util/crypto/KeyedEncryptorGroovyTest.groovy | 89 +++++++--
.../crypto/PasswordBasedEncryptorGroovyTest.groovy | 213 ++++++++++++++++++++-
2 files changed, 280 insertions(+), 22 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
index a3931eb5c6..1b6110bcf1 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
@@ -20,11 +20,11 @@ import org.apache.commons.codec.binary.Hex
import org.apache.nifi.processor.io.StreamCallback
import org.apache.nifi.security.util.EncryptionMethod
import org.apache.nifi.security.util.KeyDerivationFunction
+import org.apache.nifi.stream.io.exception.BytePatternNotFoundException
import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.junit.After
-import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
+import org.junit.Assert
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@@ -37,8 +37,6 @@ class KeyedEncryptorGroovyTest {
private static final Logger logger = LoggerFactory.getLogger(KeyedEncryptorGroovyTest.class)
private static final String TEST_RESOURCES_PREFIX = "src/test/resources/TestEncryptContent/"
- private static final File plainFile = new File("${TEST_RESOURCES_PREFIX}/plain.txt")
- private static final File encryptedFile = new File("${TEST_RESOURCES_PREFIX}/unsalted_128_raw.asc")
private static final String KEY_HEX = "0123456789ABCDEFFEDCBA9876543210"
private static final SecretKey KEY = new SecretKeySpec(Hex.decodeHex(KEY_HEX as char[]), "AES")
@@ -52,14 +50,6 @@ class KeyedEncryptorGroovyTest {
}
}
- @Before
- void setUp() throws Exception {
- }
-
- @After
- void tearDown() throws Exception {
- }
-
@Test
void testShouldEncryptAndDecrypt() throws Exception {
// Arrange
@@ -191,4 +181,79 @@ class KeyedEncryptorGroovyTest {
[l.first(), Integer.valueOf(l.last())]
}
}
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingIV() {
+ // Arrange
+ KeyedCipherProvider cipherProvider = CipherProviderFactory.getCipherProvider(KeyDerivationFunction.NONE)
+ final String IV_DELIMITER = new String(cipherProvider.IV_DELIMITER, StandardCharsets.UTF_8)
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
+
+ // Act
+ KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, KEY)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+
+ // Remove IV
+ final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
+ final byte[] removedIVCipherBytes = cipherString.split(IV_DELIMITER)[1].getBytes(StandardCharsets.UTF_8)
+
+ InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherBytes)
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ assert exception.getCause() instanceof BytePatternNotFoundException
+ }
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingIVDelimiter() {
+ // Arrange
+ KeyedCipherProvider cipherProvider = CipherProviderFactory.getCipherProvider(KeyDerivationFunction.NONE)
+ final String IV_DELIMITER = new String(cipherProvider.IV_DELIMITER, StandardCharsets.UTF_8)
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
+
+ // Act
+ KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, KEY)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+
+ // Remove IV Delimiter
+ final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
+ final byte[] removedIVDelimiterCipherBytes = cipherString.split(IV_DELIMITER)[1].getBytes(StandardCharsets.UTF_8)
+
+ InputStream cipherInputStream = new ByteArrayInputStream(removedIVDelimiterCipherBytes)
+
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ assert exception.getCause() instanceof BytePatternNotFoundException
+ }
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
index 238fba3917..96c7435221 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
@@ -23,12 +23,12 @@ import org.apache.nifi.security.util.EncryptionMethod
import org.apache.nifi.security.util.KeyDerivationFunction
import org.apache.nifi.stream.io.ByteCountingInputStream
import org.apache.nifi.stream.io.ByteCountingOutputStream
+import org.apache.nifi.stream.io.exception.BytePatternNotFoundException
import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.junit.After
import org.junit.Assume
-import org.junit.Before
import org.junit.BeforeClass
import org.junit.Test
+import org.junit.Assert
import org.slf4j.Logger
import org.slf4j.LoggerFactory
@@ -56,14 +56,6 @@ class PasswordBasedEncryptorGroovyTest {
}
}
- @Before
- void setUp() throws Exception {
- }
-
- @After
- void tearDown() throws Exception {
- }
-
@Test
void testShouldEncryptAndDecrypt() throws Exception {
// Arrange
@@ -516,4 +508,205 @@ class PasswordBasedEncryptorGroovyTest {
assert encryptor.flowfileAttributes.get("encryptcontent.kdf_salt") == EXPECTED_KDF_SALT
assert (29..54)*.toString().contains(encryptor.flowfileAttributes.get("encryptcontent.kdf_salt_length"))
}
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingSalt() throws Exception {
+ // Arrange
+ final int OPENSSL_EVP_HEADER_SIZE = 8
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ def encryptionMethodsAndKdfs = [
+ (KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY): EncryptionMethod.MD5_128AES,
+ (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
+ ]
+
+ // Act
+ encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
+ PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+
+ // reads the salt
+ InputStream saltInputStream = new ByteArrayInputStream(cipherBytes)
+ final byte[] saltBytes = cipherProvider.readSalt(saltInputStream)
+
+ int skipLength = saltBytes.length
+ if (cipherProvider instanceof org.apache.nifi.security.util.crypto.OpenSSLPKCS5CipherProvider) {
+ skipLength += OPENSSL_EVP_HEADER_SIZE
+ }
+
+ InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
+ cipherInputStream.skip(skipLength)
+
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ if (!(cipherProvider instanceof OpenSSLPKCS5CipherProvider)) {
+ assert exception.getCause() instanceof IllegalArgumentException
+ }
+
+ // This is necessary to run multiple iterations
+ plainStream.reset()
+ }
+ }
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingSaltDelimiter() throws Exception {
+ // Arrange
+ final String SALT_DELIMITER = "NiFiSALT"
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ def encryptionMethodsAndKdfs = [
+ (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
+ ]
+
+ // Act
+ encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
+ PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+ final String removedDelimiterCipherString = new String(cipherBytes, StandardCharsets.UTF_8).replace(SALT_DELIMITER, "")
+
+ InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
+
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ assert exception.getCause() instanceof BytePatternNotFoundException
+
+ // This is necessary to run multiple iterations
+ plainStream.reset()
+ }
+ }
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingIV() throws Exception {
+ // Arrange
+ final String SALT_DELIMITER="NiFiSALT"
+ final String IV_DELIMITER = "NiFiIV"
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ def encryptionMethodsAndKdfs = [
+ (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
+ ]
+
+ // Act
+ encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
+ PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+
+ // remove IV in cipher
+ final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
+ final StringBuilder sb = new StringBuilder()
+ sb.append(cipherString.split(SALT_DELIMITER)[0])
+ sb.append(SALT_DELIMITER)
+ sb.append(IV_DELIMITER)
+ sb.append(cipherString.split(IV_DELIMITER)[1])
+ final String removedIVCipherString = sb.toString()
+
+ InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherString.getBytes(StandardCharsets.UTF_8))
+
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ assert exception.getCause() instanceof IllegalArgumentException
+
+ // This is necessary to run multiple iterations
+ plainStream.reset()
+ }
+ }
+
+ @Test
+ void testDecryptShouldHandleCipherStreamMissingIVDelimiter() throws Exception {
+ // Arrange
+ final String IV_DELIMITER = "NiFiIV"
+
+ final String PLAINTEXT = "This is a plaintext message."
+ InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
+
+ def encryptionMethodsAndKdfs = [
+ (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
+ (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
+ ]
+
+ // Act
+ encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
+ PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
+
+ OutputStream cipherStream = new ByteArrayOutputStream()
+ OutputStream recoveredStream = new ByteArrayOutputStream()
+
+ PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
+
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
+ StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
+
+ encryptionCallback.process(plainStream, cipherStream)
+
+ final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
+ final String removedDelimiterCipherString = new String(cipherBytes, StandardCharsets.UTF_8).replace(IV_DELIMITER, "")
+
+ InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
+
+ Exception exception = Assert.assertThrows(Exception.class, () -> {
+ decryptionCallback.process(cipherInputStream, recoveredStream)
+ })
+
+ // Assert
+ assert exception.getCause() instanceof BytePatternNotFoundException
+
+ // This is necessary to run multiple iterations
+ plainStream.reset()
+ }
+ }
}
\ No newline at end of file
[nifi] 29/31: NIFI-9858 Refactored nifi-system-test-suite using generated certificates
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit decf86840f2ac1ccf5f1181b200763e6bfe5fba3
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Thu Mar 31 19:06:23 2022 -0500
NIFI-9858 Refactored nifi-system-test-suite using generated certificates
- Added NiFiSystemKeyStoreProvider for configuration of Key Pair and self-signed Certificate
- Updated standalone and clustered instance configuration properties
- Removed expiring keystore.jks and truststore.jks
This closes #5922
Signed-off-by: Paul Grey <gr...@apache.org>
---
.../tests/system/NiFiSystemKeyStoreProvider.java | 143 +++++++++++++++++++++
.../SpawnedStandaloneNiFiInstanceFactory.java | 13 +-
.../resources/conf/clustered/node1/nifi.properties | 14 +-
.../resources/conf/clustered/node2/nifi.properties | 14 +-
.../test/resources/conf/default/nifi.properties | 14 +-
.../src/test/resources/keystore.jks | Bin 3095 -> 0 bytes
.../src/test/resources/truststore.jks | Bin 911 -> 0 bytes
7 files changed, 166 insertions(+), 32 deletions(-)
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemKeyStoreProvider.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemKeyStoreProvider.java
new file mode 100644
index 0000000000..2a80103c80
--- /dev/null
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemKeyStoreProvider.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.tests.system;
+
+import org.apache.nifi.security.util.CertificateUtils;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+
+/**
+ * System Key Store Provider generates a Key Pair and Certificate for KeyStore and TrustStore files
+ */
+public class NiFiSystemKeyStoreProvider {
+ private static final String HOSTNAME = "localhost";
+
+ private static final String[] DNS_NAMES = new String[]{HOSTNAME};
+
+ private static final String DISTINGUISHED_NAME = String.format("CN=%s", HOSTNAME);
+
+ private static final String PASSWORD = NiFiSystemKeyStoreProvider.class.getSimpleName();
+
+ private static final int VALID_DURATION_DAYS = 1;
+
+ private static final String KEY_ALGORITHM = "RSA";
+
+ private static final int KEY_SIZE = 4096;
+
+ private static final String SIGNING_ALGORITHM = "SHA256withRSA";
+
+ private static final String KEYSTORE_FILE = "keystore.p12";
+
+ private static final String TRUSTSTORE_FILE = "truststore.p12";
+
+ private static final String KEYSTORE_TYPE = "PKCS12";
+
+ private static Path persistentKeyStorePath;
+
+ private static Path persistentTrustStorePath;
+
+ /**
+ * Configure KeyStores in provided directory and reuse existing files after initial generation
+ *
+ * @param keyStoreDirectory Directory where KeyStore and TrustStore should be stored
+ */
+ public synchronized static void configureKeyStores(final File keyStoreDirectory) {
+ if (persistentKeyStorePath == null) {
+ createKeyStores();
+ }
+
+ if (persistentKeyStorePath == null) {
+ throw new IllegalStateException("KeyStore not provisioned");
+ }
+ if (persistentTrustStorePath == null) {
+ throw new IllegalStateException("TrustStore not provisioned");
+ }
+
+ try {
+ Files.copy(persistentKeyStorePath, Paths.get(keyStoreDirectory.getAbsolutePath(), KEYSTORE_FILE));
+ Files.copy(persistentTrustStorePath, Paths.get(keyStoreDirectory.getAbsolutePath(), TRUSTSTORE_FILE));
+ } catch (final IOException e) {
+ throw new UncheckedIOException("KeyStore configuration failed", e);
+ }
+ }
+
+ private static void createKeyStores() {
+ try {
+ final KeyPair keyPair = getKeyPair();
+ final X509Certificate certificate = CertificateUtils.generateSelfSignedX509Certificate(
+ keyPair,
+ DISTINGUISHED_NAME,
+ SIGNING_ALGORITHM,
+ VALID_DURATION_DAYS,
+ DNS_NAMES
+ );
+
+ persistentTrustStorePath = writeTrustStore(certificate);
+ persistentTrustStorePath.toFile().deleteOnExit();
+
+ persistentKeyStorePath = writeKeyStore(certificate, keyPair.getPrivate());
+ persistentKeyStorePath.toFile().deleteOnExit();
+ } catch (final Exception e) {
+ throw new RuntimeException("KeyStore Creation Failed", e);
+ }
+ }
+
+ private static Path writeKeyStore(final X509Certificate certificate, final PrivateKey privateKey) throws Exception {
+ final KeyStore keyStore = KeyStore.getInstance(KEYSTORE_TYPE);
+ keyStore.load(null);
+
+ final X509Certificate[] certificates = new X509Certificate[]{certificate};
+ keyStore.setKeyEntry(HOSTNAME, privateKey, PASSWORD.toCharArray(), certificates);
+
+ final Path keyStorePath = Files.createTempFile(KEYSTORE_FILE, KEYSTORE_TYPE);
+ try (final OutputStream outputStream = new FileOutputStream(keyStorePath.toFile())) {
+ keyStore.store(outputStream, PASSWORD.toCharArray());
+ }
+ return keyStorePath;
+ }
+
+ private static Path writeTrustStore(final X509Certificate certificate) throws Exception {
+ final KeyStore trustStore = KeyStore.getInstance(KEYSTORE_TYPE);
+ trustStore.load(null);
+ trustStore.setCertificateEntry(HOSTNAME, certificate);
+
+ final Path trustStorePath = Files.createTempFile(TRUSTSTORE_FILE, KEYSTORE_TYPE);
+ try (final OutputStream outputStream = new FileOutputStream(trustStorePath.toFile())) {
+ trustStore.store(outputStream, PASSWORD.toCharArray());
+ }
+ return trustStorePath;
+ }
+
+ private static KeyPair getKeyPair() throws NoSuchAlgorithmException {
+ final KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(KEY_ALGORITHM);
+ keyPairGenerator.initialize(KEY_SIZE);
+ return keyPairGenerator.generateKeyPair();
+ }
+}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
index f14e4d325a..6bb1ee4a6a 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
@@ -33,7 +33,6 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.Collections;
import java.util.Map;
import java.util.Properties;
@@ -127,14 +126,7 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
if (!destinationCertsDir.exists()) {
assertTrue(destinationCertsDir.mkdirs());
}
-
- // Copy keystore
- final File destinationKeystore = new File(destinationCertsDir, "keystore.jks");
- Files.copy(Paths.get("src/test/resources/keystore.jks"), destinationKeystore.toPath());
-
- // Copy truststore
- final File destinationTruststore = new File(destinationCertsDir, "truststore.jks");
- Files.copy(Paths.get("src/test/resources/truststore.jks"), destinationTruststore.toPath());
+ NiFiSystemKeyStoreProvider.configureKeyStores(destinationCertsDir);
final File flowXmlGz = instanceConfiguration.getFlowXmlGz();
if (flowXmlGz != null) {
@@ -203,9 +195,8 @@ public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory
try {
Thread.sleep(1000L);
} catch (InterruptedException ex) {
+ logger.debug("NiFi Startup sleep interrupted", ex);
}
-
- continue;
}
}
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
index 7066fba407..071f863a0f 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node1/nifi.properties
@@ -146,13 +146,13 @@ nifi.sensitive.props.key.protected=
nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL
nifi.sensitive.props.additional.keys=
-nifi.security.keystore=certs/keystore.jks
-nifi.security.keystoreType=JKS
-nifi.security.keystorePasswd=passwordpassword
-nifi.security.keyPasswd=
-nifi.security.truststore=certs/truststore.jks
-nifi.security.truststoreType=JKS
-nifi.security.truststorePasswd=passwordpassword
+nifi.security.keystore=certs/keystore.p12
+nifi.security.keystoreType=PKCS12
+nifi.security.keystorePasswd=NiFiSystemKeyStoreProvider
+nifi.security.keyPasswd=NiFiSystemKeyStoreProvider
+nifi.security.truststore=certs/truststore.p12
+nifi.security.truststoreType=PKCS12
+nifi.security.truststorePasswd=NiFiSystemKeyStoreProvider
nifi.security.user.authorizer=managed-authorizer
nifi.security.user.login.identity.provider=
nifi.security.ocsp.responder.url=
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
index 2d6f7510ea..4420403e9c 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/clustered/node2/nifi.properties
@@ -146,13 +146,13 @@ nifi.sensitive.props.key.protected=
nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL
nifi.sensitive.props.additional.keys=
-nifi.security.keystore=certs/keystore.jks
-nifi.security.keystoreType=JKS
-nifi.security.keystorePasswd=passwordpassword
-nifi.security.keyPasswd=
-nifi.security.truststore=certs/truststore.jks
-nifi.security.truststoreType=JKS
-nifi.security.truststorePasswd=passwordpassword
+nifi.security.keystore=certs/keystore.p12
+nifi.security.keystoreType=PKCS12
+nifi.security.keystorePasswd=NiFiSystemKeyStoreProvider
+nifi.security.keyPasswd=NiFiSystemKeyStoreProvider
+nifi.security.truststore=certs/truststore.p12
+nifi.security.truststoreType=PKCS12
+nifi.security.truststorePasswd=NiFiSystemKeyStoreProvider
nifi.security.user.authorizer=managed-authorizer
nifi.security.user.login.identity.provider=
nifi.security.ocsp.responder.url=
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
index e9c00352eb..27ad177583 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/resources/conf/default/nifi.properties
@@ -147,13 +147,13 @@ nifi.sensitive.props.key.protected=
nifi.sensitive.props.algorithm=PBEWITHMD5AND256BITAES-CBC-OPENSSL
nifi.sensitive.props.additional.keys=
-nifi.security.keystore=certs/keystore.jks
-nifi.security.keystoreType=JKS
-nifi.security.keystorePasswd=passwordpassword
-nifi.security.keyPasswd=
-nifi.security.truststore=certs/truststore.jks
-nifi.security.truststoreType=JKS
-nifi.security.truststorePasswd=passwordpassword
+nifi.security.keystore=certs/keystore.p12
+nifi.security.keystoreType=PKCS12
+nifi.security.keystorePasswd=NiFiSystemKeyStoreProvider
+nifi.security.keyPasswd=NiFiSystemKeyStoreProvider
+nifi.security.truststore=certs/truststore.p12
+nifi.security.truststoreType=PKCS12
+nifi.security.truststorePasswd=NiFiSystemKeyStoreProvider
nifi.security.user.authorizer=managed-authorizer
nifi.security.user.login.identity.provider=
nifi.security.ocsp.responder.url=
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/keystore.jks b/nifi-system-tests/nifi-system-test-suite/src/test/resources/keystore.jks
deleted file mode 100644
index 34a197f365..0000000000
Binary files a/nifi-system-tests/nifi-system-test-suite/src/test/resources/keystore.jks and /dev/null differ
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/resources/truststore.jks b/nifi-system-tests/nifi-system-test-suite/src/test/resources/truststore.jks
deleted file mode 100644
index 4bc1b2050b..0000000000
Binary files a/nifi-system-tests/nifi-system-test-suite/src/test/resources/truststore.jks and /dev/null differ
[nifi] 20/31: NIFI-9820 Reduced Kudu Client Worker Count default setting
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit daafd08aaebb3c4fcf149e25999d869b9fe94d3c
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Mar 21 09:54:35 2022 -0500
NIFI-9820 Reduced Kudu Client Worker Count default setting
- Changed default Kudu Client Worker Count to number of runtime-reported available processors
Signed-off-by: Joe Gresock <jg...@gmail.com>
This closes #5886.
---
.../java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
index 1bccf969c0..6abb407619 100644
--- a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
+++ b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
@@ -142,11 +142,11 @@ public abstract class AbstractKuduProcessor extends AbstractProcessor {
.expressionLanguageSupported(ExpressionLanguageScope.VARIABLE_REGISTRY)
.build();
- private static final int DEFAULT_WORKER_COUNT = 2 * Runtime.getRuntime().availableProcessors();
+ private static final int DEFAULT_WORKER_COUNT = Runtime.getRuntime().availableProcessors();
static final PropertyDescriptor WORKER_COUNT = new Builder()
.name("worker-count")
.displayName("Kudu Client Worker Count")
- .description("The maximum number of worker threads handling Kudu client read and write operations. Defaults to the number of available processors multiplied by 2.")
+ .description("The maximum number of worker threads handling Kudu client read and write operations. Defaults to the number of available processors.")
.required(true)
.defaultValue(Integer.toString(DEFAULT_WORKER_COUNT))
.addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
[nifi] 12/31: NIFI-9838: Added Client Certificate attributes to ListenTCPRecord FlowFiles
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e40b14e37ff04e7f2f947f78a57fc50184379406
Author: Peter Gyori <pe...@gmail.com>
AuthorDate: Fri Mar 25 18:36:43 2022 +0100
NIFI-9838: Added Client Certificate attributes to ListenTCPRecord FlowFiles
This closes #5908
Signed-off-by: David Handermann <ex...@apache.org>
---
.../listen/SSLSocketChannelRecordReader.java | 10 ++++-
.../SocketChannelRecordReaderDispatcher.java | 2 +-
.../nifi/processors/standard/ListenTCPRecord.java | 43 ++++++++++++++++++++--
.../processors/standard/TestListenTCPRecord.java | 15 ++++++++
4 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SSLSocketChannelRecordReader.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SSLSocketChannelRecordReader.java
index f393419e33..39710a00b7 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SSLSocketChannelRecordReader.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SSLSocketChannelRecordReader.java
@@ -24,6 +24,8 @@ import org.apache.nifi.serialization.MalformedRecordException;
import org.apache.nifi.serialization.RecordReader;
import org.apache.nifi.serialization.RecordReaderFactory;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLSession;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -40,17 +42,20 @@ public class SSLSocketChannelRecordReader implements SocketChannelRecordReader {
private final SSLSocketChannel sslSocketChannel;
private final RecordReaderFactory readerFactory;
private final SocketChannelRecordReaderDispatcher dispatcher;
+ private final SSLEngine sslEngine;
private RecordReader recordReader;
public SSLSocketChannelRecordReader(final SocketChannel socketChannel,
final SSLSocketChannel sslSocketChannel,
final RecordReaderFactory readerFactory,
- final SocketChannelRecordReaderDispatcher dispatcher) {
+ final SocketChannelRecordReaderDispatcher dispatcher,
+ final SSLEngine sslEngine) {
this.socketChannel = socketChannel;
this.sslSocketChannel = sslSocketChannel;
this.readerFactory = readerFactory;
this.dispatcher = dispatcher;
+ this.sslEngine = sslEngine;
}
@Override
@@ -87,4 +92,7 @@ public class SSLSocketChannelRecordReader implements SocketChannelRecordReader {
dispatcher.connectionCompleted();
}
+ public SSLSession getSession() {
+ return sslEngine.getSession();
+ }
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SocketChannelRecordReaderDispatcher.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SocketChannelRecordReaderDispatcher.java
index 2c7c93a433..48459ce3d3 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SocketChannelRecordReaderDispatcher.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/src/main/java/org/apache/nifi/record/listen/SocketChannelRecordReaderDispatcher.java
@@ -119,7 +119,7 @@ public class SocketChannelRecordReaderDispatcher implements Runnable, Closeable
}
final SSLSocketChannel sslSocketChannel = new SSLSocketChannel(sslEngine, socketChannel);
- socketChannelRecordReader = new SSLSocketChannelRecordReader(socketChannel, sslSocketChannel, readerFactory, this);
+ socketChannelRecordReader = new SSLSocketChannelRecordReader(socketChannel, sslSocketChannel, readerFactory, this, sslEngine);
}
// queue the SocketChannelRecordReader for processing by the processor
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCPRecord.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCPRecord.java
index acc936a5a9..bb7a2bfb24 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCPRecord.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenTCPRecord.java
@@ -25,6 +25,8 @@ import java.net.InetSocketAddress;
import java.net.NetworkInterface;
import java.net.SocketTimeoutException;
import java.nio.channels.ServerSocketChannel;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -37,6 +39,9 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -62,6 +67,7 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processor.util.listen.ListenerProperties;
+import org.apache.nifi.record.listen.SSLSocketChannelRecordReader;
import org.apache.nifi.record.listen.SocketChannelRecordReader;
import org.apache.nifi.record.listen.SocketChannelRecordReaderDispatcher;
import org.apache.nifi.security.util.ClientAuth;
@@ -87,14 +93,26 @@ import org.apache.nifi.ssl.SSLContextService;
"If the read times out, or if any other error is encountered when reading, the connection will be closed, and any records " +
"read up to that point will be handled according to the configured Read Error Strategy (Discard or Transfer). In cases where " +
"clients are keeping a connection open, the concurrent tasks for the processor should be adjusted to match the Max Number of " +
- "TCP Connections allowed, so that there is a task processing each connection.")
+ "TCP Connections allowed, so that there is a task processing each connection. " +
+ "The processor can be configured to use an SSL Context Service to only allow secure connections. " +
+ "When connected clients present certificates for mutual TLS authentication, the Distinguished Names of the client certificate's " +
+ "issuer and subject are added to the outgoing FlowFiles as attributes. " +
+ "The processor does not perform authorization based on Distinguished Name values, but since these values " +
+ "are attached to the outgoing FlowFiles, authorization can be implemented based on these attributes.")
@WritesAttributes({
@WritesAttribute(attribute="tcp.sender", description="The host that sent the data."),
@WritesAttribute(attribute="tcp.port", description="The port that the processor accepted the connection on."),
@WritesAttribute(attribute="record.count", description="The number of records written to the flow file."),
- @WritesAttribute(attribute="mime.type", description="The mime-type of the writer used to write the records to the flow file.")
+ @WritesAttribute(attribute="mime.type", description="The mime-type of the writer used to write the records to the flow file."),
+ @WritesAttribute(attribute="client.certificate.issuer.dn", description="For connections using mutual TLS, the Distinguished Name of the " +
+ "Certificate Authority that issued the client's certificate " +
+ "is attached to the FlowFile."),
+ @WritesAttribute(attribute="client.certificate.subject.dn", description="For connections using mutual TLS, the Distinguished Name of the " +
+ "client certificate's owner (subject) is attached to the FlowFile.")
})
public class ListenTCPRecord extends AbstractProcessor {
+ private static final String CLIENT_CERTIFICATE_SUBJECT_DN_ATTRIBUTE = "client.certificate.subject.dn";
+ private static final String CLIENT_CERTIFICATE_ISSUER_DN_ATTRIBUTE = "client.certificate.issuer.dn";
static final PropertyDescriptor PORT = new PropertyDescriptor.Builder()
.name("port")
@@ -199,7 +217,6 @@ public class ListenTCPRecord extends AbstractProcessor {
.description("Messages received successfully will be sent out this relationship.")
.build();
-
static final List<PropertyDescriptor> PROPERTIES;
static {
final List<PropertyDescriptor> props = new ArrayList<>();
@@ -427,6 +444,7 @@ public class ListenTCPRecord extends AbstractProcessor {
attributes.put("tcp.sender", sender);
attributes.put("tcp.port", String.valueOf(port));
attributes.put("record.count", String.valueOf(writeResult.getRecordCount()));
+ addClientCertificateAttributes(attributes, socketRecordReader);
flowFile = session.putAllAttributes(flowFile, attributes);
final String senderHost = sender.startsWith("/") && sender.length() > 1 ? sender.substring(1) : sender;
@@ -460,4 +478,23 @@ public class ListenTCPRecord extends AbstractProcessor {
private String getRemoteAddress(final SocketChannelRecordReader socketChannelRecordReader) {
return socketChannelRecordReader.getRemoteAddress() == null ? "null" : socketChannelRecordReader.getRemoteAddress().toString();
}
+
+ private void addClientCertificateAttributes(final Map<String, String> attributes, final SocketChannelRecordReader socketRecordReader)
+ throws SSLPeerUnverifiedException {
+ if (socketRecordReader instanceof SSLSocketChannelRecordReader) {
+ SSLSocketChannelRecordReader sslSocketRecordReader = (SSLSocketChannelRecordReader) socketRecordReader;
+ SSLSession sslSession = sslSocketRecordReader.getSession();
+ try {
+ Certificate[] certificates = sslSession.getPeerCertificates();
+ if (certificates.length > 0) {
+ X509Certificate certificate = (X509Certificate) certificates[0];
+ attributes.put(CLIENT_CERTIFICATE_SUBJECT_DN_ATTRIBUTE, certificate.getSubjectDN().toString());
+ attributes.put(CLIENT_CERTIFICATE_ISSUER_DN_ATTRIBUTE, certificate.getIssuerDN().toString());
+ }
+ } catch (SSLPeerUnverifiedException peerUnverifiedException) {
+ getLogger().debug("Remote Peer [{}] not verified: client certificates not provided",
+ socketRecordReader.getRemoteAddress(), peerUnverifiedException);
+ }
+ }
+ }
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenTCPRecord.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenTCPRecord.java
index 325b951014..731902d936 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenTCPRecord.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListenTCPRecord.java
@@ -172,6 +172,21 @@ public class TestListenTCPRecord {
Assert.assertTrue(content.contains("This is a test " + 3));
}
+ @Test(timeout = TEST_TIMEOUT)
+ public void testRunSSLClientDNsAddedAsAttributes() throws InitializationException, IOException, InterruptedException {
+ runner.setProperty(ListenTCPRecord.CLIENT_AUTH, ClientAuth.REQUIRED.name());
+ enableSslContextService(keyStoreSslContext);
+
+ run(1, keyStoreSslContext);
+
+ final List<MockFlowFile> mockFlowFiles = runner.getFlowFilesForRelationship(ListenTCPRecord.REL_SUCCESS);
+ Assert.assertEquals(1, mockFlowFiles.size());
+
+ final MockFlowFile flowFile = mockFlowFiles.get(0);
+ flowFile.assertAttributeEquals("client.certificate.subject.dn", "CN=localhost");
+ flowFile.assertAttributeEquals("client.certificate.issuer.dn", "CN=localhost");
+ }
+
@Test(timeout = TEST_TIMEOUT)
public void testRunClientAuthNone() throws InitializationException, IOException, InterruptedException {
runner.setProperty(ListenTCPRecord.CLIENT_AUTH, ClientAuth.NONE.name());
[nifi] 04/31: NIFI-8124 Added Cookie Strategy property to InvokeHTTP
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit db07fbeae167e8724e6411bd5d4a15c7d5e2775e
Author: Marcus Ely <ma...@elyiace.com>
AuthorDate: Mon Mar 21 21:31:05 2022 +0000
NIFI-8124 Added Cookie Strategy property to InvokeHTTP
This closes #5887
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi-standard-processors/pom.xml | 4 ++
.../nifi/processors/standard/InvokeHTTP.java | 25 +++++++++++
.../processors/standard/http/CookieStrategy.java | 32 ++++++++++++++
.../nifi/processors/standard/InvokeHTTPTest.java | 49 ++++++++++++++++++++++
4 files changed, 110 insertions(+)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
index e5374bb08c..bb34818800 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/pom.xml
@@ -256,6 +256,10 @@
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp-urlconnection</artifactId>
+ </dependency>
<dependency>
<groupId>io.github.rburgst</groupId>
<artifactId>okhttp-digest</artifactId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index fbfea08c8c..7bdca5f937 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -23,6 +23,8 @@ import com.burgstaller.okhttp.digest.DigestAuthenticator;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
import java.net.Proxy;
import java.net.Proxy.Type;
import java.net.URL;
@@ -60,6 +62,7 @@ import okhttp3.ConnectionPool;
import okhttp3.Credentials;
import okhttp3.Handshake;
import okhttp3.Headers;
+import okhttp3.JavaNetCookieJar;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.MultipartBody.Builder;
@@ -100,6 +103,7 @@ import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.ProcessException;
import org.apache.nifi.processor.util.StandardValidators;
import org.apache.nifi.processors.standard.http.FlowFileNamingStrategy;
+import org.apache.nifi.processors.standard.http.CookieStrategy;
import org.apache.nifi.processors.standard.util.ProxyAuthenticator;
import org.apache.nifi.processors.standard.util.SoftLimitBoundedByteArrayOutputStream;
import org.apache.nifi.proxy.ProxyConfiguration;
@@ -516,6 +520,15 @@ public class InvokeHTTP extends AbstractProcessor {
)
.build();
+ public static final PropertyDescriptor PROP_COOKIE_STRATEGY = new PropertyDescriptor.Builder()
+ .name("cookie-strategy")
+ .description("Strategy for accepting and persisting HTTP cookies. Accepting cookies enables persistence across multiple requests.")
+ .displayName("Cookie Strategy")
+ .required(true)
+ .defaultValue(CookieStrategy.DISABLED.name())
+ .allowableValues(CookieStrategy.values())
+ .build();
+
private static final ProxySpec[] PROXY_SPECS = {ProxySpec.HTTP_AUTH, ProxySpec.SOCKS};
public static final PropertyDescriptor PROXY_CONFIGURATION_SERVICE
= ProxyConfiguration.createProxyConfigPropertyDescriptor(true, PROXY_SPECS);
@@ -530,6 +543,7 @@ public class InvokeHTTP extends AbstractProcessor {
PROP_MAX_IDLE_CONNECTIONS,
PROP_DATE_HEADER,
PROP_FOLLOW_REDIRECTS,
+ PROP_COOKIE_STRATEGY,
DISABLE_HTTP2_PROTOCOL,
FLOW_FILE_NAMING_STRATEGY,
PROP_ATTRIBUTES_TO_SEND,
@@ -824,6 +838,17 @@ public class InvokeHTTP extends AbstractProcessor {
okHttpClientBuilder.sslSocketFactory(socketFactory, trustManager);
}
+ // Configure cookie strategy
+ switch(CookieStrategy.valueOf(context.getProperty(PROP_COOKIE_STRATEGY).getValue())) {
+ case DISABLED:
+ break;
+ case ACCEPT_ALL:
+ final CookieManager cookieManager = new CookieManager();
+ cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+ okHttpClientBuilder.cookieJar(new JavaNetCookieJar(cookieManager));
+ break;
+ }
+
setAuthenticator(okHttpClientBuilder, context);
useChunked = context.getProperty(PROP_USE_CHUNKED_ENCODING).asBoolean();
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/http/CookieStrategy.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/http/CookieStrategy.java
new file mode 100644
index 0000000000..18e8665eea
--- /dev/null
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/http/CookieStrategy.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.standard.http;
+
+public enum CookieStrategy {
+ DISABLED("A cookie strategy that ignores cookies."),
+ ACCEPT_ALL("A cookie strategy that stores all cookies from incoming HTTP responses.");
+
+ private final String description;
+
+ CookieStrategy(final String description) {
+ this.description = description;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/InvokeHTTPTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/InvokeHTTPTest.java
index ed5d0b832d..ca83fdae11 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/InvokeHTTPTest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/InvokeHTTPTest.java
@@ -24,6 +24,7 @@ import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.oauth2.OAuth2AccessTokenProvider;
import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processors.standard.http.FlowFileNamingStrategy;
+import org.apache.nifi.processors.standard.http.CookieStrategy;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.security.util.StandardTlsConfiguration;
import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
@@ -104,6 +105,14 @@ public class InvokeHTTPTest {
private static final String LOCATION_HEADER = "Location";
+ private static final String SET_COOKIE_HEADER = "Set-Cookie";
+
+ private static final String COOKIE_HEADER = "Cookie";
+
+ private static final String COOKIE_1 = "a=apple";
+
+ private static final String COOKIE_2 = "b=banana";
+
private static final String TRANSFER_ENCODING_HEADER = "Transfer-Encoding";
private static final String USER_AGENT_HEADER = "User-Agent";
@@ -603,6 +612,46 @@ public class InvokeHTTPTest {
assertRelationshipStatusCodeEquals(InvokeHTTP.REL_NO_RETRY, HTTP_MOVED_TEMP);
}
+ @Test
+ public void testRunGetHttp302CookieStrategyAcceptAll() throws InterruptedException {
+ runner.setProperty(InvokeHTTP.PROP_COOKIE_STRATEGY, CookieStrategy.ACCEPT_ALL.name());
+ mockWebServer.enqueue(new MockResponse().setResponseCode(HTTP_MOVED_TEMP)
+ .addHeader(SET_COOKIE_HEADER, COOKIE_1)
+ .addHeader(SET_COOKIE_HEADER, COOKIE_2)
+ .addHeader(LOCATION_HEADER, getMockWebServerUrl()));
+ enqueueResponseCodeAndRun(HTTP_OK);
+
+ RecordedRequest request1 = mockWebServer.takeRequest();
+ assertNull(request1.getHeader(COOKIE_HEADER));
+
+ RecordedRequest request2 = mockWebServer.takeRequest();
+ final String expectedHeader = String.format("%s; %s", COOKIE_1, COOKIE_2);
+ assertEquals(expectedHeader, request2.getHeader(COOKIE_HEADER));
+
+ runner.assertTransferCount(InvokeHTTP.REL_FAILURE, 0);
+ runner.assertTransferCount(InvokeHTTP.REL_NO_RETRY, 0);
+ assertRelationshipStatusCodeEquals(InvokeHTTP.REL_RESPONSE, HTTP_OK);
+ }
+
+ @Test
+ public void testRunGetHttp302CookieStrategyDefaultDisabled() throws InterruptedException {
+ mockWebServer.enqueue(new MockResponse().setResponseCode(HTTP_MOVED_TEMP)
+ .addHeader(SET_COOKIE_HEADER, COOKIE_1)
+ .addHeader(SET_COOKIE_HEADER, COOKIE_2)
+ .addHeader(LOCATION_HEADER, getMockWebServerUrl()));
+ enqueueResponseCodeAndRun(HTTP_OK);
+
+ RecordedRequest request1 = mockWebServer.takeRequest();
+ assertNull(request1.getHeader(COOKIE_HEADER));
+
+ RecordedRequest request2 = mockWebServer.takeRequest();
+ assertNull(request2.getHeader(COOKIE_HEADER));
+
+ runner.assertTransferCount(InvokeHTTP.REL_FAILURE, 0);
+ runner.assertTransferCount(InvokeHTTP.REL_NO_RETRY, 0);
+ assertRelationshipStatusCodeEquals(InvokeHTTP.REL_RESPONSE, HTTP_OK);
+ }
+
@Test
public void testRunGetHttp400NoRetryMinimumProperties() {
enqueueResponseCodeAndRun(HTTP_BAD_REQUEST);
[nifi] 09/31: NIFI-9773 Refactored nifi-system-tests using JUnit 5
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7a1c743e5e2a1e569362a8999f28bd93e4cf6933
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Thu Mar 24 21:10:39 2022 -0500
NIFI-9773 Refactored nifi-system-tests using JUnit 5
- Enabled system-tests workflow on push and pull requests
This closes #5901
Signed-off-by: Mike Thomsen <mt...@apache.org>
---
.github/workflows/system-tests.yml | 24 ++---
.../apache/nifi/stateless/StatelessSystemIT.java | 24 ++---
.../nifi/stateless/VersionedFlowBuilder.java | 6 +-
.../stateless/basics/AsyncCommitCallbackIT.java | 21 +++--
.../nifi/stateless/basics/BatchOutputIT.java | 6 +-
.../stateless/basics/CancelFlowExecutionIT.java | 6 +-
.../nifi/stateless/basics/CloneFlowFileIT.java | 12 ++-
.../nifi/stateless/basics/CreatesFlowFileIT.java | 6 +-
.../nifi/stateless/basics/InputOutputIT.java | 6 +-
.../apache/nifi/stateless/basics/LoopingIT.java | 6 +-
.../apache/nifi/stateless/basics/MergingIT.java | 6 +-
.../stateless/basics/PartitioningContentIT.java | 6 +-
.../stateless/basics/ProcessorLifecycleIT.java | 2 +-
.../basics/RequiresAdditionalInputIT.java | 13 ++-
.../stateless/basics/RollbackOnExceptionIT.java | 10 ++-
.../apache/nifi/stateless/basics/SplittingIT.java | 6 +-
.../nifi/stateless/basics/StateStorageIT.java | 10 +--
.../nifi/stateless/basics/StatelessRetryIT.java | 6 +-
.../classloader/InstanceClassLoaderIT.java | 4 +-
.../StatelessControllerServiceSystemIT.java | 6 +-
.../stateless/parameters/ParameterContextIT.java | 18 ++--
.../performance/StatelessPerformanceIT.java | 6 +-
.../apache/nifi/tests/system/NiFiClientUtil.java | 20 ++---
...ocessGroupIT.java => NiFiInstanceProvider.java} | 28 +++---
.../org/apache/nifi/tests/system/NiFiSystemIT.java | 100 +++++++--------------
.../SpawnedStandaloneNiFiInstanceFactory.java | 2 +-
.../tests/system/TroubleshootingTestWatcher.java | 68 ++++++++++++++
.../classloaders/ClassloaderIsolationKeyIT.java | 4 +-
.../system/clustering/FlowSynchronizationIT.java | 10 +--
.../clustering/JoinClusterAdjustStateIT.java | 6 +-
.../clustering/JoinClusterWithDifferentFlow.java | 8 +-
.../JoinClusterWithMissingConnectionNoData.java | 4 +-
.../JoinClusterWithMissingConnectionWithData.java | 4 +-
.../clustering/NodeRestartWithNewNodeIdIT.java | 10 +--
.../nifi/tests/system/clustering/OffloadIT.java | 4 +-
.../clustering/RestartWithDifferentPort.java | 8 +-
.../system/clustering/SimpleNodeRestartIT.java | 6 +-
.../ControllerServiceApiValidationIT.java | 4 +-
.../DependentControllerServiceIT.java | 2 +-
.../tests/system/loadbalance/LoadBalanceIT.java | 14 ++-
.../parameters/ClusteredParameterContextIT.java | 2 +-
.../system/parameters/ParameterContextIT.java | 16 ++--
.../tests/system/pg/BatchFlowBetweenGroupsIT.java | 2 +-
.../system/pg/SingleFlowFileConcurrencyIT.java | 8 +-
.../nifi/tests/system/processor/RetryIT.java | 4 +-
.../nifi/tests/system/processor/RunOnceIT.java | 8 +-
.../system/provenance/ProvenanceRepositoryIT.java | 4 +-
.../system/reportingtask/ReportingTaskIT.java | 2 +-
.../tests/system/repositories/ContentAccessIT.java | 4 +-
.../system/restart/FlowFileRestorationIT.java | 19 ++--
.../system/rpg/ClusteredRemoteProcessGroupIT.java | 2 +-
.../tests/system/rpg/RemoteProcessGroupIT.java | 7 +-
.../validation/DependentPropertyValidationIT.java | 6 +-
.../system/variables/ProcessGroupVariablesIT.java | 4 +-
...usteredVerifiableControllerServiceSystemIT.java | 6 +-
.../ClusteredVerifiableProcessorSystemIT.java | 6 +-
.../ClusteredVerifiableReportingTaskSystemIT.java | 6 +-
.../VerifiableControllerServiceSystemIT.java | 18 ++--
.../verification/VerifiableProcessorSystemIT.java | 16 ++--
.../VerifiableReportingTaskSystemIT.java | 8 +-
60 files changed, 333 insertions(+), 327 deletions(-)
diff --git a/.github/workflows/system-tests.yml b/.github/workflows/system-tests.yml
index 4c453658d7..2cb2b5d8b5 100644
--- a/.github/workflows/system-tests.yml
+++ b/.github/workflows/system-tests.yml
@@ -19,6 +19,12 @@ on:
# Run every day at 00:00
schedule:
- cron: "0 0 * * *"
+ push:
+ paths:
+ - 'nifi-system-tests/**'
+ pull_request:
+ paths:
+ - 'nifi-system-tests/**'
env:
DEFAULT_MAVEN_OPTS: >-
@@ -52,19 +58,12 @@ jobs:
steps:
- name: Checkout Code
uses: actions/checkout@v2
- - name: Cache Maven Dependencies
- uses: actions/cache@v2
- with:
- path: |
- ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- name: Set up Java 11
uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 11
+ cache: 'maven'
- name: Build Dependencies
env:
MAVEN_OPTS: >-
@@ -99,19 +98,12 @@ jobs:
steps:
- name: Checkout Code
uses: actions/checkout@v2
- - name: Cache Maven Dependencies
- uses: actions/cache@v2
- with:
- path: |
- ~/.m2/repository
- key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
- restore-keys: |
- ${{ runner.os }}-maven-
- name: Set up Java 8
uses: actions/setup-java@v2
with:
distribution: zulu
java-version: 8
+ cache: 'maven'
- name: Build Dependencies
env:
MAVEN_OPTS: >-
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/StatelessSystemIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/StatelessSystemIT.java
index f0df86133e..aa4e2845b7 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/StatelessSystemIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/StatelessSystemIT.java
@@ -34,11 +34,9 @@ import org.apache.nifi.stateless.engine.StatelessEngineConfiguration;
import org.apache.nifi.stateless.flow.DataflowDefinition;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TransactionThresholds;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.rules.Timeout;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Timeout;
import java.io.File;
import java.io.FileInputStream;
@@ -53,6 +51,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
+@Timeout(value = 5, unit = TimeUnit.MINUTES)
public class StatelessSystemIT {
private final List<StatelessDataflow> createdFlows = new ArrayList<>();
@@ -60,19 +59,12 @@ public class StatelessSystemIT {
// up finding a "compatible bundle" and using that, regardless of the specified version.
protected static final Bundle SYSTEM_TEST_EXTENSIONS_BUNDLE = new Bundle("org.apache.nifi", "nifi-system-test-extensions-nar", "1.13.0-SNAPSHOT");
- @Rule
- public TestName name = new TestName();
-
- @Rule
- public Timeout defaultTimeout = new Timeout(5, TimeUnit.MINUTES);
-
-
- @Before
+ @BeforeEach
public void clearFlows() {
createdFlows.clear();
}
- @After
+ @AfterEach
public void shutdownFlows() {
createdFlows.forEach(StatelessDataflow::shutdown);
}
@@ -236,8 +228,4 @@ public class StatelessSystemIT {
createdFlows.add(dataflow);
return dataflow;
}
-
- protected String getTestName() {
- return name.getMethodName();
- }
}
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
index 07381daa95..7f38166919 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/VersionedFlowBuilder.java
@@ -43,8 +43,8 @@ import java.util.Set;
import java.util.UUID;
public class VersionedFlowBuilder {
- private VersionedFlowSnapshot flowSnapshot;
- private VersionedProcessGroup rootGroup;
+ private final VersionedFlowSnapshot flowSnapshot;
+ private final VersionedProcessGroup rootGroup;
public VersionedFlowBuilder() {
rootGroup = new VersionedProcessGroup();
@@ -146,7 +146,7 @@ public class VersionedFlowBuilder {
processor.setSchedulingStrategy("TIMER_DRIVEN");
processor.setRetryCount(0);
processor.setBackoffMechanism("PENALIZE_FLOWFILE");
- processor.setRetriedRelationships(Collections.EMPTY_SET);
+ processor.setRetriedRelationships(Collections.emptySet());
processor.setMaxBackoffPeriod("0 sec");
group.getProcessors().add(processor);
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
index 52fbf83d11..9a1fefa7e7 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/AsyncCommitCallbackIT.java
@@ -27,8 +27,9 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.File;
import java.io.IOException;
@@ -40,15 +41,15 @@ import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class AsyncCommitCallbackIT extends StatelessSystemIT {
private final File inputFile = new File("target/input.txt");
private final File replacementFile = new File("target/replacement.txt");
- @Before
+ @BeforeEach
public void setup() throws IOException {
Files.write(inputFile.toPath(), "Hello World".getBytes(), StandardOpenOption.CREATE);
Files.deleteIfExists(replacementFile.toPath());
@@ -98,13 +99,15 @@ public class AsyncCommitCallbackIT extends StatelessSystemIT {
assertTrue(failureOutputFile.exists());
}
- @Test(timeout = 10_000)
+ @Timeout(10)
+ @Test
public void testCleanupAfterFlowFilesTerminated() throws IOException, StatelessConfigurationException, InterruptedException {
testCleanupAfterFlowFilesTerminated("asynchronous");
}
- @Test(timeout = 10_000)
- public void testSynchronousCommitCleanupAFterFlowFilesTerminated() throws IOException, StatelessConfigurationException, InterruptedException {
+ @Timeout(10)
+ @Test
+ public void testSynchronousCommitCleanupAfterFlowFilesTerminated() throws IOException, StatelessConfigurationException, InterruptedException {
testCleanupAfterFlowFilesTerminated("synchronous");
}
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/BatchOutputIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/BatchOutputIT.java
index 1a06c31bfe..0b4193471d 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/BatchOutputIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/BatchOutputIT.java
@@ -27,15 +27,15 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class BatchOutputIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CancelFlowExecutionIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CancelFlowExecutionIT.java
index 3fa38fa461..224e8eca08 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CancelFlowExecutionIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CancelFlowExecutionIT.java
@@ -26,15 +26,15 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CancelFlowExecutionIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CloneFlowFileIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CloneFlowFileIT.java
index a236c776c0..442f205fbe 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CloneFlowFileIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CloneFlowFileIT.java
@@ -27,16 +27,16 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CloneFlowFileIT extends StatelessSystemIT {
@@ -94,9 +94,7 @@ public class CloneFlowFileIT extends StatelessSystemIT {
try {
return new String(result.readContentAsByteArray(flowFile), StandardCharsets.UTF_8);
} catch (final IOException e) {
- e.printStackTrace();
- Assert.fail("Could not read content");
- return null;
+ throw new UncheckedIOException("Read Content Failed", e);
}
}
}
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CreatesFlowFileIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CreatesFlowFileIT.java
index 4461f4d1fc..5ed91ca68b 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CreatesFlowFileIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/CreatesFlowFileIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -34,8 +34,8 @@ import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CreatesFlowFileIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/InputOutputIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/InputOutputIT.java
index 7cd0ae9d4a..a1d78ef75a 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/InputOutputIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/InputOutputIT.java
@@ -28,14 +28,14 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class InputOutputIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/LoopingIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/LoopingIT.java
index bce362151e..b24e176876 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/LoopingIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/LoopingIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class LoopingIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/MergingIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/MergingIT.java
index 098ca99f77..b55ef4b929 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/MergingIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/MergingIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class MergingIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/PartitioningContentIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/PartitioningContentIT.java
index fe7073d089..1b6f05befe 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/PartitioningContentIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/PartitioningContentIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -36,8 +36,8 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class PartitioningContentIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/ProcessorLifecycleIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/ProcessorLifecycleIT.java
index b2596f789a..6eb246a384 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/ProcessorLifecycleIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/ProcessorLifecycleIT.java
@@ -24,7 +24,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RequiresAdditionalInputIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RequiresAdditionalInputIT.java
index 4fed60254a..ed4618e86c 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RequiresAdditionalInputIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RequiresAdditionalInputIT.java
@@ -29,8 +29,7 @@ import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TransactionThresholds;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -44,9 +43,9 @@ import java.util.Optional;
import java.util.OptionalLong;
import java.util.concurrent.TimeUnit;
-import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RequiresAdditionalInputIT extends StatelessSystemIT {
@@ -75,11 +74,11 @@ public class RequiresAdditionalInputIT extends StatelessSystemIT {
assertTrue(result.isSuccessful());
final List<FlowFile> flowFiles = result.getOutputFlowFiles("Out");
- Assert.assertEquals(1, flowFiles.size());
+ assertEquals(1, flowFiles.size());
final FlowFile first = flowFiles.get(0);
final String outputContent = new String(result.readContentAsByteArray(first));
- Assert.assertEquals("123", outputContent);
+ assertEquals("123", outputContent);
result.acknowledge();
}
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
index 8d2eb622cc..4594b574eb 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/RollbackOnExceptionIT.java
@@ -27,18 +27,20 @@ import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.FailurePortEncounteredException;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.Collections;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RollbackOnExceptionIT extends StatelessSystemIT {
private static final String EXCEPTION_TEXT = "Intentional Exception to verify behavior in RollbackOnExceptionIT";
- @Test(timeout = 30_000)
+ @Timeout(30)
+ @Test
public void testFlowFileCompletelyRemovedWhenExceptionThrown() throws IOException, StatelessConfigurationException, InterruptedException {
final VersionedFlowBuilder builder = new VersionedFlowBuilder();
final VersionedProcessor generate = builder.createSimpleProcessor("GenerateFlowFile");
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/SplittingIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/SplittingIT.java
index 846cc78adb..061cf21e7f 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/SplittingIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/SplittingIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -34,8 +34,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SplittingIT extends StatelessSystemIT {
@Test
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StateStorageIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StateStorageIT.java
index 43c9ff4001..a4c63b6ebb 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StateStorageIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StateStorageIT.java
@@ -27,16 +27,16 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
-import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StateStorageIT extends StatelessSystemIT {
@Test
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StatelessRetryIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StatelessRetryIT.java
index 0a6b8115e4..dd93349497 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StatelessRetryIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/basics/StatelessRetryIT.java
@@ -26,14 +26,14 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StatelessRetryIT extends StatelessSystemIT {
private static final int RETRY_COUNT = 2;
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/classloader/InstanceClassLoaderIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/classloader/InstanceClassLoaderIT.java
index 8e51d0049f..9c9dffc01a 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/classloader/InstanceClassLoaderIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/classloader/InstanceClassLoaderIT.java
@@ -23,7 +23,7 @@ import org.apache.nifi.stateless.StatelessSystemIT;
import org.apache.nifi.stateless.VersionedFlowBuilder;
import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.StatelessDataflow;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
@@ -33,7 +33,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class InstanceClassLoaderIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/controller/services/StatelessControllerServiceSystemIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/controller/services/StatelessControllerServiceSystemIT.java
index 06ec164449..6fdcb8a4eb 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/controller/services/StatelessControllerServiceSystemIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/controller/services/StatelessControllerServiceSystemIT.java
@@ -29,14 +29,14 @@ import org.apache.nifi.stateless.config.StatelessConfigurationException;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class StatelessControllerServiceSystemIT extends StatelessSystemIT {
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/parameters/ParameterContextIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/parameters/ParameterContextIT.java
index 5eeb6e7891..6848ff09e6 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/parameters/ParameterContextIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/parameters/ParameterContextIT.java
@@ -35,8 +35,7 @@ import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TransactionThresholds;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.ArrayList;
@@ -45,8 +44,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ParameterContextIT extends StatelessSystemIT {
@@ -105,14 +105,12 @@ public class ParameterContextIT extends StatelessSystemIT {
parameterContext.getParameters().add(createVersionedParameter("three", "-1")); // Set value to -1. This should be overridden by the Numeric Parameter Context.
flowBuilder.getRootGroup().setParameterContextName("Context 1");
- Assert.assertThrows(IllegalStateException.class, () -> {
- loadDataflow(flowSnapshot, Collections.emptyList(), parameterValueProviders, Collections.emptySet(), TransactionThresholds.SINGLE_FLOWFILE);
- });
+ assertThrows(IllegalStateException.class, () -> loadDataflow(flowSnapshot, Collections.emptyList(), parameterValueProviders, Collections.emptySet(), TransactionThresholds.SINGLE_FLOWFILE));
}
@Test
- public void testParameterValueProviderWithRequiredPropertyNotSet() throws IOException, StatelessConfigurationException {
+ public void testParameterValueProviderWithRequiredPropertyNotSet() {
final VersionedFlowBuilder flowBuilder = new VersionedFlowBuilder();
final VersionedPort outPort = flowBuilder.createOutputPort("Out");
final VersionedProcessor generate = flowBuilder.createSimpleProcessor("GenerateFlowFile");
@@ -133,9 +131,7 @@ public class ParameterContextIT extends StatelessSystemIT {
parameterContext.getParameters().add(createVersionedParameter("three", "1")); // Set value to -1. This should be overridden by the Numeric Parameter Context.
flowBuilder.getRootGroup().setParameterContextName("Context 1");
- Assert.assertThrows(IllegalStateException.class, () -> {
- loadDataflow(flowSnapshot, Collections.emptyList(), parameterValueProviders, Collections.emptySet(), TransactionThresholds.SINGLE_FLOWFILE);
- });
+ assertThrows(IllegalStateException.class, () -> loadDataflow(flowSnapshot, Collections.emptyList(), parameterValueProviders, Collections.emptySet(), TransactionThresholds.SINGLE_FLOWFILE));
}
@Test
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/performance/StatelessPerformanceIT.java b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/performance/StatelessPerformanceIT.java
index 9056c6f246..55b7732e55 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/performance/StatelessPerformanceIT.java
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/src/test/java/org/apache/nifi/stateless/performance/StatelessPerformanceIT.java
@@ -23,15 +23,15 @@ import org.apache.nifi.stateless.VersionedFlowBuilder;
import org.apache.nifi.stateless.flow.DataflowTrigger;
import org.apache.nifi.stateless.flow.StatelessDataflow;
import org.apache.nifi.stateless.flow.TriggerResult;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
import java.util.ArrayList;
import java.util.List;
public class StatelessPerformanceIT extends StatelessSystemIT {
@Test
- @Ignore("For manual testing purposes only")
+ @EnabledIfSystemProperty(named = "nifi.test.performance", matches = "true")
public void testCreateDestroyPerf() throws InterruptedException {
System.setProperty("org.slf4j.simpleLogger.log.org.apache.nifi", "WARN");
final VersionedFlowBuilder builder = new VersionedFlowBuilder();
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
index 0dc64eac5f..c3de536cff 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
@@ -87,7 +87,6 @@ import org.apache.nifi.web.api.entity.VariableEntity;
import org.apache.nifi.web.api.entity.VariableRegistryEntity;
import org.apache.nifi.web.api.entity.VariableRegistryUpdateRequestEntity;
import org.apache.nifi.web.api.entity.VerifyConfigRequestEntity;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -105,6 +104,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
public class NiFiClientUtil {
private static final Logger logger = LoggerFactory.getLogger(NiFiClientUtil.class);
@@ -734,7 +735,7 @@ public class NiFiClientUtil {
try {
Thread.sleep(500L);
} catch (final Exception e) {
- Assert.fail(e.toString());
+ throw new RuntimeException(e);
}
}
}
@@ -762,8 +763,7 @@ public class NiFiClientUtil {
try {
Thread.sleep(500L);
} catch (final Exception e) {
- e.printStackTrace();
- Assert.fail(e.toString());
+ throw new RuntimeException(e);
}
}
}
@@ -1039,8 +1039,7 @@ public class NiFiClientUtil {
getConnectionClient().deleteListingRequest(connectionId, listingRequestEntity.getListingRequest().getId());
return listingRequestEntity;
} catch (final InterruptedException e) {
- Assert.fail("Failed to obtain connection status");
- return null;
+ throw new RuntimeException("Failed to obtain connection status");
}
}
@@ -1117,16 +1116,13 @@ public class NiFiClientUtil {
try {
Thread.sleep(100L);
} catch (final InterruptedException ie) {
- Assert.fail("Interrupted while waiting for variable registry to update");
- return null;
+ throw new RuntimeException("Interrupted while waiting for variable registry to update");
}
updateRequestEntity = nifiClient.getProcessGroupClient().getVariableRegistryUpdateRequest(processGroup.getId(), updateRequestEntity.getRequest().getRequestId());
}
- if (updateRequestEntity.getRequest().getFailureReason() != null) {
- Assert.fail("Failed to update Variable Registry due to: " + updateRequestEntity.getRequest().getFailureReason());
- }
+ assertNull(updateRequestEntity.getRequest().getFailureReason());
nifiClient.getProcessGroupClient().deleteVariableRegistryUpdateRequest(processGroup.getId(), updateRequestEntity.getRequest().getRequestId());
return updateRequestEntity;
@@ -1192,7 +1188,7 @@ public class NiFiClientUtil {
try {
responseEntity = waitForComplete(responseEntity);
} catch (final InterruptedException ie) {
- Assert.fail("Interrupted while waiting for Provenance Query to complete");
+ throw new RuntimeException("Interrupted while waiting for Provenance Query to complete");
}
nifiClient.getProvenanceClient().deleteProvenanceQuery(responseEntity.getProvenance().getId());
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiInstanceProvider.java
similarity index 60%
copy from nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java
copy to nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiInstanceProvider.java
index 421d41b6d1..ab7e3e8851 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiInstanceProvider.java
@@ -14,17 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.nifi.tests.system.rpg;
+package org.apache.nifi.tests.system;
-import org.apache.nifi.tests.system.NiFiInstanceFactory;
-import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
-
-public class ClusteredRemoteProcessGroupIT extends RemoteProcessGroupIT {
- @Override
- protected NiFiInstanceFactory getInstanceFactory() {
- return new SpawnedClusterNiFiInstanceFactory(
- "src/test/resources/conf/clustered/node1/bootstrap.conf",
- "src/test/resources/conf/clustered/node2/bootstrap.conf");
- }
+/**
+ * Provider for configured NiFi instances
+ */
+public interface NiFiInstanceProvider {
+ /**
+ * Get configured NiFi instance or null when not configured
+ *
+ * @return NiFi instance or null when not configured
+ */
+ NiFiInstance getNiFiInstance();
+ /**
+ * Get NiFi instance factory
+ *
+ * @return NiFi Instance Factory
+ */
+ NiFiInstanceFactory getInstanceFactory();
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
index 2f48f1f7f8..341e384812 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiSystemIT.java
@@ -24,15 +24,12 @@ import org.apache.nifi.web.api.dto.NodeDTO;
import org.apache.nifi.web.api.entity.ClusteSummaryEntity;
import org.apache.nifi.web.api.entity.ClusterEntity;
import org.apache.nifi.web.api.entity.ConnectionStatusEntity;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.rules.TestWatcher;
-import org.junit.rules.Timeout;
-import org.junit.runner.Description;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +46,9 @@ import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public abstract class NiFiSystemIT {
+@ExtendWith(TroubleshootingTestWatcher.class)
+@Timeout(value = 5, unit = TimeUnit.MINUTES)
+public abstract class NiFiSystemIT implements NiFiInstanceProvider {
private static final Logger logger = LoggerFactory.getLogger(NiFiSystemIT.class);
private final ConcurrentMap<String, Long> lastLogTimestamps = new ConcurrentHashMap<>();
@@ -65,31 +64,16 @@ public abstract class NiFiSystemIT {
private static final File LIB_DIR = new File("target/nifi-lib-assembly/lib");
private static volatile String nifiFrameworkVersion = null;
- @Rule
- public TestName name = new TestName();
- @Rule
- public Timeout defaultTimeout = new Timeout(5, TimeUnit.MINUTES);
-
- @Rule(order = Integer.MIN_VALUE)
- public TestWatcher quarantineRule = new TestWatcher() {
- @Override
- protected void failed(final Throwable t, final Description description) {
- final String testName = description.getMethodName();
- try {
- final File dir = quarantineTroubleshootingInfo(testName, t);
- logger.info("Test failure for <{}>. Successfully wrote troubleshooting info to {}", testName, dir.getAbsolutePath());
- } catch (final Exception e) {
- logger.error("Failed to quarantine troubleshooting info for test " + testName, e);
- }
- }
- };
-
private NiFiClient nifiClient;
private NiFiClientUtil clientUtil;
private static final AtomicReference<NiFiInstance> nifiRef = new AtomicReference<>();
- @Before
- public void setup() throws IOException {
+ private TestInfo testInfo;
+
+ @BeforeEach
+ public void setup(final TestInfo testInfo) throws IOException {
+ this.testInfo = testInfo;
+
Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
setupClient();
@@ -107,7 +91,7 @@ public abstract class NiFiSystemIT {
}
}
- @AfterClass
+ @AfterAll
public static void cleanup() {
final NiFiInstance nifi = nifiRef.get();
nifiRef.set(null);
@@ -116,7 +100,7 @@ public abstract class NiFiSystemIT {
}
}
- @After
+ @AfterEach
public void teardown() throws Exception {
try {
Exception destroyFlowFailure = null;
@@ -147,21 +131,23 @@ public abstract class NiFiSystemIT {
}
}
- protected File quarantineTroubleshootingInfo(final String methodName, final Throwable failureCause) throws IOException {
- NiFiInstance instance = getNiFiInstance();
-
- // The @AfterClass may or may not have already run at this point. If it has, the instance will be null.
- // In that case, just create a new instance and use it - it will map to the same directories.
- if (instance == null) {
- instance = getInstanceFactory().createInstance();
- }
+ @Override
+ public NiFiInstance getNiFiInstance() {
+ return nifiRef.get();
+ }
- final File troubleshooting = new File("target/troubleshooting");
- final File quarantineDir = new File(troubleshooting, methodName);
- quarantineDir.mkdirs();
+ @Override
+ public NiFiInstanceFactory getInstanceFactory() {
+ return new SpawnedStandaloneNiFiInstanceFactory(
+ new InstanceConfiguration.Builder()
+ .bootstrapConfig("src/test/resources/conf/default/bootstrap.conf")
+ .instanceDirectory("target/standalone-instance")
+ .overrideNifiProperties(getNifiPropertiesOverrides())
+ .build());
+ }
- instance.quarantineTroubleshootingInfo(quarantineDir, failureCause);
- return quarantineDir;
+ protected String getTestName() {
+ return testInfo.getDisplayName();
}
protected boolean isDestroyEnvironmentAfterEachTest() {
@@ -253,11 +239,6 @@ public abstract class NiFiSystemIT {
return CLIENT_API_PORT;
}
-
- protected String getTestName() {
- return name.getMethodName();
- }
-
protected NiFiClient getNifiClient() {
Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
return nifiClient;
@@ -283,10 +264,6 @@ public abstract class NiFiSystemIT {
throw new IllegalStateException("Could not determine version of NiFi");
}
- protected NiFiInstance getNiFiInstance() {
- return nifiRef.get();
- }
-
protected int getNumberOfNodes() {
return getNumberOfNodes(true);
}
@@ -300,15 +277,6 @@ public abstract class NiFiSystemIT {
return instance.getNumberOfNodes(includeOnlyAutoStartInstances);
}
- protected NiFiInstanceFactory getInstanceFactory() {
- return new SpawnedStandaloneNiFiInstanceFactory(
- new InstanceConfiguration.Builder()
- .bootstrapConfig("src/test/resources/conf/default/bootstrap.conf")
- .instanceDirectory("target/standalone-instance")
- .overrideNifiProperties(getNifiPropertiesOverrides())
- .build());
- }
-
protected Map<String, String> getNifiPropertiesOverrides() {
return Collections.emptyMap();
}
@@ -398,9 +366,7 @@ public abstract class NiFiSystemIT {
try {
return getNifiClient().getFlowClient().getConnectionStatus(connectionId, true);
} catch (final Exception e) {
- e.printStackTrace();
- Assert.fail("Failed to obtain connection status");
- return null;
+ throw new RuntimeException("Failed to obtain connection status");
}
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
index 8b5f2adb02..f14e4d325a 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/SpawnedStandaloneNiFiInstanceFactory.java
@@ -38,7 +38,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.Properties;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SpawnedStandaloneNiFiInstanceFactory implements NiFiInstanceFactory {
private static final Logger logger = LoggerFactory.getLogger(SpawnedStandaloneNiFiInstanceFactory.class);
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/TroubleshootingTestWatcher.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/TroubleshootingTestWatcher.java
new file mode 100644
index 0000000000..8d71362359
--- /dev/null
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/TroubleshootingTestWatcher.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.tests.system;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestWatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Optional;
+
+/**
+ * Test Watcher responsible for writing troubleshooting logs
+ */
+public class TroubleshootingTestWatcher implements TestWatcher {
+ private static final Logger logger = LoggerFactory.getLogger(TroubleshootingTestWatcher.class);
+
+ @Override
+ public void testFailed(final ExtensionContext context, final Throwable cause) {
+ final Optional<Object> optionalTestInstance = context.getTestInstance();
+ if (optionalTestInstance.isPresent()) {
+ final Object testInstance = optionalTestInstance.get();
+ if (testInstance instanceof NiFiInstanceProvider) {
+ final NiFiInstanceProvider provider = (NiFiInstanceProvider) testInstance;
+ final String displayName = context.getDisplayName();
+ try {
+ final File dir = quarantineTroubleshootingInfo(provider, displayName, cause);
+ logger.info("Test Failed [{}]: Troubleshooting information stored [{}]", displayName, dir.getAbsolutePath());
+ } catch (final Exception e) {
+ logger.error("Test Failed [{}]: Troubleshooting information not stored", displayName, e);
+ }
+ }
+ }
+ }
+
+ private File quarantineTroubleshootingInfo(final NiFiInstanceProvider provider, final String methodName, final Throwable failureCause) throws IOException {
+ NiFiInstance instance = provider.getNiFiInstance();
+
+ // The teardown method may or may not have already run at this point. If it has, the instance will be null.
+ // In that case, just create a new instance and use it - it will map to the same directories.
+ if (instance == null) {
+ instance = provider.getInstanceFactory().createInstance();
+ }
+
+ final File troubleshooting = new File("target/troubleshooting");
+ final File quarantineDir = new File(troubleshooting, methodName);
+ quarantineDir.mkdirs();
+
+ instance.quarantineTroubleshootingInfo(quarantineDir, failureCause);
+ return quarantineDir;
+ }
+}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/classloaders/ClassloaderIsolationKeyIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/classloaders/ClassloaderIsolationKeyIT.java
index 4c5fb822e5..1f62d9a26d 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/classloaders/ClassloaderIsolationKeyIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/classloaders/ClassloaderIsolationKeyIT.java
@@ -21,7 +21,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -29,7 +29,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Collections;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ClassloaderIsolationKeyIT extends NiFiSystemIT {
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
index 2a45672597..7a5d89e1a2 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/FlowSynchronizationIT.java
@@ -53,7 +53,7 @@ import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessGroupFlowEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
import org.apache.nifi.web.api.entity.ReportingTaskEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,9 +70,9 @@ import java.util.Map;
import java.util.Set;
import java.util.zip.GZIPInputStream;
-import static junit.framework.TestCase.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FlowSynchronizationIT extends NiFiSystemIT {
private static final Logger logger = LoggerFactory.getLogger(FlowSynchronizationIT.class);
@@ -84,7 +84,7 @@ public class FlowSynchronizationIT extends NiFiSystemIT {
private final ObjectMapper objectMapper = new ObjectMapper();
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
new InstanceConfiguration.Builder()
.bootstrapConfig("src/test/resources/conf/clustered/node1/bootstrap.conf")
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterAdjustStateIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterAdjustStateIT.java
index 5849a525bd..6c89de2afb 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterAdjustStateIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterAdjustStateIT.java
@@ -23,18 +23,18 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.Collections;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class JoinClusterAdjustStateIT extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
new InstanceConfiguration.Builder()
.bootstrapConfig("src/test/resources/conf/clustered/node1/bootstrap.conf")
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithDifferentFlow.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithDifferentFlow.java
index f6f9ea688e..c53bd0b3d9 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithDifferentFlow.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithDifferentFlow.java
@@ -45,7 +45,7 @@ import org.apache.nifi.web.api.entity.ControllerServicesEntity;
import org.apache.nifi.web.api.entity.NodeEntity;
import org.apache.nifi.web.api.entity.ParameterEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
@@ -69,12 +69,12 @@ import java.util.Properties;
import java.util.Set;
import java.util.zip.GZIPInputStream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
public class JoinClusterWithDifferentFlow extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
final Map<String, String> propertyOverrides = Collections.singletonMap("nifi.cluster.flow.serialization.format", "XML");
return new SpawnedClusterNiFiInstanceFactory(
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionNoData.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionNoData.java
index 37d681ebeb..dc69d12173 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionNoData.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionNoData.java
@@ -20,11 +20,11 @@ import org.apache.nifi.tests.system.InstanceConfiguration;
import org.apache.nifi.tests.system.NiFiInstanceFactory;
import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class JoinClusterWithMissingConnectionNoData extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
new InstanceConfiguration.Builder()
.bootstrapConfig("src/test/resources/conf/clustered/node1/bootstrap.conf")
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionWithData.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionWithData.java
index 5d747be67f..d5fcde5625 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionWithData.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/JoinClusterWithMissingConnectionWithData.java
@@ -27,7 +27,7 @@ import org.apache.nifi.web.api.dto.flow.FlowDTO;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.NodeEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -36,7 +36,7 @@ public class JoinClusterWithMissingConnectionWithData extends NiFiSystemIT {
private static final String CONNECTION_UUID = "6be9a991-016e-1000-ffff-fffffebf0217";
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
new InstanceConfiguration.Builder()
.bootstrapConfig("src/test/resources/conf/clustered/node1/bootstrap.conf")
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/NodeRestartWithNewNodeIdIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/NodeRestartWithNewNodeIdIT.java
index a1a608b096..a576196b49 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/NodeRestartWithNewNodeIdIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/NodeRestartWithNewNodeIdIT.java
@@ -23,20 +23,20 @@ import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.NodeDTO;
import org.apache.nifi.web.api.entity.ClusteSummaryEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class NodeRestartWithNewNodeIdIT extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
index e806cefa21..f535325469 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/OffloadIT.java
@@ -26,7 +26,7 @@ import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
import org.apache.nifi.web.api.entity.ClusterEntity;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +37,7 @@ public class OffloadIT extends NiFiSystemIT {
private static final Logger logger = LoggerFactory.getLogger(OffloadIT.class);
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/RestartWithDifferentPort.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/RestartWithDifferentPort.java
index c0c5b5dac1..578e6c14c5 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/RestartWithDifferentPort.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/RestartWithDifferentPort.java
@@ -24,19 +24,19 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.NodeDTO;
import org.apache.nifi.web.api.entity.ClusteSummaryEntity;
import org.apache.nifi.web.api.entity.ClusterEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class RestartWithDifferentPort extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/SimpleNodeRestartIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/SimpleNodeRestartIT.java
index cb6c48227d..1e15eb8d52 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/SimpleNodeRestartIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/clustering/SimpleNodeRestartIT.java
@@ -22,16 +22,16 @@ import org.apache.nifi.tests.system.NiFiInstanceFactory;
import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ClusteSummaryEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class SimpleNodeRestartIT extends NiFiSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
index 7f6f5cea86..5cc6dc07ed 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/ControllerServiceApiValidationIT.java
@@ -21,12 +21,12 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ControllerServiceEntity;
import org.apache.nifi.web.api.entity.ControllerServiceRunStatusEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ControllerServiceApiValidationIT extends NiFiSystemIT {
@Test
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/DependentControllerServiceIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/DependentControllerServiceIT.java
index 90950f769e..9238297ad0 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/DependentControllerServiceIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/controllerservice/DependentControllerServiceIT.java
@@ -24,7 +24,7 @@ import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentEntit
import org.apache.nifi.web.api.entity.ControllerServiceReferencingComponentsEntity;
import org.apache.nifi.web.api.entity.ControllerServiceRunStatusEntity;
import org.apache.nifi.web.api.entity.UpdateControllerServiceReferenceRequestEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/loadbalance/LoadBalanceIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/loadbalance/LoadBalanceIT.java
index 0890f71c0e..2e1b1c0698 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/loadbalance/LoadBalanceIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/loadbalance/LoadBalanceIT.java
@@ -34,8 +34,7 @@ import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ConnectionStatusEntity;
import org.apache.nifi.web.api.entity.FlowFileEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,14 +46,14 @@ import java.util.LongSummaryStatistics;
import java.util.Map;
import java.util.Set;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class LoadBalanceIT extends NiFiSystemIT {
private final Logger logger = LoggerFactory.getLogger(getClass());
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
@@ -219,7 +218,7 @@ public class LoadBalanceIT extends NiFiSystemIT {
assertEquals(10, nodesByAttribute.size());
for (final Map.Entry<String, Set<String>> entry : nodesByAttribute.entrySet()) {
final Set<String> nodes = entry.getValue();
- assertEquals("FlowFile with attribute number=" + entry.getKey() + " went to nodes " + nodes, 1, nodes.size());
+ assertEquals(1, nodes.size(), "FlowFile with attribute number=" + entry.getKey() + " went to nodes " + nodes);
}
}
@@ -303,8 +302,7 @@ public class LoadBalanceIT extends NiFiSystemIT {
try {
return getNifiClient().getFlowClient().getConnectionStatus(connectionId, true);
} catch (final Exception e) {
- Assert.fail("Failed to obtain connection status");
- return null;
+ throw new RuntimeException("Failed to obtain connection status");
}
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ClusteredParameterContextIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ClusteredParameterContextIT.java
index 4f994feaf9..56063310c9 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ClusteredParameterContextIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ClusteredParameterContextIT.java
@@ -24,7 +24,7 @@ import org.apache.nifi.tests.system.NiFiInstanceFactory;
*/
public class ClusteredParameterContextIT extends ParameterContextIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
index 4e5e45b88d..9526d62540 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/parameters/ParameterContextIT.java
@@ -31,7 +31,8 @@ import org.apache.nifi.web.api.entity.ParameterContextUpdateRequestEntity;
import org.apache.nifi.web.api.entity.ParameterEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.File;
import java.io.IOException;
@@ -46,11 +47,11 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ParameterContextIT extends NiFiSystemIT {
@Test
@@ -181,7 +182,8 @@ public class ParameterContextIT extends NiFiSystemIT {
waitForValidProcessor(processorId);
}
- @Test(timeout=30000)
+ @Timeout(30)
+ @Test
public void testValidationWithRequiredPropertiesAndNoDefault() throws NiFiClientException, IOException, InterruptedException {
final ProcessorEntity generate = getClientUtil().createProcessor("DependOnProperties");
final Map<String, String> properties = new HashMap<>();
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/BatchFlowBetweenGroupsIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/BatchFlowBetweenGroupsIT.java
index 19851b1771..5c682b07f3 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/BatchFlowBetweenGroupsIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/BatchFlowBetweenGroupsIT.java
@@ -25,7 +25,7 @@ import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.PortEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/SingleFlowFileConcurrencyIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/SingleFlowFileConcurrencyIT.java
index 18f9f9ed4f..99a28ec5a0 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/SingleFlowFileConcurrencyIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/pg/SingleFlowFileConcurrencyIT.java
@@ -26,15 +26,15 @@ import org.apache.nifi.web.api.entity.FlowFileEntity;
import org.apache.nifi.web.api.entity.PortEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class SingleFlowFileConcurrencyIT extends NiFiSystemIT {
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RetryIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RetryIT.java
index 70787eafb0..f5d9bc88bb 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RetryIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RetryIT.java
@@ -22,7 +22,7 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ProcessorConfigDTO;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Arrays;
@@ -32,7 +32,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RetryIT extends NiFiSystemIT {
private static final int RETRY_COUNT = 2;
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RunOnceIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RunOnceIT.java
index db6bbc6e9e..bda3ac58ed 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RunOnceIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/processor/RunOnceIT.java
@@ -20,15 +20,17 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class RunOnceIT extends NiFiSystemIT {
- @Test(timeout = 10000L)
+ @Timeout(10)
+ @Test
public void testRunOnce() throws NiFiClientException, IOException, InterruptedException {
ProcessorEntity generate = getClientUtil().createProcessor("GenerateFlowFile");
getClientUtil().updateProcessorSchedulingPeriod(generate, "1 sec");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/provenance/ProvenanceRepositoryIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/provenance/ProvenanceRepositoryIT.java
index c36fc46fdf..5665a46bf8 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/provenance/ProvenanceRepositoryIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/provenance/ProvenanceRepositoryIT.java
@@ -25,7 +25,7 @@ import org.apache.nifi.web.api.dto.provenance.ProvenanceEventDTO;
import org.apache.nifi.web.api.dto.provenance.ProvenanceSearchValueDTO;
import org.apache.nifi.web.api.entity.ProcessorEntity;
import org.apache.nifi.web.api.entity.ProvenanceEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ProvenanceRepositoryIT extends NiFiSystemIT {
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/reportingtask/ReportingTaskIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/reportingtask/ReportingTaskIT.java
index 5b1c75ea45..c9e1fdf69f 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/reportingtask/ReportingTaskIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/reportingtask/ReportingTaskIT.java
@@ -21,7 +21,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ControllerServiceEntity;
import org.apache.nifi.web.api.entity.ReportingTaskEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/repositories/ContentAccessIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/repositories/ContentAccessIT.java
index 1a3790fcbb..bca8e1c628 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/repositories/ContentAccessIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/repositories/ContentAccessIT.java
@@ -21,7 +21,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -30,7 +30,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* This test is intended to verify that Processors are able to access the content that their FlowFiles represent in several different situations.
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/restart/FlowFileRestorationIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/restart/FlowFileRestorationIT.java
index 3cecadb91d..747103cdb7 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/restart/FlowFileRestorationIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/restart/FlowFileRestorationIT.java
@@ -23,8 +23,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -34,10 +33,11 @@ import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.Collections;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class FlowFileRestorationIT extends NiFiSystemIT {
@@ -72,12 +72,7 @@ public class FlowFileRestorationIT extends NiFiSystemIT {
nifiInstance.start();
- try {
- getNifiClient().getConnectionClient().getConnection(connection.getId());
- Assert.fail("Didn't expect to retrieve a connection");
- } catch (final NiFiClientException nfce) {
- // Expected because the connection no longer exists.
- }
+ assertThrows(NiFiClientException.class, () -> getNifiClient().getConnectionClient().getConnection(connection.getId()));
// Stop the instance, restore the flow.xml.gz, and restart
nifiInstance.stop();
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java
index 421d41b6d1..a1b98e392f 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/ClusteredRemoteProcessGroupIT.java
@@ -21,7 +21,7 @@ import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
public class ClusteredRemoteProcessGroupIT extends RemoteProcessGroupIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/RemoteProcessGroupIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/RemoteProcessGroupIT.java
index 4bc76b6e14..b25f8d1144 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/RemoteProcessGroupIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/rpg/RemoteProcessGroupIT.java
@@ -26,8 +26,7 @@ import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.PortEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
import org.apache.nifi.web.api.entity.RemoteProcessGroupEntity;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -82,9 +81,7 @@ public class RemoteProcessGroupIT extends NiFiSystemIT {
return false;
} catch (Exception e) {
- e.printStackTrace();
- Assert.fail("Could not retrieve RPG with ID " + rpgId);
- return false;
+ throw new RuntimeException("Could not retrieve RPG with ID " + rpgId);
}
});
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/validation/DependentPropertyValidationIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/validation/DependentPropertyValidationIT.java
index 8704de917b..5d58fd4e85 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/validation/DependentPropertyValidationIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/validation/DependentPropertyValidationIT.java
@@ -20,7 +20,8 @@ package org.apache.nifi.tests.system.validation;
import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.io.IOException;
import java.util.Collections;
@@ -29,7 +30,8 @@ import java.util.Map;
public class DependentPropertyValidationIT extends NiFiSystemIT {
- @Test(timeout = 20_000)
+ @Timeout(20)
+ @Test
public void testPropertyDependenciesAreValidatedProperly() throws NiFiClientException, IOException, InterruptedException {
final ProcessorEntity processor = getClientUtil().createProcessor("DependOnProperties");
getClientUtil().updateProcessorProperties(processor, Collections.singletonMap("Always Required", "foo"));
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/variables/ProcessGroupVariablesIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/variables/ProcessGroupVariablesIT.java
index 908a8a992c..3217a3ae2e 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/variables/ProcessGroupVariablesIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/variables/ProcessGroupVariablesIT.java
@@ -22,12 +22,12 @@ import org.apache.nifi.web.api.entity.ConnectionEntity;
import org.apache.nifi.web.api.entity.FlowFileEntity;
import org.apache.nifi.web.api.entity.ProcessGroupEntity;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ProcessGroupVariablesIT extends NiFiSystemIT {
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableControllerServiceSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableControllerServiceSystemIT.java
index 3cbfc3edc3..30d1df2727 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableControllerServiceSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableControllerServiceSystemIT.java
@@ -23,18 +23,18 @@ import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ControllerServiceEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ClusteredVerifiableControllerServiceSystemIT extends VerifiableControllerServiceSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableProcessorSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableProcessorSystemIT.java
index 3f3a83b58c..8f2502fab5 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableProcessorSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableProcessorSystemIT.java
@@ -23,19 +23,19 @@ import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ClusteredVerifiableProcessorSystemIT extends VerifiableProcessorSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableReportingTaskSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableReportingTaskSystemIT.java
index d24585dc5f..04a25d05a4 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableReportingTaskSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/ClusteredVerifiableReportingTaskSystemIT.java
@@ -23,19 +23,19 @@ import org.apache.nifi.tests.system.SpawnedClusterNiFiInstanceFactory;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ReportingTaskEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class ClusteredVerifiableReportingTaskSystemIT extends VerifiableReportingTaskSystemIT {
@Override
- protected NiFiInstanceFactory getInstanceFactory() {
+ public NiFiInstanceFactory getInstanceFactory() {
return new SpawnedClusterNiFiInstanceFactory(
"src/test/resources/conf/clustered/node1/bootstrap.conf",
"src/test/resources/conf/clustered/node2/bootstrap.conf");
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableControllerServiceSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableControllerServiceSystemIT.java
index 6109f382b5..3a79b0f931 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableControllerServiceSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableControllerServiceSystemIT.java
@@ -22,7 +22,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ControllerServiceEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -30,8 +30,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
@@ -88,7 +88,7 @@ public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
// Verify using attributes that should give us a successful verification
List<ConfigVerificationResultDTO> resultList = getClientUtil().verifyControllerServiceConfig(service.getId(), properties, goodAttributes);
- assertEquals("Got unexpected results: " + resultList, 7, resultList.size());
+ assertEquals(7, resultList.size());
// Should have SUCCESS for validation, then 5 successes for the steps. Then 1 skipped for the Fail on Primary Node
for (int i=0; i < resultList.size() - 1; i++) {
@@ -139,7 +139,7 @@ public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
}
@Test
- public void testVerificationWithValidConfigWhenComponentRunning() throws InterruptedException, IOException, NiFiClientException {
+ public void testVerificationWithValidConfigWhenComponentRunning() throws IOException, NiFiClientException {
final ControllerServiceEntity service = getClientUtil().createControllerService("EnsureControllerServiceConfigurationCorrect");
final Map<String, String> properties = Collections.singletonMap("Successful Verification", "true");
@@ -147,9 +147,7 @@ public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
getClientUtil().enableControllerService(service);
- assertThrows(NiFiClientException.class, () -> {
- getClientUtil().verifyControllerServiceConfig(service.getId(), properties);
- });
+ assertThrows(NiFiClientException.class, () -> getClientUtil().verifyControllerServiceConfig(service.getId(), properties));
}
@@ -179,7 +177,7 @@ public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
assertEquals(1, resultList.size());
// Even though GenerateFlowFile is not connected, it should be valid because connections are not considered when verifying the processor
- assertEquals("Unexpected results: " + resultList, Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
+ assertEquals(Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
}
@Test
@@ -189,7 +187,7 @@ public class VerifiableControllerServiceSystemIT extends NiFiSystemIT {
final List<ConfigVerificationResultDTO> resultList = getClientUtil().verifyControllerServiceConfig(service.getId(), Collections.singletonMap("Validate Sleep Time", "foo"));
assertEquals(1, resultList.size());
- assertEquals("Unexpected results: " + resultList, Outcome.FAILED.name(), resultList.get(0).getOutcome());
+ assertEquals(Outcome.FAILED.name(), resultList.get(0).getOutcome());
}
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableProcessorSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableProcessorSystemIT.java
index dbf1153374..40dc32cfac 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableProcessorSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableProcessorSystemIT.java
@@ -22,7 +22,7 @@ import org.apache.nifi.tests.system.NiFiSystemIT;
import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ProcessorEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -30,8 +30,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class VerifiableProcessorSystemIT extends NiFiSystemIT {
@@ -89,7 +89,7 @@ public class VerifiableProcessorSystemIT extends NiFiSystemIT {
// Verify using attributes that should give us a successful verification
List<ConfigVerificationResultDTO> resultList = getClientUtil().verifyProcessorConfig(processor.getId(), properties, goodAttributes);
- assertEquals("Got unexpected results: " + resultList, 7, resultList.size());
+ assertEquals(7, resultList.size());
// Should have SUCCESS for validation, then 5 successes for the steps. Then 1 skipped for the Fail on Primary Node
for (int i=0; i < resultList.size() - 1; i++) {
@@ -155,9 +155,7 @@ public class VerifiableProcessorSystemIT extends NiFiSystemIT {
getClientUtil().startProcessGroupComponents("root");
getClientUtil().waitForProcessorState(processor.getId(), "RUNNING");
- assertThrows(NiFiClientException.class, () -> {
- getClientUtil().verifyProcessorConfig(processor.getId(), properties);
- });
+ assertThrows(NiFiClientException.class, () -> getClientUtil().verifyProcessorConfig(processor.getId(), properties));
}
@Test
@@ -210,7 +208,7 @@ public class VerifiableProcessorSystemIT extends NiFiSystemIT {
assertEquals(1, resultList.size());
// Even though GenerateFlowFile is not connected, it should be valid because connections are not considered when verifying the processor
- assertEquals("Unexpected results: " + resultList, Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
+ assertEquals(Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
}
@Test
@@ -220,7 +218,7 @@ public class VerifiableProcessorSystemIT extends NiFiSystemIT {
final List<ConfigVerificationResultDTO> resultList = getClientUtil().verifyProcessorConfig(processor.getId(), Collections.singletonMap("File Size", "foo"));
assertEquals(1, resultList.size());
- assertEquals("Unexpected results: " + resultList, Outcome.FAILED.name(), resultList.get(0).getOutcome());
+ assertEquals(Outcome.FAILED.name(), resultList.get(0).getOutcome());
}
}
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableReportingTaskSystemIT.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableReportingTaskSystemIT.java
index 4b84297755..bc0f6610a7 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableReportingTaskSystemIT.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/verification/VerifiableReportingTaskSystemIT.java
@@ -23,7 +23,7 @@ import org.apache.nifi.toolkit.cli.impl.client.nifi.NiFiClientException;
import org.apache.nifi.web.api.dto.ConfigVerificationResultDTO;
import org.apache.nifi.web.api.entity.ReportingTaskEntity;
import org.apache.nifi.web.api.entity.ReportingTaskRunStatusEntity;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@@ -31,8 +31,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class VerifiableReportingTaskSystemIT extends NiFiSystemIT {
@@ -154,7 +154,7 @@ public class VerifiableReportingTaskSystemIT extends NiFiSystemIT {
assertEquals(1, resultList.size());
// Even though GenerateFlowFile is not connected, it should be valid because connections are not considered when verifying the processor
- assertEquals("Unexpected results: " + resultList, Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
+ assertEquals(Outcome.SUCCESSFUL.name(), resultList.get(0).getOutcome());
}
@Test
[nifi] 13/31: NIFI-9842 Refactored nifi-commons using JUnit 5
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 9e4e4ebec971cbfdef7f50e09f81197148f3505d
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Mar 28 11:44:13 2022 -0500
NIFI-9842 Refactored nifi-commons using JUnit 5
- Refactored nifi-bootstrap using JUnit 5
- Refactored nifi-maven-archetypes using JUnit 5
- Refactored nifi-stateless using JUnit 5
This closes #5912
Signed-off-by: Mike Thomsen <mt...@apache.org>
---
.../http/HttpNotificationServiceTest.java | 16 ++++----
.../bootstrap/util/TestSecureNiFiConfigUtil.java | 46 ++++++++++++----------
...sSecretsManagerSensitivePropertyProviderIT.java | 25 ++++++------
...zureKeyVaultKeySensitivePropertyProviderIT.java | 25 ++++++------
.../GcpKmsSensitivePropertyProviderIT.java | 25 ++++++------
.../nifi/security/krb/TestKerberosKeytabUser.java | 6 +--
.../security/krb/TestKerberosPasswordUser.java | 6 +--
.../security/krb/TestKerberosTicketCacheUser.java | 8 ++--
.../nifi/security/krb/TestKeytabConfiguration.java | 6 +--
.../stream/io/TestNonFlushableOutputStream.java | 2 +-
.../filter/SanitizeContextPathFilterTest.groovy | 34 +---------------
.../apache/nifi/web/util/WebUtilsGroovyTest.groovy | 34 +++++++---------
.../org/apache/nifi/web/util/WebUtilsTest.java | 16 +++-----
.../jaxb/TestJAXBExtensionManifestParser.java | 16 ++++----
.../nifi/runtime/manifest/TestRuntimeManifest.java | 10 ++---
.../nifi-__artifactBaseName__-processors/pom.xml | 9 ++++-
.../src/test/java/MyProcessorTest.java | 6 +--
.../nifi-__artifactBaseName__/pom.xml | 9 ++++-
.../src/test/java/TestStandardMyService.java | 6 +--
...ropertiesFileEngineConfigurationParserTest.java | 2 +-
.../engine/TestStandardStatelessEngine.java | 6 +--
.../TestStatelessFileSystemContentRepository.java | 2 +-
22 files changed, 148 insertions(+), 167 deletions(-)
diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
index 27cbd737d8..96575a9ece 100644
--- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
+++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/http/HttpNotificationServiceTest.java
@@ -31,9 +31,9 @@ import org.apache.nifi.components.PropertyValue;
import org.apache.nifi.security.util.SslContextFactory;
import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
import org.apache.nifi.security.util.TlsConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocketFactory;
@@ -56,9 +56,9 @@ import static org.apache.nifi.bootstrap.notification.http.HttpNotificationServic
import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.PROP_TRUSTSTORE_TYPE;
import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_SUBJECT_KEY;
import static org.apache.nifi.bootstrap.notification.http.HttpNotificationService.NOTIFICATION_TYPE_KEY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class HttpNotificationServiceTest {
@@ -76,12 +76,12 @@ public class HttpNotificationServiceTest {
private MockWebServer mockWebServer;
- @Before
+ @BeforeEach
public void startServer() {
mockWebServer = new MockWebServer();
}
- @After
+ @AfterEach
public void shutdownServer() throws IOException {
mockWebServer.shutdown();
}
diff --git a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
index 82cfdd3ec9..65d62f4103 100644
--- a/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
+++ b/nifi-bootstrap/src/test/java/org/apache/nifi/bootstrap/util/TestSecureNiFiConfigUtil.java
@@ -25,10 +25,9 @@ import org.apache.nifi.util.NiFiProperties;
import org.apache.nifi.util.StringUtils;
import org.bouncycastle.asn1.x509.GeneralName;
import org.bouncycastle.util.IPAddress;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,6 +49,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
public class TestSecureNiFiConfigUtil {
public static final String TEST_RESOURCE_DIR = "src/test/resources/";
private final Logger logger = LoggerFactory.getLogger("org.apache.nifi.bootstrap.util.TestSecureNiFiConfigUtil");
@@ -86,7 +90,7 @@ public class TestSecureNiFiConfigUtil {
return DigestUtils.sha256Hex(Files.readAllBytes(filepath));
}
- @Before
+ @BeforeEach
public void init() throws IOException {
nifiPropertiesFile = Files.createTempFile(PROPERTIES_PREFIX, ".properties");
TlsConfiguration tlsConfig = new TemporaryKeyStoreBuilder().build();
@@ -94,7 +98,7 @@ public class TestSecureNiFiConfigUtil {
Files.move(Paths.get(tlsConfig.getTruststorePath()), existingTruststorePath, StandardCopyOption.REPLACE_EXISTING);
}
- @After
+ @AfterEach
public void cleanUp() throws IOException {
deleteIfExists(nifiPropertiesFile);
@@ -115,29 +119,29 @@ public class TestSecureNiFiConfigUtil {
NiFiProperties niFiProperties = this.configureSecureNiFiProperties(testPropertiesFilePath);
keystorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE));
- Assert.assertTrue(keystorePath.toFile().exists());
- Assert.assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).isEmpty());
- Assert.assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE));
+ assertTrue(keystorePath.toFile().exists());
+ assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).isEmpty());
+ assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE));
char[] keyPassword = niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).toCharArray();
KeyStore keyStore = KeyStoreUtils.loadKeyStore(keystorePath.toString(),
niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_PASSWD).toCharArray(),
niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE_TYPE));
String alias = keyStore.aliases().nextElement();
- Assert.assertTrue(keyStore.isKeyEntry(alias));
+ assertTrue(keyStore.isKeyEntry(alias));
Key key = keyStore.getKey(alias, keyPassword);
- Assert.assertNotNull(key);
+ assertNotNull(key);
truststorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE));
- Assert.assertTrue(truststorePath.toFile().exists());
- Assert.assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).isEmpty());
- Assert.assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE));
+ assertTrue(truststorePath.toFile().exists());
+ assertFalse(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).isEmpty());
+ assertEquals("PKCS12", niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE));
KeyStore trustStore = KeyStoreUtils.loadKeyStore(truststorePath.toString(),
niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_PASSWD).toCharArray(),
niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE_TYPE));
String trustAlias = trustStore.aliases().nextElement();
- Assert.assertTrue(trustStore.isCertificateEntry(trustAlias));
+ assertTrue(trustStore.isCertificateEntry(trustAlias));
Certificate certificate = trustStore.getCertificate(trustAlias);
certificate.verify(certificate.getPublicKey());
@@ -147,14 +151,14 @@ public class TestSecureNiFiConfigUtil {
for(List<?> list : sans) {
String san = (String) list.get(1);
if (IPAddress.isValid(san)) {
- Assert.assertEquals(GeneralName.iPAddress, list.get(0));
+ assertEquals(GeneralName.iPAddress, list.get(0));
} else {
- Assert.assertEquals(GeneralName.dNSName, list.get(0));
+ assertEquals(GeneralName.dNSName, list.get(0));
}
foundSands.add((String) list.get(1));
}
for(String expectedSAN : expectedSANs) {
- Assert.assertTrue(foundSands.contains(expectedSAN));
+ assertTrue(foundSands.contains(expectedSAN));
}
}
}
@@ -170,11 +174,11 @@ public class TestSecureNiFiConfigUtil {
keystorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE));
truststorePath = Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE));
- Assert.assertEquals(expectKeystoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)).toFile().exists());
- Assert.assertEquals(expectTruststoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)).toFile().exists());
+ assertEquals(expectKeystoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_KEYSTORE)).toFile().exists());
+ assertEquals(expectTruststoreToExist, Paths.get(niFiProperties.getProperty(NiFiProperties.SECURITY_TRUSTSTORE)).toFile().exists());
// Show that nifi.properties was not updated
- Assert.assertEquals(getFileHash(nifiPropertiesFile), getFileHash(testPropertiesFilePath));
+ assertEquals(getFileHash(nifiPropertiesFile), getFileHash(testPropertiesFilePath));
}
@Test
diff --git a/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java
index f60a80a747..3a21561d7e 100644
--- a/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java
+++ b/nifi-commons/nifi-property-protection-aws/src/test/java/org/apache/nifi/properties/AwsSecretsManagerSensitivePropertyProviderIT.java
@@ -17,10 +17,9 @@
package org.apache.nifi.properties;
import org.apache.nifi.properties.configuration.AwsSecretsManagerClientProvider;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.internal.util.io.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +31,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* To run this test, make sure to first configure sensitive credential information as in the following link
* https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
@@ -89,18 +92,18 @@ public class AwsSecretsManagerSensitivePropertyProviderIT {
IOUtil.writeText(bootstrapConfText.toString(), mockAWSBootstrapConf.toFile());
}
- @BeforeClass
+ @BeforeAll
public static void initOnce() throws IOException {
initializeBootstrapProperties();
- Assert.assertNotNull(props);
+ assertNotNull(props);
final AwsSecretsManagerClientProvider provider = new AwsSecretsManagerClientProvider();
final Properties properties = provider.getClientProperties(props).orElse(null);
final SecretsManagerClient secretsManagerClient = provider.getClient(properties).orElse(null);
spp = new AwsSecretsManagerSensitivePropertyProvider(secretsManagerClient);
- Assert.assertNotNull(spp);
+ assertNotNull(spp);
}
- @AfterClass
+ @AfterAll
public static void tearDownOnce() throws IOException {
Files.deleteIfExists(mockBootstrapConf);
Files.deleteIfExists(mockAWSBootstrapConf);
@@ -123,8 +126,8 @@ public class AwsSecretsManagerSensitivePropertyProviderIT {
String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext(propertyName));
logger.info("Unprotected Value: " + unprotectedValue);
- Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
- Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
- Assert.assertNotEquals(protectedValue, unprotectedValue);
+ assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
+ assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
+ assertNotEquals(protectedValue, unprotectedValue);
}
}
diff --git a/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java
index 4d7bb56bf3..bd2e7e7e03 100644
--- a/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java
+++ b/nifi-commons/nifi-property-protection-azure/src/test/java/org/apache/nifi/properties/AzureKeyVaultKeySensitivePropertyProviderIT.java
@@ -18,10 +18,9 @@ package org.apache.nifi.properties;
import com.azure.security.keyvault.keys.cryptography.CryptographyClient;
import org.apache.nifi.properties.configuration.AzureCryptographyClientProvider;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.internal.util.io.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +31,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* For the purposes of running this test, if you have a key, first make sure you have configured
* credential information as in the following link
@@ -92,18 +95,18 @@ public class AzureKeyVaultKeySensitivePropertyProviderIT {
IOUtil.writeText(bootstrapConfText.toString(), mockAzureBootstrapConf.toFile());
}
- @BeforeClass
+ @BeforeAll
public static void initOnce() throws IOException {
initializeBootstrapProperties();
- Assert.assertNotNull(props);
+ assertNotNull(props);
final AzureCryptographyClientProvider provider = new AzureCryptographyClientProvider();
final Properties properties = provider.getClientProperties(props).orElse(null);
final CryptographyClient cryptographyClient = provider.getClient(properties).orElse(null);
spp = new AzureKeyVaultKeySensitivePropertyProvider(cryptographyClient, properties);
- Assert.assertNotNull(spp);
+ assertNotNull(spp);
}
- @AfterClass
+ @AfterAll
public static void tearDownOnce() throws IOException {
Files.deleteIfExists(mockBootstrapConf);
Files.deleteIfExists(mockAzureBootstrapConf);
@@ -125,8 +128,8 @@ public class AzureKeyVaultKeySensitivePropertyProviderIT {
String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext("property"));
logger.info("Unprotected Value: " + unprotectedValue);
- Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
- Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
- Assert.assertNotEquals(protectedValue, unprotectedValue);
+ assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
+ assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
+ assertNotEquals(protectedValue, unprotectedValue);
}
}
diff --git a/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java b/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java
index 60c4d04eae..a448381018 100644
--- a/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java
+++ b/nifi-commons/nifi-property-protection-gcp/src/test/java/org/apache/nifi/properties/GcpKmsSensitivePropertyProviderIT.java
@@ -18,10 +18,9 @@ package org.apache.nifi.properties;
import com.google.cloud.kms.v1.KeyManagementServiceClient;
import org.apache.nifi.properties.configuration.GoogleKeyManagementServiceClientProvider;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.internal.util.io.IOUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +31,10 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Properties;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
/**
* To run this test, make sure to first configure sensitive credential information as in the following link
* https://cloud.google.com/kms/docs/reference/libraries#cloud-console
@@ -91,18 +94,18 @@ public class GcpKmsSensitivePropertyProviderIT {
IOUtil.writeText(bootstrapConfText.toString(), mockGCPBootstrapConf.toFile());
}
- @BeforeClass
+ @BeforeAll
public static void initOnce() throws IOException {
initializeBootstrapProperties();
- Assert.assertNotNull(props);
+ assertNotNull(props);
final GoogleKeyManagementServiceClientProvider provider = new GoogleKeyManagementServiceClientProvider();
final Properties clientProperties = provider.getClientProperties(props).orElse(null);
final KeyManagementServiceClient client = provider.getClient(clientProperties).orElse(null);
spp = new GcpKmsSensitivePropertyProvider(client, clientProperties);
- Assert.assertNotNull(spp);
+ assertNotNull(spp);
}
- @AfterClass
+ @AfterAll
public static void tearDownOnce() throws IOException {
Files.deleteIfExists(mockBootstrapConf);
Files.deleteIfExists(mockGCPBootstrapConf);
@@ -124,8 +127,8 @@ public class GcpKmsSensitivePropertyProviderIT {
String unprotectedValue = spp.unprotect(protectedValue, ProtectedPropertyContext.defaultContext("property"));
logger.info("Unprotected Value: " + unprotectedValue);
- Assert.assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
- Assert.assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
- Assert.assertNotEquals(protectedValue, unprotectedValue);
+ assertEquals(SAMPLE_PLAINTEXT, unprotectedValue);
+ assertNotEquals(SAMPLE_PLAINTEXT, protectedValue);
+ assertNotEquals(protectedValue, unprotectedValue);
}
}
diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java
index 5d7c7ff03d..5e925ff213 100644
--- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java
+++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosKeytabUser.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.security.krb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.security.auth.login.AppConfigurationEntry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class TestKerberosKeytabUser {
diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java
index 422adc2265..da383e6e68 100644
--- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java
+++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosPasswordUser.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.security.krb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.security.auth.login.AppConfigurationEntry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class TestKerberosPasswordUser {
diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java
index 381a60b3e6..fa81a57a70 100644
--- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java
+++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKerberosTicketCacheUser.java
@@ -16,13 +16,13 @@
*/
package org.apache.nifi.security.krb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.security.auth.login.AppConfigurationEntry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class TestKerberosTicketCacheUser {
diff --git a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java
index 663fa06329..9d095bd12b 100644
--- a/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java
+++ b/nifi-commons/nifi-security-kerberos/src/test/java/org/apache/nifi/security/krb/TestKeytabConfiguration.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.security.krb;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import javax.security.auth.login.AppConfigurationEntry;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
public class TestKeytabConfiguration {
diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java
index 563eb1b3f1..7a266bc770 100644
--- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java
+++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/stream/io/TestNonFlushableOutputStream.java
@@ -17,7 +17,7 @@
package org.apache.nifi.stream.io;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.io.IOException;
diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
index 8727adec1f..b12e6d63d9 100644
--- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
+++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/filter/SanitizeContextPathFilterTest.groovy
@@ -16,39 +16,13 @@
*/
package org.apache.nifi.web.filter
-import org.junit.After
-import org.junit.Before
-import org.junit.BeforeClass
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import org.junit.jupiter.api.Test
import javax.servlet.FilterConfig
import javax.servlet.ServletContext
import javax.servlet.http.HttpServletRequest
-@RunWith(JUnit4.class)
-class SanitizeContextPathFilterTest extends GroovyTestCase {
- private static final Logger logger = LoggerFactory.getLogger(SanitizeContextPathFilterTest.class)
-
- @BeforeClass
- static void setUpOnce() throws Exception {
- logger.metaClass.methodMissing = { String name, args ->
- logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
- }
- }
-
- @Before
- void setUp() throws Exception {
-
- }
-
- @After
- void tearDown() throws Exception {
-
- }
+class SanitizeContextPathFilterTest {
private static String getValue(String parameterName, Map<String, String> params = [:]) {
params.containsKey(parameterName) ? params[parameterName] : ""
@@ -69,7 +43,6 @@ class SanitizeContextPathFilterTest extends GroovyTestCase {
// Act
scpf.init(mockFilterConfig)
- logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}")
// Assert
assert scpf.getAllowedContextPaths() == EXPECTED_ALLOWED_CONTEXT_PATHS
@@ -89,7 +62,6 @@ class SanitizeContextPathFilterTest extends GroovyTestCase {
// Act
scpf.init(mockFilterConfig)
- logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}")
// Assert
assert scpf.getAllowedContextPaths() == EXPECTED_ALLOWED_CONTEXT_PATHS
@@ -131,13 +103,11 @@ class SanitizeContextPathFilterTest extends GroovyTestCase {
getHeader : { String headerName -> getValue(headerName, HEADERS) },
setAttribute : { String attr, String value ->
requestAttributes[attr] = value
- logger.mock("Set request attribute ${attr} to ${value}")
},
] as HttpServletRequest
SanitizeContextPathFilter scpf = new SanitizeContextPathFilter()
scpf.init(mockFilterConfig)
- logger.info("Allowed context paths: ${scpf.getAllowedContextPaths()}")
// Act
scpf.injectContextPathAttribute(mockRequest)
diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy
index 7d7781ef2a..4bc55a24c5 100644
--- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy
+++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsGroovyTest.groovy
@@ -18,9 +18,7 @@ package org.apache.nifi.web.util
import org.apache.http.conn.ssl.DefaultHostnameVerifier
import org.glassfish.jersey.client.ClientConfig
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
+import org.junit.jupiter.api.Test
import org.mockito.Mockito
import sun.security.tools.keytool.CertAndKeyGen
import sun.security.x509.X500Name
@@ -33,8 +31,10 @@ import javax.ws.rs.client.Client
import javax.ws.rs.core.UriBuilderException
import java.security.cert.X509Certificate
-@RunWith(JUnit4.class)
-class WebUtilsGroovyTest extends GroovyTestCase {
+import static org.junit.jupiter.api.Assertions.assertThrows
+import static org.junit.jupiter.api.Assertions.assertTrue
+
+class WebUtilsGroovyTest {
static final String PCP_HEADER = "X-ProxyContextPath"
static final String FC_HEADER = "X-Forwarded-Context"
static final String FP_HEADER = "X-Forwarded-Prefix"
@@ -156,9 +156,7 @@ class WebUtilsGroovyTest extends GroovyTestCase {
def invalidContextPaths = ["/other/path", "localhost", "/../trying/to/escape"]
invalidContextPaths.each { String contextPath ->
- shouldFail(UriBuilderException) {
- WebUtils.verifyContextPath(Arrays.asList(ALLOWED_PATH), contextPath)
- }
+ assertThrows(UriBuilderException.class, () -> WebUtils.verifyContextPath(Arrays.asList(ALLOWED_PATH), contextPath))
}
}
@@ -213,7 +211,7 @@ class WebUtilsGroovyTest extends GroovyTestCase {
hostnameVerifier.verify(serverHostname, cert)
}
- @Test(expected = SSLPeerUnverifiedException)
+ @Test
void testHostnameVerifierDomainLevelMismatch() {
// Arrange
final String EXPECTED_DN = "CN=*.nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US"
@@ -226,11 +224,10 @@ class WebUtilsGroovyTest extends GroovyTestCase {
Client client = WebUtils.createClient(clientConfig, sslContext)
DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier()
- // Verify
- hostnameVerifier.verify(hostname, cert)
+ assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert))
}
- @Test(expected = SSLPeerUnverifiedException)
+ @Test
void testHostnameVerifierEmptyHostname() {
// Arrange
final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US"
@@ -243,11 +240,10 @@ class WebUtilsGroovyTest extends GroovyTestCase {
Client client = WebUtils.createClient(clientConfig, sslContext)
DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier()
- // Verify
- hostnameVerifier.verify(hostname, cert)
+ assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert))
}
- @Test(expected = SSLPeerUnverifiedException)
+ @Test
void testHostnameVerifierDifferentSubdomain() {
// Arrange
final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US"
@@ -260,11 +256,10 @@ class WebUtilsGroovyTest extends GroovyTestCase {
Client client = WebUtils.createClient(clientConfig, sslContext)
DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier()
- // Verify
- hostnameVerifier.verify(hostname, cert)
+ assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert))
}
- @Test(expected = SSLPeerUnverifiedException)
+ @Test
void testHostnameVerifierDifferentTLD() {
// Arrange
final String EXPECTED_DN = "CN=nifi.apache.org,OU=Security,O=Apache,ST=CA,C=US"
@@ -277,8 +272,7 @@ class WebUtilsGroovyTest extends GroovyTestCase {
Client client = WebUtils.createClient(clientConfig, sslContext)
DefaultHostnameVerifier hostnameVerifier = client.getHostnameVerifier()
- // Verify
- hostnameVerifier.verify(hostname, cert)
+ assertThrows(SSLPeerUnverifiedException.class, () -> hostnameVerifier.verify(hostname, cert))
}
@Test
diff --git a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java
index 2df2632297..5b35b204ad 100644
--- a/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java
+++ b/nifi-commons/nifi-web-utils/src/test/groovy/org/apache/nifi/web/util/WebUtilsTest.java
@@ -16,26 +16,24 @@
*/
package org.apache.nifi.web.util;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import javax.servlet.http.HttpServletRequest;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class WebUtilsTest {
@Mock
private HttpServletRequest request;
- // -- scheme tests
-
@Test
public void testDeterminedProxiedSchemeWhenNoHeaders() {
when(request.getHeader(any())).thenReturn(null);
@@ -55,8 +53,6 @@ public class WebUtilsTest {
assertEquals("http", WebUtils.determineProxiedScheme(request));
}
- // -- host tests
-
@Test
public void testDetermineProxiedHostWhenNoHeaders() {
when(request.getHeader(any())).thenReturn(null);
@@ -88,8 +84,6 @@ public class WebUtilsTest {
assertEquals("x-forwarded-host", WebUtils.determineProxiedHost(request));
}
- // -- port tests
-
@Test
public void testDetermineProxiedPortWhenNoHeaders() {
when(request.getServerPort()).thenReturn(443);
diff --git a/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java b/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java
index c949ecc480..f3796c1fc8 100644
--- a/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java
+++ b/nifi-manifest/nifi-extension-manifest-parser/src/test/java/org/apache/nifi/extension/manifest/parser/jaxb/TestJAXBExtensionManifestParser.java
@@ -30,25 +30,25 @@ import org.apache.nifi.extension.manifest.ResourceDefinition;
import org.apache.nifi.extension.manifest.ResourceType;
import org.apache.nifi.extension.manifest.Restriction;
import org.apache.nifi.extension.manifest.parser.ExtensionManifestParser;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestJAXBExtensionManifestParser {
private ExtensionManifestParser parser;
- @Before
+ @BeforeEach
public void setup() {
parser = new JAXBExtensionManifestParser();
}
diff --git a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
index 657d0deefa..f3eb71d294 100644
--- a/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
+++ b/nifi-manifest/nifi-runtime-manifest-test/src/test/java/org/apache/nifi/runtime/manifest/TestRuntimeManifest.java
@@ -32,7 +32,7 @@ import org.apache.nifi.c2.protocol.component.api.SchedulingDefaults;
import org.apache.nifi.components.resource.ResourceCardinality;
import org.apache.nifi.components.resource.ResourceType;
import org.apache.nifi.scheduling.SchedulingStrategy;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.FileInputStream;
import java.io.IOException;
@@ -40,10 +40,10 @@ import java.io.InputStream;
import java.util.List;
import java.util.Map;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class TestRuntimeManifest {
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml
index 200b48dd8b..7b90372016 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/pom.xml
@@ -47,8 +47,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java
index 2b709f8cde..68d92e31e6 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__-processors/src/test/java/MyProcessorTest.java
@@ -18,15 +18,15 @@ package ${package};
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MyProcessorTest {
private TestRunner testRunner;
- @Before
+ @BeforeEach
public void init() {
testRunner = TestRunners.newTestRunner(MyProcessor.class);
}
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml
index 6ff837a79a..2d85b2768e 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/pom.xml
@@ -48,8 +48,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java
index e7035f0f8f..e8c01628ce 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/src/main/resources/archetype-resources/nifi-__artifactBaseName__/src/test/java/TestStandardMyService.java
@@ -19,12 +19,12 @@ package ${package};
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class TestStandardMyService {
- @Before
+ @BeforeEach
public void init() {
}
diff --git a/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java b/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java
index ffcce51bee..32be8dc5b7 100644
--- a/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java
+++ b/nifi-stateless/nifi-stateless-api/src/test/java/org/apache/nifi/stateless/config/PropertiesFileEngineConfigurationParserTest.java
@@ -31,7 +31,7 @@ import java.nio.file.Path;
import java.util.Collection;
import java.util.Properties;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java
index 1036574ea5..c4ddb0eea6 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/engine/TestStandardStatelessEngine.java
@@ -16,12 +16,12 @@
*/
package org.apache.nifi.stateless.engine;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.time.Duration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
public class TestStandardStatelessEngine {
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java
index 3924809fd3..3e7dfeb122 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/test/java/org/apache/nifi/stateless/repository/TestStatelessFileSystemContentRepository.java
@@ -35,7 +35,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
[nifi] 27/31: NIFI-9859 Upgraded Apache Curator from 5.2.0 to 5.2.1
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 0ecc9cf314b5b9f4fb39ef5502931702a0fc439d
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Apr 1 09:23:23 2022 -0500
NIFI-9859 Upgraded Apache Curator from 5.2.0 to 5.2.1
Signed-off-by: Nathan Gough <th...@gmail.com>
This closes #5923.
---
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 1130d7ec57..39a976b8b3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -23,7 +23,7 @@
<packaging>pom</packaging>
<description>NiFi: Framework Bundle</description>
<properties>
- <curator.version>5.2.0</curator.version>
+ <curator.version>5.2.1</curator.version>
<zookeeper.version>3.5.9</zookeeper.version>
</properties>
<modules>
diff --git a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
index bb61d60f82..2d763f3625 100644
--- a/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-zookeeper-migrator/pom.xml
@@ -24,7 +24,7 @@
<version>1.16.1-SNAPSHOT</version>
</parent>
<properties>
- <curator.version>5.2.0</curator.version>
+ <curator.version>5.2.1</curator.version>
</properties>
<dependencies>
<dependency>
[nifi] 26/31: NIFI-9854: Include slf4j-api as runtime scope for nifi-stateless-system-test-suite; When constructing the classes to block for the stateless ClassLoader, allow through any classes that come from Java Home's lib/ directory
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 3b3853a0a025f74ddf783e50f810d77d922180c4
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Thu Mar 31 12:32:15 2022 -0400
NIFI-9854: Include slf4j-api as runtime scope for nifi-stateless-system-test-suite; When constructing the classes to block for the stateless ClassLoader, allow through any classes that come from Java Home's lib/ directory
This closes #5920.
Signed-off-by: Peter Turcsanyi <tu...@apache.org>
---
.../apache/nifi/stateless/bootstrap/StatelessBootstrap.java | 10 ++++++++++
nifi-system-tests/nifi-stateless-system-test-suite/pom.xml | 3 +--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/StatelessBootstrap.java b/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/StatelessBootstrap.java
index 58b1d4eaa7..ed1169c3be 100644
--- a/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/StatelessBootstrap.java
+++ b/nifi-stateless/nifi-stateless-bootstrap/src/main/java/org/apache/nifi/stateless/bootstrap/StatelessBootstrap.java
@@ -195,6 +195,11 @@ public class StatelessBootstrap {
}
private static void findClassNamesInJars(final Collection<URL> jarUrls, final Set<String> classesFound, final Set<String> jarFilesFound) throws IOException {
+ final String javaHome = System.getProperty("java.home");
+ final File javaHomeDir = new File(javaHome);
+ final File javaLib = new File(javaHomeDir, "lib");
+ final String javaLibPath = javaLib.getAbsolutePath();
+
for (final URL url : jarUrls) {
final File file;
try {
@@ -204,6 +209,11 @@ public class StatelessBootstrap {
continue;
}
+ final String absolutePath = file.getAbsolutePath();
+ if (absolutePath.startsWith(javaLibPath)) {
+ continue;
+ }
+
findClassNamesInJar(file, classesFound);
jarFilesFound.add(file.getName());
}
diff --git a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
index 04947e3f31..d8734e3e27 100644
--- a/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
+++ b/nifi-system-tests/nifi-stateless-system-test-suite/pom.xml
@@ -103,12 +103,11 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
[nifi] 23/31: NIFI-9847: Switched LifecycleState to use a WeakHashMap to track Acti… (#5917)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit d8053601572d83609aaea10bcdbb092c4c262483
Author: markap14 <ma...@hotmail.com>
AuthorDate: Wed Mar 30 15:25:14 2022 -0400
NIFI-9847: Switched LifecycleState to use a WeakHashMap to track Acti… (#5917)
* NIFI-9847: Switched LifecycleState to use a WeakHashMap to track ActiveProcessSessionFactory instances, instead of a regular Set that removed the instance after calling onTrigger. This was necessary for processors such as MergeRecord that may stash away an ActiveProcessSessionFactory for later use, as we need to be able to force rollback on processor termination
* NIFI-9847: Fixed checkstyle violation
---
.../nifi/controller/StandardProcessorNode.java | 2 +-
.../repository/StandardProcessSession.java | 306 +++++++++++----------
.../nifi/controller/scheduling/LifecycleState.java | 30 +-
.../controller/queue/FlowFileQueueContents.java | 5 +
.../controller/queue/SwappablePriorityQueue.java | 19 +-
.../clustered/SocketLoadBalancedFlowFileQueue.java | 26 +-
.../partition/StandardRebalancingPartition.java | 20 +-
.../scheduling/EventDrivenSchedulingAgent.java | 8 +-
.../scheduling/StandardProcessScheduler.java | 4 +-
.../nifi/controller/tasks/ConnectableTask.java | 2 +-
.../controller/tasks/ReportingTaskWrapper.java | 2 +-
.../stateless/engine/StatelessSchedulingAgent.java | 2 +-
12 files changed, 246 insertions(+), 180 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
index 62d8297244..f743ac530b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/StandardProcessorNode.java
@@ -1818,7 +1818,7 @@ public class StandardProcessorNode extends ProcessorNode implements Connectable
deactivateThread();
}
- scheduleState.decrementActiveThreadCount(null);
+ scheduleState.decrementActiveThreadCount();
hasActiveThreads = false;
scheduledState.set(ScheduledState.STOPPED);
future.complete(null);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index 3965b8683e..af79fabb9b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -1329,11 +1329,11 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
if (repoRecord.getOriginalQueue() != null && repoRecord.getOriginalQueue().getIdentifier() != null) {
details.append("queue=")
.append(repoRecord.getOriginalQueue().getIdentifier())
- .append("/");
+ .append(", ");
}
details.append("filename=")
.append(repoRecord.getCurrent().getAttribute(CoreAttributes.FILENAME.key()))
- .append("/uuid=")
+ .append(", uuid=")
.append(repoRecord.getCurrent().getAttribute(CoreAttributes.UUID.key()));
}
if (records.size() > MAX_ROLLBACK_FLOWFILES_TO_LOG) {
@@ -1341,7 +1341,7 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
details.append(", ");
}
details.append(records.size() - MAX_ROLLBACK_FLOWFILES_TO_LOG)
- .append(" additional Flowfiles not listed");
+ .append(" additional FlowFiles not listed");
} else if (filesListed == 0) {
details.append("none");
}
@@ -1440,8 +1440,6 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
@Override
public void migrate(final ProcessSession newOwner, final Collection<FlowFile> flowFiles) {
- verifyTaskActive();
-
if (Objects.requireNonNull(newOwner) == this) {
throw new IllegalArgumentException("Cannot migrate FlowFiles from a Process Session to itself");
}
@@ -1457,188 +1455,200 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
migrate((StandardProcessSession) newOwner, flowFiles);
}
- private void migrate(final StandardProcessSession newOwner, Collection<FlowFile> flowFiles) {
- // We don't call validateRecordState() here because we want to allow migration of FlowFiles that have already been marked as removed or transferred, etc.
- flowFiles = flowFiles.stream().map(this::getMostRecent).collect(Collectors.toList());
+ private synchronized void migrate(final StandardProcessSession newOwner, Collection<FlowFile> flowFiles) {
+ // This method will update many member variables/internal state of both `this` and `newOwner`. These member variables may also be updated during
+ // session rollback, such as when a Processor is terminated. As such, we need to ensure that we synchronize on both `this` and `newOwner` so that
+ // neither can be rolled back while we are in the process of migrating FlowFiles from one session to another.
+ //
+ // We must also ensure that we verify that both sessions are in an amenable state to perform this transference after obtaining the synchronization lock.
+ // We synchronize on 'this' by marking the method synchronized. Because the only way in which one Process Session will call into another is via this migrate() method,
+ // we do not need to worry about the order in which the synchronized lock is obtained.
+ synchronized (newOwner) {
+ verifyTaskActive();
+ newOwner.verifyTaskActive();
- for (final FlowFile flowFile : flowFiles) {
- if (openInputStreams.containsKey(flowFile)) {
- throw new IllegalStateException(flowFile + " cannot be migrated to a new Process Session because this session currently "
- + "has an open InputStream for the FlowFile, created by calling ProcessSession.read(FlowFile)");
- }
+ // We don't call validateRecordState() here because we want to allow migration of FlowFiles that have already been marked as removed or transferred, etc.
+ flowFiles = flowFiles.stream().map(this::getMostRecent).collect(Collectors.toList());
- if (openOutputStreams.containsKey(flowFile)) {
- throw new IllegalStateException(flowFile + " cannot be migrated to a new Process Session because this session currently "
- + "has an open OutputStream for the FlowFile, created by calling ProcessSession.write(FlowFile)");
- }
+ for (final FlowFile flowFile : flowFiles) {
+ if (openInputStreams.containsKey(flowFile)) {
+ throw new IllegalStateException(flowFile + " cannot be migrated to a new Process Session because this session currently "
+ + "has an open InputStream for the FlowFile, created by calling ProcessSession.read(FlowFile)");
+ }
- if (readRecursionSet.containsKey(flowFile)) {
- throw new IllegalStateException(flowFile + " already in use for an active callback or InputStream created by ProcessSession.read(FlowFile) has not been closed");
- }
- if (writeRecursionSet.contains(flowFile)) {
- throw new IllegalStateException(flowFile + " already in use for an active callback or OutputStream created by ProcessSession.write(FlowFile) has not been closed");
- }
+ if (openOutputStreams.containsKey(flowFile)) {
+ throw new IllegalStateException(flowFile + " cannot be migrated to a new Process Session because this session currently "
+ + "has an open OutputStream for the FlowFile, created by calling ProcessSession.write(FlowFile)");
+ }
- final StandardRepositoryRecord record = getRecord(flowFile);
- if (record == null) {
- throw new FlowFileHandlingException(flowFile + " is not known in this session (" + toString() + ")");
- }
- }
+ if (readRecursionSet.containsKey(flowFile)) {
+ throw new IllegalStateException(flowFile + " already in use for an active callback or InputStream created by ProcessSession.read(FlowFile) has not been closed");
+ }
+ if (writeRecursionSet.contains(flowFile)) {
+ throw new IllegalStateException(flowFile + " already in use for an active callback or OutputStream created by ProcessSession.write(FlowFile) has not been closed");
+ }
- // If we have a FORK event for one of the given FlowFiles, then all children must also be migrated. Otherwise, we
- // could have a case where we have FlowFile A transferred and eventually exiting the flow and later the 'newOwner'
- // ProcessSession is committed, claiming to have created FlowFiles from the parent, which is no longer even in
- // the flow. This would be very confusing when looking at the provenance for the FlowFile, so it is best to avoid this.
- final Set<String> flowFileIds = flowFiles.stream()
- .map(ff -> ff.getAttribute(CoreAttributes.UUID.key()))
- .collect(Collectors.toSet());
+ final StandardRepositoryRecord record = getRecord(flowFile);
+ if (record == null) {
+ throw new FlowFileHandlingException(flowFile + " is not known in this session (" + toString() + ")");
+ }
+ }
- for (final Map.Entry<FlowFile, ProvenanceEventBuilder> entry : forkEventBuilders.entrySet()) {
- final FlowFile eventFlowFile = entry.getKey();
- if (flowFiles.contains(eventFlowFile)) {
- final ProvenanceEventBuilder eventBuilder = entry.getValue();
- for (final String childId : eventBuilder.getChildFlowFileIds()) {
- if (!flowFileIds.contains(childId)) {
- throw new FlowFileHandlingException("Cannot migrate " + eventFlowFile + " to a new session because it was forked to create " + eventBuilder.getChildFlowFileIds().size()
- + " children and not all children are being migrated. If any FlowFile is forked, all of its children must also be migrated at the same time as the forked FlowFile");
+ // If we have a FORK event for one of the given FlowFiles, then all children must also be migrated. Otherwise, we
+ // could have a case where we have FlowFile A transferred and eventually exiting the flow and later the 'newOwner'
+ // ProcessSession is committed, claiming to have created FlowFiles from the parent, which is no longer even in
+ // the flow. This would be very confusing when looking at the provenance for the FlowFile, so it is best to avoid this.
+ final Set<String> flowFileIds = flowFiles.stream()
+ .map(ff -> ff.getAttribute(CoreAttributes.UUID.key()))
+ .collect(Collectors.toSet());
+
+ for (final Map.Entry<FlowFile, ProvenanceEventBuilder> entry : forkEventBuilders.entrySet()) {
+ final FlowFile eventFlowFile = entry.getKey();
+ if (flowFiles.contains(eventFlowFile)) {
+ final ProvenanceEventBuilder eventBuilder = entry.getValue();
+ for (final String childId : eventBuilder.getChildFlowFileIds()) {
+ if (!flowFileIds.contains(childId)) {
+ throw new FlowFileHandlingException("Cannot migrate " + eventFlowFile + " to a new session because it was forked to create " + eventBuilder.getChildFlowFileIds().size()
+ + " children and not all children are being migrated. If any FlowFile is forked, all of its children must also be migrated at the same time as the forked FlowFile");
+ }
}
- }
- } else {
- final ProvenanceEventBuilder eventBuilder = entry.getValue();
- for (final String childId : eventBuilder.getChildFlowFileIds()) {
- if (flowFileIds.contains(childId)) {
- throw new FlowFileHandlingException("Cannot migrate " + eventFlowFile + " to a new session because it was forked from a Parent FlowFile, but the parent is not being migrated. "
- + "If any FlowFile is forked, the parent and all children must be migrated at the same time.");
+ } else {
+ final ProvenanceEventBuilder eventBuilder = entry.getValue();
+ for (final String childId : eventBuilder.getChildFlowFileIds()) {
+ if (flowFileIds.contains(childId)) {
+ throw new FlowFileHandlingException("Cannot migrate " + eventFlowFile + " to a new session because it was forked from a Parent FlowFile, " +
+ "but the parent is not being migrated. If any FlowFile is forked, the parent and all children must be migrated at the same time.");
+ }
}
}
}
- }
- // If we have a FORK event where a FlowFile is a child of the FORK event, we want to create a FORK
- // event builder for the new owner of the FlowFile and remove the child from our fork event builder.
- final Set<FlowFile> forkedFlowFilesMigrated = new HashSet<>();
- for (final Map.Entry<FlowFile, ProvenanceEventBuilder> entry : forkEventBuilders.entrySet()) {
- final FlowFile eventFlowFile = entry.getKey();
- final ProvenanceEventBuilder eventBuilder = entry.getValue();
+ // If we have a FORK event where a FlowFile is a child of the FORK event, we want to create a FORK
+ // event builder for the new owner of the FlowFile and remove the child from our fork event builder.
+ final Set<FlowFile> forkedFlowFilesMigrated = new HashSet<>();
+ for (final Map.Entry<FlowFile, ProvenanceEventBuilder> entry : forkEventBuilders.entrySet()) {
+ final FlowFile eventFlowFile = entry.getKey();
+ final ProvenanceEventBuilder eventBuilder = entry.getValue();
- // If the FlowFile that the event is attached to is not being migrated, we should not migrate the fork event builder either.
- if (!flowFiles.contains(eventFlowFile)) {
- continue;
- }
+ // If the FlowFile that the event is attached to is not being migrated, we should not migrate the fork event builder either.
+ if (!flowFiles.contains(eventFlowFile)) {
+ continue;
+ }
- final Set<String> childrenIds = new HashSet<>(eventBuilder.getChildFlowFileIds());
+ final Set<String> childrenIds = new HashSet<>(eventBuilder.getChildFlowFileIds());
- ProvenanceEventBuilder copy = null;
- for (final FlowFile flowFile : flowFiles) {
- final String flowFileId = flowFile.getAttribute(CoreAttributes.UUID.key());
- if (childrenIds.contains(flowFileId)) {
- eventBuilder.removeChildFlowFile(flowFile);
+ ProvenanceEventBuilder copy = null;
+ for (final FlowFile flowFile : flowFiles) {
+ final String flowFileId = flowFile.getAttribute(CoreAttributes.UUID.key());
+ if (childrenIds.contains(flowFileId)) {
+ eventBuilder.removeChildFlowFile(flowFile);
- if (copy == null) {
- copy = eventBuilder.copy();
- copy.getChildFlowFileIds().clear();
+ if (copy == null) {
+ copy = eventBuilder.copy();
+ copy.getChildFlowFileIds().clear();
+ }
+ copy.addChildFlowFile(flowFileId);
}
- copy.addChildFlowFile(flowFileId);
}
- }
- if (copy != null) {
- newOwner.forkEventBuilders.put(eventFlowFile, copy);
- forkedFlowFilesMigrated.add(eventFlowFile);
+ if (copy != null) {
+ newOwner.forkEventBuilders.put(eventFlowFile, copy);
+ forkedFlowFilesMigrated.add(eventFlowFile);
+ }
}
- }
- forkedFlowFilesMigrated.forEach(forkEventBuilders::remove);
+ forkedFlowFilesMigrated.forEach(forkEventBuilders::remove);
- newOwner.processingStartTime = Math.min(newOwner.processingStartTime, processingStartTime);
+ newOwner.processingStartTime = Math.min(newOwner.processingStartTime, processingStartTime);
- for (final FlowFile flowFile : flowFiles) {
- final FlowFileRecord flowFileRecord = (FlowFileRecord) flowFile;
+ for (final FlowFile flowFile : flowFiles) {
+ final FlowFileRecord flowFileRecord = (FlowFileRecord) flowFile;
- final long flowFileId = flowFile.getId();
- final StandardRepositoryRecord repoRecord = this.records.remove(flowFileId);
- newOwner.records.put(flowFileId, repoRecord);
+ final long flowFileId = flowFile.getId();
+ final StandardRepositoryRecord repoRecord = this.records.remove(flowFileId);
+ newOwner.records.put(flowFileId, repoRecord);
- final Collection<Long> linkedIds = this.flowFileLinkage.remove(flowFileId);
- if (linkedIds != null) {
- linkedIds.forEach(linkedId -> newOwner.flowFileLinkage.addLink(flowFileId, linkedId));
- }
+ final Collection<Long> linkedIds = this.flowFileLinkage.remove(flowFileId);
+ if (linkedIds != null) {
+ linkedIds.forEach(linkedId -> newOwner.flowFileLinkage.addLink(flowFileId, linkedId));
+ }
- // Adjust the counts for Connections for each FlowFile that was pulled from a Connection.
- // We do not have to worry about accounting for 'input counts' on connections because those
- // are incremented only during a checkpoint, and anything that's been checkpointed has
- // also been committed above.
- final FlowFileQueue inputQueue = repoRecord.getOriginalQueue();
- if (inputQueue != null) {
- final String connectionId = inputQueue.getIdentifier();
- incrementConnectionOutputCounts(connectionId, -1, -repoRecord.getOriginal().getSize());
- newOwner.incrementConnectionOutputCounts(connectionId, 1, repoRecord.getOriginal().getSize());
+ // Adjust the counts for Connections for each FlowFile that was pulled from a Connection.
+ // We do not have to worry about accounting for 'input counts' on connections because those
+ // are incremented only during a checkpoint, and anything that's been checkpointed has
+ // also been committed above.
+ final FlowFileQueue inputQueue = repoRecord.getOriginalQueue();
+ if (inputQueue != null) {
+ final String connectionId = inputQueue.getIdentifier();
+ incrementConnectionOutputCounts(connectionId, -1, -repoRecord.getOriginal().getSize());
+ newOwner.incrementConnectionOutputCounts(connectionId, 1, repoRecord.getOriginal().getSize());
- unacknowledgedFlowFiles.get(inputQueue).remove(flowFile);
- newOwner.unacknowledgedFlowFiles.computeIfAbsent(inputQueue, queue -> new HashSet<>()).add(flowFileRecord);
+ unacknowledgedFlowFiles.get(inputQueue).remove(flowFile);
+ newOwner.unacknowledgedFlowFiles.computeIfAbsent(inputQueue, queue -> new HashSet<>()).add(flowFileRecord);
- flowFilesIn--;
- contentSizeIn -= flowFile.getSize();
+ flowFilesIn--;
+ contentSizeIn -= flowFile.getSize();
- newOwner.flowFilesIn++;
- newOwner.contentSizeIn += flowFile.getSize();
- }
+ newOwner.flowFilesIn++;
+ newOwner.contentSizeIn += flowFile.getSize();
+ }
- final String flowFileUuid = flowFile.getAttribute(CoreAttributes.UUID.key());
- if (removedFlowFiles.remove(flowFileUuid)) {
- newOwner.removedFlowFiles.add(flowFileUuid);
- newOwner.removedCount++;
- newOwner.removedBytes += flowFile.getSize();
+ final String flowFileUuid = flowFile.getAttribute(CoreAttributes.UUID.key());
+ if (removedFlowFiles.remove(flowFileUuid)) {
+ newOwner.removedFlowFiles.add(flowFileUuid);
+ newOwner.removedCount++;
+ newOwner.removedBytes += flowFile.getSize();
- removedCount--;
- removedBytes -= flowFile.getSize();
- }
+ removedCount--;
+ removedBytes -= flowFile.getSize();
+ }
- if (createdFlowFiles.remove(flowFileUuid)) {
- newOwner.createdFlowFiles.add(flowFileUuid);
- }
+ if (createdFlowFiles.remove(flowFileUuid)) {
+ newOwner.createdFlowFiles.add(flowFileUuid);
+ }
- if (repoRecord.getTransferRelationship() != null) {
- final Relationship transferRelationship = repoRecord.getTransferRelationship();
- final Collection<Connection> destinations = context.getConnections(transferRelationship);
- final int numDestinations = destinations.size();
- final boolean autoTerminated = numDestinations == 0 && context.getConnectable().isAutoTerminated(transferRelationship);
+ if (repoRecord.getTransferRelationship() != null) {
+ final Relationship transferRelationship = repoRecord.getTransferRelationship();
+ final Collection<Connection> destinations = context.getConnections(transferRelationship);
+ final int numDestinations = destinations.size();
+ final boolean autoTerminated = numDestinations == 0 && context.getConnectable().isAutoTerminated(transferRelationship);
- if (autoTerminated) {
- removedCount--;
- removedBytes -= flowFile.getSize();
+ if (autoTerminated) {
+ removedCount--;
+ removedBytes -= flowFile.getSize();
- newOwner.removedCount++;
- newOwner.removedBytes += flowFile.getSize();
- } else {
- flowFilesOut--;
- contentSizeOut -= flowFile.getSize();
+ newOwner.removedCount++;
+ newOwner.removedBytes += flowFile.getSize();
+ } else {
+ flowFilesOut--;
+ contentSizeOut -= flowFile.getSize();
- newOwner.flowFilesOut++;
- newOwner.contentSizeOut += flowFile.getSize();
+ newOwner.flowFilesOut++;
+ newOwner.contentSizeOut += flowFile.getSize();
+ }
}
- }
- final List<ProvenanceEventRecord> events = generatedProvenanceEvents.remove(flowFile);
- if (events != null) {
- newOwner.generatedProvenanceEvents.put(flowFile, events);
- }
+ final List<ProvenanceEventRecord> events = generatedProvenanceEvents.remove(flowFile);
+ if (events != null) {
+ newOwner.generatedProvenanceEvents.put(flowFile, events);
+ }
- final ContentClaim currentClaim = repoRecord.getCurrentClaim();
- if (currentClaim != null) {
- final ByteCountingOutputStream appendableStream = appendableStreams.remove(currentClaim);
- if (appendableStream != null) {
- newOwner.appendableStreams.put(currentClaim, appendableStream);
+ final ContentClaim currentClaim = repoRecord.getCurrentClaim();
+ if (currentClaim != null) {
+ final ByteCountingOutputStream appendableStream = appendableStreams.remove(currentClaim);
+ if (appendableStream != null) {
+ newOwner.appendableStreams.put(currentClaim, appendableStream);
+ }
}
- }
- final Path toDelete = deleteOnCommit.remove(flowFile);
- if (toDelete != null) {
- newOwner.deleteOnCommit.put(flowFile, toDelete);
+ final Path toDelete = deleteOnCommit.remove(flowFile);
+ if (toDelete != null) {
+ newOwner.deleteOnCommit.put(flowFile, toDelete);
+ }
}
- }
- provenanceReporter.migrate(newOwner.provenanceReporter, flowFileIds);
+ provenanceReporter.migrate(newOwner.provenanceReporter, flowFileIds);
+ }
}
@@ -1793,11 +1803,7 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
flowFilesIn++;
contentSizeIn += flowFile.getSize();
- Set<FlowFileRecord> set = unacknowledgedFlowFiles.get(connection.getFlowFileQueue());
- if (set == null) {
- set = new HashSet<>();
- unacknowledgedFlowFiles.put(connection.getFlowFileQueue(), set);
- }
+ final Set<FlowFileRecord> set = unacknowledgedFlowFiles.computeIfAbsent(connection.getFlowFileQueue(), k -> new HashSet<>());
set.add(flowFile);
incrementConnectionOutputCounts(connection, flowFile);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/LifecycleState.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/LifecycleState.java
index c2dd4e0eda..c5b78c95fd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/LifecycleState.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/scheduling/LifecycleState.java
@@ -23,7 +23,9 @@ import org.apache.nifi.processor.exception.TerminatedTaskException;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
+import java.util.WeakHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -36,7 +38,7 @@ public class LifecycleState {
private final AtomicBoolean mustCallOnStoppedMethods = new AtomicBoolean(false);
private volatile long lastStopTime = -1;
private volatile boolean terminated = false;
- private final Set<ActiveProcessSessionFactory> activeProcessSessionFactories = Collections.synchronizedSet(new HashSet<>());
+ private final Map<ActiveProcessSessionFactory, Object> activeProcessSessionFactories = new WeakHashMap<>();
public synchronized int incrementActiveThreadCount(final ActiveProcessSessionFactory sessionFactory) {
if (terminated) {
@@ -44,21 +46,29 @@ public class LifecycleState {
}
if (sessionFactory != null) {
- activeProcessSessionFactories.add(sessionFactory);
+ // If a session factory is provided, add it to our WeakHashMap. The value that we use is not relevant,
+ // as this just serves, essentially, as a WeakHashSet, but there is no WeakHashSet implementation.
+ // We need to keep track of any ActiveProcessSessionFactory that has been created for this component,
+ // as long as the session factory has not been garbage collected. This is important because when we offload
+ // a node, we will terminate all active processors and we need the ability to terminate any active sessions
+ // at that time. We cannot simply store a Set of all ActiveProcessSessionFactories and then remove them in the
+ // decrementActiveThreadCount because a Processor may choose to continue using the ProcessSessionFactory even after
+ // returning from its onTrigger method.
+ //
+ // For example, it may stash the ProcessSessionFactory away in a member variable in order to aggregate FlowFiles across
+ // many onTrigger invocations. In this case, we need the ability to force the rollback of any created session upon Processor
+ // termination.
+ activeProcessSessionFactories.put(sessionFactory, null);
}
return activeThreadCount.incrementAndGet();
}
- public synchronized int decrementActiveThreadCount(final ActiveProcessSessionFactory sessionFactory) {
+ public synchronized int decrementActiveThreadCount() {
if (terminated) {
return activeThreadCount.get();
}
- if (sessionFactory != null) {
- activeProcessSessionFactories.remove(sessionFactory);
- }
-
return activeThreadCount.decrementAndGet();
}
@@ -85,8 +95,7 @@ public class LifecycleState {
@Override
public String toString() {
- return new StringBuilder().append("activeThreads:").append(activeThreadCount.get()).append("; ")
- .append("scheduled:").append(scheduled.get()).append("; ").toString();
+ return "LifecycleState[activeThreads= " + activeThreadCount.get() + ", scheduled=" + scheduled.get() + "]";
}
/**
@@ -123,7 +132,8 @@ public class LifecycleState {
this.terminated = true;
activeThreadCount.set(0);
- for (final ActiveProcessSessionFactory factory : activeProcessSessionFactories) {
+ // Terminate any active sessions.
+ for (final ActiveProcessSessionFactory factory : activeProcessSessionFactories.keySet()) {
factory.terminateActiveSessions();
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/FlowFileQueueContents.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/FlowFileQueueContents.java
index 60ad64d838..79fffab005 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/FlowFileQueueContents.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/FlowFileQueueContents.java
@@ -43,4 +43,9 @@ public class FlowFileQueueContents {
public QueueSize getSwapSize() {
return swapSize;
}
+
+ @Override
+ public String toString() {
+ return "FlowFileQueueContents[swapLocations=" + swapLocations + ", swapSize=" + swapSize + ", activeFlowFiles=" + activeFlowFiles + "]";
+ }
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
index c8f2b18199..d4199453e1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/SwappablePriorityQueue.java
@@ -501,7 +501,12 @@ public class SwappablePriorityQueue {
}
public void acknowledge(final Collection<FlowFileRecord> flowFiles) {
- logger.trace("{} Acknowledging {}", this, flowFiles);
+ if (logger.isTraceEnabled()) {
+ for (final FlowFileRecord flowFile : flowFiles) {
+ logger.trace("{} Acknowledging {}", this, flowFile);
+ }
+ }
+
final long totalSize = flowFiles.stream().mapToLong(FlowFileRecord::getSize).sum();
incrementUnacknowledgedQueueSize(-flowFiles.size(), -totalSize);
}
@@ -627,8 +632,10 @@ public class SwappablePriorityQueue {
writeLock.unlock("poll(int, Set)");
}
- if (!records.isEmpty()) {
- logger.trace("{} poll() returning {}", this, records);
+ if (!records.isEmpty() && logger.isTraceEnabled()) {
+ for (final FlowFileRecord flowFile : records) {
+ logger.trace("{} poll() returning {}", this, flowFile);
+ }
}
return records;
@@ -690,8 +697,10 @@ public class SwappablePriorityQueue {
this.activeQueue.addAll(unselected);
incrementActiveQueueSize(-flowFilesPulled, -bytesPulled);
- if (!selectedFlowFiles.isEmpty()) {
- logger.trace("{} poll() returning {}", this, selectedFlowFiles);
+ if (!selectedFlowFiles.isEmpty() && logger.isTraceEnabled()) {
+ for (final FlowFileRecord flowFile : selectedFlowFiles) {
+ logger.trace("{} poll() returning {}", this, flowFile);
+ }
}
return selectedFlowFiles;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
index 2a0c504afd..9c58575a8f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/SocketLoadBalancedFlowFileQueue.java
@@ -244,7 +244,10 @@ public class SocketLoadBalancedFlowFileQueue extends AbstractFlowFileQueue imple
return;
}
- logger.debug("Setting queue {} on node {} as offloaded", this, clusterCoordinator.getLocalNodeIdentifier());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Setting queue {} on node {} as offloaded. Current size: {}, Partition Sizes: {}", this, clusterCoordinator.getLocalNodeIdentifier(), size(), getPartitionSizes());
+ }
+
offloaded = true;
partitionWriteLock.lock();
@@ -271,11 +274,30 @@ public class SocketLoadBalancedFlowFileQueue extends AbstractFlowFileQueue imple
// Update our partitioner so that we don't keep any data on the local partition
setFlowFilePartitioner(new NonLocalPartitionPartitioner());
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Queue {} has now updated Partition on node {} for offload. Current size: {}, Partition Sizes: {}",
+ this, clusterCoordinator.getLocalNodeIdentifier(), size(), getPartitionSizes());
+ }
} finally {
partitionWriteLock.unlock();
}
}
+ private Map<QueuePartition, QueueSize> getPartitionSizes() {
+ partitionReadLock.lock();
+ try {
+ final Map<QueuePartition, QueueSize> sizeMap = new HashMap<>();
+ for (final QueuePartition partition : queuePartitions) {
+ sizeMap.put(partition, partition.size());
+ }
+
+ return sizeMap;
+ } finally {
+ partitionReadLock.unlock();
+ }
+ }
+
@Override
public void resetOffloadedQueue() {
if (clusterCoordinator == null) {
@@ -899,7 +921,7 @@ public class SocketLoadBalancedFlowFileQueue extends AbstractFlowFileQueue imple
final List<FlowFileRecord> flowFileList = (flowFiles instanceof List) ? (List<FlowFileRecord>) flowFiles : new ArrayList<>(flowFiles);
partitionMap = Collections.singletonMap(partition, flowFileList);
- logger.debug("Partitioner is static so Partitioned FlowFiles as: {}", partitionMap);
+ logger.debug("Partitioner {} is static so Partitioned FlowFiles as: {}", partitioner, partitionMap);
return partitionMap;
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/StandardRebalancingPartition.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/StandardRebalancingPartition.java
index de46d1716d..ce0f8e3f53 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/StandardRebalancingPartition.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/partition/StandardRebalancingPartition.java
@@ -30,6 +30,8 @@ import org.apache.nifi.controller.repository.FlowFileSwapManager;
import org.apache.nifi.controller.repository.SwapSummary;
import org.apache.nifi.events.EventReporter;
import org.apache.nifi.flowfile.FlowFilePrioritizer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collection;
@@ -39,7 +41,9 @@ import java.util.Optional;
import java.util.Set;
public class StandardRebalancingPartition implements RebalancingPartition {
- private final String SWAP_PARTITION_NAME = "rebalance";
+ private static final Logger logger = LoggerFactory.getLogger(StandardRebalancingPartition.class);
+ private static final String SWAP_PARTITION_NAME = "rebalance";
+
private final String queueIdentifier;
private final BlockingSwappablePriorityQueue queue;
private final LoadBalancedFlowFileQueue flowFileQueue;
@@ -127,11 +131,13 @@ public class StandardRebalancingPartition implements RebalancingPartition {
private synchronized void rebalanceFromQueue() {
if (stopped) {
+ logger.debug("Will not rebalance from queue because {} is stopped", this);
return;
}
// If a task is already defined, do nothing. There's already a thread running.
if (rebalanceTask != null) {
+ logger.debug("Rebalance Task already exists for {}", this);
return;
}
@@ -140,6 +146,7 @@ public class StandardRebalancingPartition implements RebalancingPartition {
final Thread rebalanceThread = new Thread(this.rebalanceTask);
rebalanceThread.setName("Rebalance queued data for Connection " + queueIdentifier);
rebalanceThread.start();
+ logger.debug("No Rebalance Task currently exists for {}. Starting new Rebalance Thread {}", this, rebalanceThread);
}
@Override
@@ -148,12 +155,16 @@ public class StandardRebalancingPartition implements RebalancingPartition {
return;
}
+ logger.debug("Adding {} to Rebalance queue for {}", queueContents, this);
+
queue.inheritQueueContents(queueContents);
rebalanceFromQueue();
}
@Override
public void rebalance(final Collection<FlowFileRecord> flowFiles) {
+ logger.debug("Adding {} to Rebalance queue for {}", flowFiles, this);
+
queue.putAll(flowFiles);
rebalanceFromQueue();
}
@@ -163,7 +174,7 @@ public class StandardRebalancingPartition implements RebalancingPartition {
return queue.packageForRebalance(newPartitionName);
}
- private synchronized boolean complete() {
+ private synchronized boolean isComplete() {
if (!queue.isEmpty()) {
return false;
}
@@ -201,7 +212,8 @@ public class StandardRebalancingPartition implements RebalancingPartition {
if (polled == null) {
flowFileQueue.handleExpiredRecords(expiredRecords);
- if (complete()) {
+ if (isComplete()) {
+ logger.debug("Rebalance Task completed for {}", this);
return;
} else {
continue;
@@ -217,6 +229,8 @@ public class StandardRebalancingPartition implements RebalancingPartition {
flowFileQueue.handleExpiredRecords(expiredRecords);
+ logger.debug("{} Rebalancing {}", this, toDistribute);
+
// Transfer all of the FlowFiles that we got back to the FlowFileQueue itself. This will cause the data to be
// re-partitioned and binned appropriately. We also then need to ensure that we acknowledge the data from our
// own SwappablePriorityQueue to ensure that the sizes are kept in check.
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
index 4ccccd98db..6751663ea6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/EventDrivenSchedulingAgent.java
@@ -316,7 +316,7 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
// reaching the maximum number of threads. we won't know this until we atomically increment the thread count
// on the Schedule State, so we check it here. in this case, we cannot trigger the Processor, as doing so would
// result in using more than the maximum number of defined threads
- scheduleState.decrementActiveThreadCount(sessionFactory);
+ scheduleState.decrementActiveThreadCount();
return;
}
@@ -344,7 +344,7 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
}
}
- scheduleState.decrementActiveThreadCount(sessionFactory);
+ scheduleState.decrementActiveThreadCount();
}
}
@@ -357,7 +357,7 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
// reaching the maximum number of threads. we won't know this until we atomically increment the thread count
// on the Schedule State, so we check it here. in this case, we cannot trigger the Processor, as doing so would
// result in using more than the maximum number of defined threads
- scheduleState.decrementActiveThreadCount(sessionFactory);
+ scheduleState.decrementActiveThreadCount();
return;
}
@@ -386,7 +386,7 @@ public class EventDrivenSchedulingAgent extends AbstractSchedulingAgent {
}
}
- scheduleState.decrementActiveThreadCount(sessionFactory);
+ scheduleState.decrementActiveThreadCount();
}
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index 8062122ab6..a7dc11885d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -343,7 +343,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
@Override
public void onTaskComplete() {
- lifecycleState.decrementActiveThreadCount(null);
+ lifecycleState.decrementActiveThreadCount();
}
};
@@ -383,7 +383,7 @@ public final class StandardProcessScheduler implements ProcessScheduler {
@Override
public void onTaskComplete() {
- lifecycleState.decrementActiveThreadCount(null);
+ lifecycleState.decrementActiveThreadCount();
}
};
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
index 5ade471c29..9b2a5552d8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ConnectableTask.java
@@ -283,7 +283,7 @@ public class ConnectableTask {
logger.error("", e);
}
} finally {
- scheduleState.decrementActiveThreadCount(activeSessionFactory);
+ scheduleState.decrementActiveThreadCount();
Thread.currentThread().setName(originalThreadName);
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
index b60302ab37..58ce022501 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/tasks/ReportingTaskWrapper.java
@@ -58,7 +58,7 @@ public class ReportingTaskWrapper implements Runnable {
}
}
} finally {
- lifecycleState.decrementActiveThreadCount(null);
+ lifecycleState.decrementActiveThreadCount();
}
}
}
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
index c77204798f..94dc01cfc5 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/engine/StatelessSchedulingAgent.java
@@ -88,7 +88,7 @@ public class StatelessSchedulingAgent implements SchedulingAgent {
try {
taskNode.getReportingTask().onTrigger(taskNode.getReportingContext());
} finally {
- scheduleState.decrementActiveThreadCount(null);
+ scheduleState.decrementActiveThreadCount();
}
} catch (final Throwable t) {
[nifi] 05/31: NIFI-9827: Upgrading AWS Java SDK to 1.12.182 to pick up new AWS Regions
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 817434a9417fd9a8851f54eb6a55755ad3b0823c
Author: Joe Gresock <jg...@gmail.com>
AuthorDate: Wed Mar 23 13:26:10 2022 -0400
NIFI-9827: Upgrading AWS Java SDK to 1.12.182 to pick up new AWS Regions
This closes #5892
Signed-off-by: Chris Sampson <ch...@gmail.com>
---
nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 6e3554a9ea..14bc68c489 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
<properties>
<!-- keep AWS 1.x until NIFI-8287 -->
- <aws-java-sdk-version>1.12.133</aws-java-sdk-version>
+ <aws-java-sdk-version>1.12.182</aws-java-sdk-version>
<!-- keep KCL 1.x until NIFI-8531 (blocked by NIFI-8287) -->
<aws-kinesis-client-library-version>1.14.7</aws-kinesis-client-library-version>
</properties>
[nifi] 18/31: NIFI-9844 Refactored Encryptor tests using JUnit 5
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ba27edd33e32a48ca0ddaf81f45bcbce27f38566
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Mar 28 23:05:09 2022 -0500
NIFI-9844 Refactored Encryptor tests using JUnit 5
- Refactored Keyed and Password Based Encryptor tests from Groovy to Java
Signed-off-by: Nathan Gough <th...@gmail.com>
This closes #5913.
---
.../util/crypto/KeyedEncryptorGroovyTest.groovy | 254 --------
.../crypto/PasswordBasedEncryptorGroovyTest.groovy | 699 ---------------------
.../security/util/crypto/KeyedEncryptorTest.java | 117 ++++
.../util/crypto/OpenPGPKeyBasedEncryptorTest.java | 130 +---
.../crypto/OpenPGPPasswordBasedEncryptorTest.java | 125 +---
.../util/crypto/PasswordBasedEncryptorTest.java | 240 +++++++
6 files changed, 402 insertions(+), 1163 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
deleted file mode 100644
index ab2d0f7759..0000000000
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License") you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.security.util.crypto
-
-import org.apache.commons.codec.binary.Hex
-import org.apache.nifi.processor.exception.ProcessException
-import org.apache.nifi.processor.io.StreamCallback
-import org.apache.nifi.security.util.EncryptionMethod
-import org.apache.nifi.security.util.KeyDerivationFunction
-import org.apache.nifi.stream.io.exception.BytePatternNotFoundException
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.junit.BeforeClass
-import org.junit.Test
-import org.junit.Assert
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import javax.crypto.SecretKey
-import javax.crypto.spec.SecretKeySpec
-import java.nio.charset.StandardCharsets
-import java.security.Security
-
-class KeyedEncryptorGroovyTest {
- private static final Logger logger = LoggerFactory.getLogger(KeyedEncryptorGroovyTest.class)
-
- private static final String TEST_RESOURCES_PREFIX = "src/test/resources/TestEncryptContent/"
-
- private static final String KEY_HEX = "0123456789ABCDEFFEDCBA9876543210"
- private static final SecretKey KEY = new SecretKeySpec(Hex.decodeHex(KEY_HEX as char[]), "AES")
-
- @BeforeClass
- static void setUpOnce() throws Exception {
- Security.addProvider(new BouncyCastleProvider())
-
- logger.metaClass.methodMissing = { String name, args ->
- logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
- }
- }
-
- @Test
- void testShouldEncryptAndDecrypt() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message."
- logger.info("Plaintext: {}", PLAINTEXT)
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- logger.info("Using ${encryptionMethod.name()}")
-
- // Act
- KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, KEY)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- logger.info("Encrypted: {}", Hex.encodeHexString(cipherBytes))
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
- decryptionCallback.process(cipherInputStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}\n\n", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- @Test
- void testShouldDecryptOpenSSLUnsaltedCipherTextWithKnownIV() throws Exception {
- // Arrange
- final String PLAINTEXT = new File("${TEST_RESOURCES_PREFIX}/plain.txt").text
- logger.info("Plaintext: {}", PLAINTEXT)
- byte[] cipherBytes = new File("${TEST_RESOURCES_PREFIX}/unsalted_128_raw.enc").bytes
-
- final String keyHex = "711E85689CE7AFF6F410AEA43ABC5446"
- final String ivHex = "842F685B84879B2E00F977C22B9E9A7D"
-
- InputStream cipherStream = new ByteArrayInputStream(cipherBytes)
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, new SecretKeySpec(Hex.decodeHex(keyHex as char[]), "AES"), Hex.decodeHex(ivHex as char[]))
-
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
- logger.info("Cipher bytes: ${Hex.encodeHexString(cipherBytes)}")
-
- // Act
- decryptionCallback.process(cipherStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- /**
- * This test demonstrates that if incoming cipher text was generated by a cipher using PBE with
- * KDF, the salt can be skipped and the cipher bytes can still be decrypted using keyed encryption.
- * @throws Exception
- */
- @Test
- void testShouldSkipSaltOnDecrypt() throws Exception {
- final String PASSWORD = "thisIsABadPassword"
-
- final String PLAINTEXT = "This is a plaintext message."
- logger.info("Plaintext: {}", PLAINTEXT)
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- int keyLength = CipherUtility.parseKeyLengthFromAlgorithm(encryptionMethod.algorithm)
- logger.info("Using ${encryptionMethod.name()} with key length ${keyLength} bits")
-
- // The PBE encryptor encrypts the data and prepends the salt and IV
- PasswordBasedEncryptor passwordBasedEncryptor = new PasswordBasedEncryptor(EncryptionMethod.AES_CBC, PASSWORD.toCharArray(), KeyDerivationFunction.ARGON2)
- StreamCallback encryptionCallback = passwordBasedEncryptor.getEncryptionCallback()
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- logger.info("Encrypted: {}", Hex.encodeHexString(cipherBytes))
-
- // Derive the decryption key manually from the provided salt & password
- String kdfSalt = passwordBasedEncryptor.flowfileAttributes.get("encryptcontent.kdf_salt")
- def costs = parseArgon2CostParamsFromSalt(kdfSalt)
- SecureHasher secureHasher = new Argon2SecureHasher(keyLength / 8 as int, costs.m, costs.p, costs.t)
- byte[] argon2DerivedKeyBytes = secureHasher.hashRaw(PASSWORD.getBytes(StandardCharsets.UTF_8), Argon2CipherProvider.extractRawSaltFromArgon2Salt(kdfSalt))
- logger.sanity("Derived key bytes: ${Hex.encodeHexString(argon2DerivedKeyBytes)}")
-
- // The keyed encryptor will attempt to decrypt the content, skipping the salt
- KeyedEncryptor keyedEncryptor = new KeyedEncryptor(encryptionMethod, argon2DerivedKeyBytes)
- StreamCallback decryptionCallback = keyedEncryptor.getDecryptionCallback()
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
-
- // Act
- decryptionCallback.process(cipherInputStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}\n\n", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- @Test
- void testShouldParseCostParams() {
- // Arrange
- String argon2Salt = "\$argon2id\$v=19\$m=4096,t=3,p=1\$i8CIuSjrwdSuR42pb15AoQ"
-
- // Act
- def cost = parseArgon2CostParamsFromSalt(argon2Salt)
- logger.info("Parsed cost: ${cost}")
-
- // Assert
- assert cost == [m: 4096, t: 3, p: 1]
- }
-
- static Map<String, Integer> parseArgon2CostParamsFromSalt(String kdfSalt) {
- kdfSalt.tokenize("\$")[2].split(",").collectEntries {
- def l = it.split("=")
- [l.first(), Integer.valueOf(l.last())]
- }
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingIV() {
- // Arrange
- KeyedCipherProvider cipherProvider = CipherProviderFactory.getCipherProvider(KeyDerivationFunction.NONE)
- final String IV_DELIMITER = new String(cipherProvider.IV_DELIMITER, StandardCharsets.UTF_8)
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
-
- // Act
- KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, KEY)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
-
- // Remove IV
- final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
- final byte[] removedIVCipherBytes = cipherString.split(IV_DELIMITER)[1].getBytes(StandardCharsets.UTF_8)
-
- InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherBytes)
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingIVDelimiter() {
- // Arrange
- KeyedCipherProvider cipherProvider = CipherProviderFactory.getCipherProvider(KeyDerivationFunction.NONE)
- final String IV_DELIMITER = new String(cipherProvider.IV_DELIMITER, StandardCharsets.UTF_8)
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
-
- // Act
- KeyedEncryptor encryptor = new KeyedEncryptor(encryptionMethod, KEY)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
-
- // Remove IV Delimiter
- final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
- final byte[] removedIVDelimiterCipherBytes = cipherString.split(IV_DELIMITER)[1].getBytes(StandardCharsets.UTF_8)
-
- InputStream cipherInputStream = new ByteArrayInputStream(removedIVDelimiterCipherBytes)
-
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
- }
-}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
deleted file mode 100644
index d79474e444..0000000000
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
+++ /dev/null
@@ -1,699 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License") you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.nifi.security.util.crypto
-
-import org.apache.commons.codec.binary.Hex
-import org.apache.nifi.processor.exception.ProcessException
-import org.apache.nifi.processor.io.StreamCallback
-import org.apache.nifi.processors.standard.TestEncryptContentGroovy
-import org.apache.nifi.security.util.EncryptionMethod
-import org.apache.nifi.security.util.KeyDerivationFunction
-import org.apache.nifi.stream.io.ByteCountingInputStream
-import org.apache.nifi.stream.io.ByteCountingOutputStream
-import org.apache.nifi.stream.io.exception.BytePatternNotFoundException
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import org.junit.Assume
-import org.junit.BeforeClass
-import org.junit.Test
-import org.junit.Assert
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-
-import javax.crypto.Cipher
-import java.nio.charset.StandardCharsets
-import java.security.MessageDigest
-import java.security.Security
-
-class PasswordBasedEncryptorGroovyTest {
- private static final Logger logger = LoggerFactory.getLogger(PasswordBasedEncryptorGroovyTest.class)
-
- private static final String TEST_RESOURCES_PREFIX = "src/test/resources/TestEncryptContent/"
- private static final File plainFile = new File("${TEST_RESOURCES_PREFIX}/plain.txt")
- private static final File encryptedFile = new File("${TEST_RESOURCES_PREFIX}/salted_128_raw.asc")
-
- private static final String PASSWORD = "thisIsABadPassword"
- private static final String LEGACY_PASSWORD = "Hello, World!"
-
- @BeforeClass
- static void setUpOnce() throws Exception {
- Security.addProvider(new BouncyCastleProvider())
-
- logger.metaClass.methodMissing = { String name, args ->
- logger.info("[${name?.toUpperCase()}] ${(args as List).join(" ")}")
- }
- }
-
- @Test
- void testShouldEncryptAndDecrypt() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message."
- logger.info("Plaintext: {}", PLAINTEXT)
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- String shortPassword = "short"
-
- def encryptionMethodsAndKdfs = [
- (KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY): EncryptionMethod.MD5_128AES,
- (KeyDerivationFunction.NIFI_LEGACY) : EncryptionMethod.MD5_128AES,
- (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
- ]
-
- // Act
- encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- logger.info("Using ${kdf.kdfName} and ${encryptionMethod.name()}")
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, shortPassword.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- logger.info("Encrypted: {}", Hex.encodeHexString(cipherBytes))
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
- decryptionCallback.process(cipherInputStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}\n\n", recovered)
- assert PLAINTEXT.equals(recovered)
-
- // This is necessary to run multiple iterations
- plainStream.reset()
- }
- }
-
- /**
- * This test was added after observing an encryption which appended a single {@code 0x10} byte after the cipher text was written. All other bytes in the flowfile content were correct. The corresponding {@code DecryptContent} processor could not decrypt the content and manual decryption required truncating the final byte.
- * @throws Exception
- */
- @Test
- void testBcryptKDFShouldNotAddOutputBytes() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message." * 4
- logger.info("Plaintext: {}", PLAINTEXT)
-
- int saltLength = 29
- int saltDelimiterLength = 8
- int ivLength = 16
- int ivDelimiterLength = 6
- int plaintextBlockCount = (int) Math.ceil(PLAINTEXT.length() / 16.0)
- int cipherByteLength = (PLAINTEXT.length() % 16 == 0 ? plaintextBlockCount + 1 : plaintextBlockCount) * 16
- int EXPECTED_CIPHER_BYTE_COUNT = saltLength + saltDelimiterLength + ivLength + ivDelimiterLength + cipherByteLength
- logger.info("Expected total cipher byte count: ${EXPECTED_CIPHER_BYTE_COUNT}")
-
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- String shortPassword = "short"
-
- EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- KeyDerivationFunction kdf = KeyDerivationFunction.BCRYPT
-
- // Act
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- logger.info("Using ${kdf.kdfName} and ${encryptionMethod.name()}")
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, shortPassword.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- logger.info("Encrypted (${cipherBytes.length}): ${Hex.encodeHexString(cipherBytes)}")
- assert cipherBytes.length == EXPECTED_CIPHER_BYTE_COUNT
-
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
- decryptionCallback.process(cipherInputStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- logger.info("Recovered (${recoveredBytes.length}): ${Hex.encodeHexString(recoveredBytes)}")
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}\n\n", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- @Test
- void testShouldDecryptLegacyOpenSSLSaltedCipherText() throws Exception {
- // Arrange
- Assume.assumeTrue("Skipping test because unlimited strength crypto policy not installed", CipherUtility.isUnlimitedStrengthCryptoSupported())
-
- final String PLAINTEXT = new File("${TEST_RESOURCES_PREFIX}/plain.txt").text
- logger.info("Plaintext: {}", PLAINTEXT)
- byte[] cipherBytes = new File("${TEST_RESOURCES_PREFIX}/salted_128_raw.enc").bytes
- InputStream cipherStream = new ByteArrayInputStream(cipherBytes)
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.MD5_128AES
- final KeyDerivationFunction kdf = KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
- logger.info("Cipher bytes: ${Hex.encodeHexString(cipherBytes)}")
-
- // Act
- decryptionCallback.process(cipherStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- @Test
- void testShouldDecryptLegacyOpenSSLUnsaltedCipherText() throws Exception {
- // Arrange
- Assume.assumeTrue("Skipping test because unlimited strength crypto policy not installed", CipherUtility.isUnlimitedStrengthCryptoSupported())
-
- final String PLAINTEXT = new File("${TEST_RESOURCES_PREFIX}/plain.txt").text
- logger.info("Plaintext: {}", PLAINTEXT)
- byte[] cipherBytes = new File("${TEST_RESOURCES_PREFIX}/unsalted_128_raw.enc").bytes
- InputStream cipherStream = new ByteArrayInputStream(cipherBytes)
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.MD5_128AES
- final KeyDerivationFunction kdf = KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
- logger.info("Cipher bytes: ${Hex.encodeHexString(cipherBytes)}")
-
- // Act
- decryptionCallback.process(cipherStream, recoveredStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray()
- String recovered = new String(recoveredBytes, "UTF-8")
- logger.info("Recovered: {}", recovered)
- assert PLAINTEXT.equals(recovered)
- }
-
- @Test
- void testShouldDecryptNiFiLegacySaltedCipherTextWithVariableSaltLength() throws Exception {
- // Arrange
- final String PLAINTEXT = new File("${TEST_RESOURCES_PREFIX}/plain.txt").text
- logger.info("Plaintext: {}", PLAINTEXT)
-
- final String PASSWORD = "short"
- logger.info("Password: ${PASSWORD}")
-
- /* The old NiFi legacy KDF code checked the algorithm block size and used it for the salt length.
- If the block size was not available, it defaulted to 8 bytes based on the default salt size. */
-
- def pbeEncryptionMethods = EncryptionMethod.values().findAll { it.algorithm.startsWith("PBE") }
- def encryptionMethodsByBlockSize = pbeEncryptionMethods.groupBy {
- Cipher cipher = Cipher.getInstance(it.algorithm, it.provider)
- cipher.getBlockSize()
- }
-
- logger.info("Grouped algorithms by block size: ${encryptionMethodsByBlockSize.collectEntries { k, v -> [k, v*.algorithm] }}")
-
- encryptionMethodsByBlockSize.each { int blockSize, List<EncryptionMethod> encryptionMethods ->
- encryptionMethods.each { EncryptionMethod encryptionMethod ->
- final int EXPECTED_SALT_SIZE = (blockSize > 0) ? blockSize : 8
- logger.info("Testing ${encryptionMethod.algorithm} with expected salt size ${EXPECTED_SALT_SIZE}")
-
- def legacySaltHex = "aa" * EXPECTED_SALT_SIZE
- byte[] legacySalt = Hex.decodeHex(legacySaltHex as char[])
- logger.info("Generated legacy salt ${legacySaltHex} (${legacySalt.length})")
-
- // Act
-
- // Encrypt using the raw legacy code
- NiFiLegacyCipherProvider legacyCipherProvider = new NiFiLegacyCipherProvider()
- Cipher legacyCipher = legacyCipherProvider.getCipher(encryptionMethod, PASSWORD, legacySalt, true)
- byte[] cipherBytes = legacyCipher.doFinal(PLAINTEXT.bytes)
- logger.info("Cipher bytes: ${Hex.encodeHexString(cipherBytes)}")
-
- byte[] completeCipherStreamBytes = org.bouncycastle.util.Arrays.concatenate(legacySalt, cipherBytes)
- logger.info("Complete cipher stream: ${Hex.encodeHexString(completeCipherStreamBytes)}")
-
- InputStream cipherStream = new ByteArrayInputStream(completeCipherStreamBytes)
- OutputStream resultStream = new ByteArrayOutputStream()
-
- // Now parse and decrypt using PBE encryptor
- PasswordBasedEncryptor decryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD as char[], KeyDerivationFunction.NIFI_LEGACY)
-
- StreamCallback decryptCallback = decryptor.decryptionCallback
- decryptCallback.process(cipherStream, resultStream)
-
- logger.info("Decrypted: ${Hex.encodeHexString(resultStream.toByteArray())}")
- String recovered = new String(resultStream.toByteArray())
- logger.info("Recovered: ${recovered}")
-
- // Assert
- assert recovered == PLAINTEXT
- }
- }
- }
-
- @Test
- void testShouldWriteEncryptionMetadataAttributesForKDFs() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message. "
- logger.info("Plaintext: ${PLAINTEXT}")
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- def kdfs = KeyDerivationFunction.values().findAll { it.isStrongKDF() }
-
- // Act
- kdfs.each { KeyDerivationFunction kdf ->
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
- StreamCallback encryptCallback = encryptor.getEncryptionCallback()
-
- // Reset the streams
- InputStream inputStream = new ByteArrayInputStream(PLAINTEXT.bytes)
- OutputStream cipherStream = new ByteArrayOutputStream()
-
- encryptCallback.process(inputStream, cipherStream)
-
- // Assert
- byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- String cipherText = new String(cipherBytes, StandardCharsets.UTF_8)
- String cipherTextHex = Hex.encodeHexString(cipherBytes)
- logger.info("Cipher text (${cipherBytes.size()}): ${cipherTextHex}")
-
- int ivDelimiterStart = CipherUtility.findSequence(cipherBytes, RandomIVPBECipherProvider.IV_DELIMITER)
- logger.info("IV delimiter starts at ${ivDelimiterStart}")
-
- final byte[] EXPECTED_KDF_SALT_BYTES = TestEncryptContentGroovy.extractFullSaltFromCipherBytes(cipherBytes)
- final String EXPECTED_KDF_SALT = new String(EXPECTED_KDF_SALT_BYTES)
- final String EXPECTED_SALT_HEX = TestEncryptContentGroovy.extractRawSaltHexFromFullSalt(EXPECTED_KDF_SALT_BYTES, kdf)
- logger.info("Extracted expected raw salt (hex): ${EXPECTED_SALT_HEX}")
-
- final String EXPECTED_IV_HEX = Hex.encodeHexString(cipherBytes[(ivDelimiterStart - 16)..<ivDelimiterStart] as byte[])
-
- TestEncryptContentGroovy.printFlowFileAttributes(encryptor.flowfileAttributes)
-
- // Assert the timestamp attribute was written and is accurate
- def diff = TestEncryptContentGroovy.calculateTimestampDifference(new Date(), encryptor.flowfileAttributes.get("encryptcontent.timestamp"))
- assert diff.toMilliseconds() < 1_000
- assert encryptor.flowfileAttributes.get("encryptcontent.algorithm") == encryptionMethod.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.kdf") == kdf.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.action") == "encrypted"
- assert encryptor.flowfileAttributes.get("encryptcontent.salt") == EXPECTED_SALT_HEX
- assert encryptor.flowfileAttributes.get("encryptcontent.salt_length") == "16"
- assert encryptor.flowfileAttributes.get("encryptcontent.iv") == EXPECTED_IV_HEX
- assert encryptor.flowfileAttributes.get("encryptcontent.iv_length") == "16"
- assert encryptor.flowfileAttributes.get("encryptcontent.plaintext_length") == PLAINTEXT.size() as String
- assert encryptor.flowfileAttributes.get("encryptcontent.cipher_text_length") == cipherBytes.size() as String
-
- // PBKDF2 doesn't have a KDF salt, just the raw byte[16]
- if (kdf != KeyDerivationFunction.PBKDF2) {
- assert encryptor.flowfileAttributes.get("encryptcontent.kdf_salt") == EXPECTED_KDF_SALT
- assert (29..54)*.toString().contains(encryptor.flowfileAttributes.get("encryptcontent.kdf_salt_length"))
- }
- }
- }
-
- @Test
- void testPBKDF2ShouldWriteIterationsAsAttribute() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message. "
- logger.info("Plaintext: ${PLAINTEXT}")
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- KeyDerivationFunction kdf = KeyDerivationFunction.PBKDF2
- PBKDF2CipherProvider pbkdf2CipherProvider = new PBKDF2CipherProvider()
- final String EXPECTED_ITERATIONS = pbkdf2CipherProvider.getIterationCount() as String
-
- // Act
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
- StreamCallback encryptCallback = encryptor.getEncryptionCallback()
-
- // Reset the streams
- InputStream inputStream = new ByteArrayInputStream(PLAINTEXT.bytes)
- OutputStream cipherStream = new ByteArrayOutputStream()
-
- encryptCallback.process(inputStream, cipherStream)
-
- // Assert
- byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- String cipherTextHex = Hex.encodeHexString(cipherBytes)
- logger.info("Cipher text (${cipherBytes.size()}): ${cipherTextHex}")
-
- TestEncryptContentGroovy.printFlowFileAttributes(encryptor.flowfileAttributes)
-
- assert encryptor.flowfileAttributes.get("encryptcontent.algorithm") == encryptionMethod.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.kdf") == kdf.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.action") == "encrypted"
- assert encryptor.flowfileAttributes.get("encryptcontent.pbkdf2_iterations") == EXPECTED_ITERATIONS
- }
-
- @Test
- void testBcryptDecryptShouldSupportLegacyKeyDerivationProcess() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message. "
- logger.info("Plaintext: ${PLAINTEXT}")
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- KeyDerivationFunction kdf = KeyDerivationFunction.BCRYPT
- BcryptCipherProvider bcryptCipherProvider = new BcryptCipherProvider()
-
- // Replicate PBE encryptor with manual legacy key derivation to encrypt
- final String PASSWORD = "shortPassword"
- final byte[] SALT = bcryptCipherProvider.generateSalt()
- String saltString = new String(SALT, StandardCharsets.UTF_8)
- logger.test("Using fixed Bcrypt salt: ${saltString}")
-
- // Determine the expected key bytes using the legacy key derivation process
- BcryptSecureHasher bcryptSecureHasher = new BcryptSecureHasher(bcryptCipherProvider.getWorkFactor(), bcryptCipherProvider.getDefaultSaltLength())
- byte[] rawSaltBytes = BcryptCipherProvider.extractRawSalt(saltString)
- byte[] hashOutputBytes = bcryptSecureHasher.hashRaw(PASSWORD.getBytes(StandardCharsets.UTF_8), rawSaltBytes)
- logger.test("Raw hash output (${hashOutputBytes.length}): ${Hex.encodeHexString(hashOutputBytes)}")
-
- MessageDigest sha512 = MessageDigest.getInstance("SHA-512", "BC")
- byte[] keyDigestBytes = sha512.digest(hashOutputBytes)
- logger.test("Key digest (${keyDigestBytes.length}): ${Hex.encodeHexString(keyDigestBytes)}")
-
- int keyLength = CipherUtility.parseKeyLengthFromAlgorithm(encryptionMethod.algorithm)
- byte[] derivedKeyBytes = Arrays.copyOf(keyDigestBytes, keyLength / 8 as int)
- logger.test("Derived key (${derivedKeyBytes.length}): ${Hex.encodeHexString(derivedKeyBytes)}")
-
- StreamCallback customEncryptCallback = { InputStream is, OutputStream os ->
- byte[] saltBytes = bcryptCipherProvider.generateSalt()
- ByteCountingInputStream bcis = new ByteCountingInputStream(is)
- ByteCountingOutputStream bcos = new ByteCountingOutputStream(os)
- bcryptCipherProvider.writeSalt(saltBytes, bcos)
-
- Cipher cipher = bcryptCipherProvider.getInitializedCipher(encryptionMethod, PASSWORD, saltBytes, new byte[16], keyLength, true, true)
-
- bcryptCipherProvider.writeIV(cipher.getIV(), bcos)
- CipherUtility.processStreams(cipher, bcis, bcos)
- } as StreamCallback
-
- // Reset the streams
- InputStream inputStream = new ByteArrayInputStream(PLAINTEXT.bytes)
- OutputStream cipherStream = new ByteArrayOutputStream()
-
- customEncryptCallback.process(inputStream, cipherStream)
-
- byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- String cipherTextHex = Hex.encodeHexString(cipherBytes)
- logger.info("Cipher text (${cipherBytes.size()}): ${cipherTextHex}")
-
- // Act
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
- StreamCallback pbeDecryptCallback = encryptor.getDecryptionCallback()
-
- // Reset the streams
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
- OutputStream recoveredOutputStream = new ByteArrayOutputStream()
-
- // Use PBE w/ Bcrypt to decrypt (and handle legacy key derivation process)
- pbeDecryptCallback.process(cipherInputStream, recoveredOutputStream)
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredOutputStream).toByteArray()
- String recovered = new String(recoveredBytes, StandardCharsets.UTF_8)
- logger.info("Plaintext (${recoveredBytes.size()}): ${recovered}")
-
- // handle reader logic error (PKCS7 padding false positive) by explicitly testing legacy key derivation
- if (PLAINTEXT != recovered) {
- logger.warn("Explicit test of legacy key derivation logic.")
- InputStream inputStreamLegacy = new ByteArrayInputStream(cipherBytes)
- OutputStream outputStreamLegacy = new ByteArrayOutputStream()
- byte[] salt = bcryptCipherProvider.readSalt(inputStreamLegacy)
- byte[] iv = bcryptCipherProvider.readIV(inputStreamLegacy)
- Cipher cipherLegacy = bcryptCipherProvider.getLegacyDecryptCipher(encryptionMethod, PASSWORD, salt, iv, keyLength)
- CipherUtility.processStreams(cipherLegacy, inputStreamLegacy, outputStreamLegacy)
- String recoveredLegacy = new String(outputStreamLegacy.toByteArray(), StandardCharsets.UTF_8)
- assert recoveredLegacy == PLAINTEXT
- }
- }
-
- /**
- * This test was added to detect a non-deterministic problem with Scrypt expected salts being
- * 32 bytes. This was ultimately determined to be a problem with the Scrypt salt regex failing
- * to match salts containing a '+' in the first 12 characters. See
- * {@code ScryptCipherProviderGroovyTest#testShouldAcceptFormattedSaltWithPlus( )}.
- *
- * @throws Exception
- */
- @Test
- void testScryptSaltShouldBe16Bytes() throws Exception {
- // Arrange
- final String PLAINTEXT = "This is a plaintext message. "
- logger.info("Plaintext: ${PLAINTEXT}")
-
- final EncryptionMethod encryptionMethod = EncryptionMethod.AES_CBC
- KeyDerivationFunction kdf = KeyDerivationFunction.SCRYPT
-
- // Act
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
- StreamCallback encryptCallback = encryptor.getEncryptionCallback()
-
- // Reset the streams
- InputStream inputStream = new ByteArrayInputStream(PLAINTEXT.bytes)
- OutputStream cipherStream = new ByteArrayOutputStream()
-
- encryptCallback.process(inputStream, cipherStream)
-
- // Assert
- byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- String cipherText = new String(cipherBytes, StandardCharsets.UTF_8)
- String cipherTextHex = Hex.encodeHexString(cipherBytes)
- logger.info("Cipher text (${cipherBytes.size()}): ${cipherTextHex}")
-
- int ivDelimiterStart = CipherUtility.findSequence(cipherBytes, RandomIVPBECipherProvider.IV_DELIMITER)
- logger.info("IV delimiter starts at ${ivDelimiterStart}")
-
- final byte[] EXPECTED_KDF_SALT_BYTES = TestEncryptContentGroovy.extractFullSaltFromCipherBytes(cipherBytes)
- final String EXPECTED_KDF_SALT = new String(EXPECTED_KDF_SALT_BYTES)
- final String EXPECTED_SALT_HEX = TestEncryptContentGroovy.extractRawSaltHexFromFullSalt(EXPECTED_KDF_SALT_BYTES, kdf)
- logger.info("Extracted expected raw salt (hex): ${EXPECTED_SALT_HEX}")
-
- final String EXPECTED_IV_HEX = Hex.encodeHexString(cipherBytes[(ivDelimiterStart - 16)..<ivDelimiterStart] as byte[])
-
- TestEncryptContentGroovy.printFlowFileAttributes(encryptor.flowfileAttributes)
-
- // Assert the timestamp attribute was written and is accurate
- def diff = TestEncryptContentGroovy.calculateTimestampDifference(new Date(), encryptor.flowfileAttributes.get("encryptcontent.timestamp"))
- assert diff.toMilliseconds() < 1_000
- assert encryptor.flowfileAttributes.get("encryptcontent.algorithm") == encryptionMethod.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.kdf") == kdf.name()
- assert encryptor.flowfileAttributes.get("encryptcontent.action") == "encrypted"
- assert encryptor.flowfileAttributes.get("encryptcontent.salt") == EXPECTED_SALT_HEX
- assert encryptor.flowfileAttributes.get("encryptcontent.salt_length") == "16"
- assert encryptor.flowfileAttributes.get("encryptcontent.iv") == EXPECTED_IV_HEX
- assert encryptor.flowfileAttributes.get("encryptcontent.iv_length") == "16"
- assert encryptor.flowfileAttributes.get("encryptcontent.plaintext_length") == PLAINTEXT.size() as String
- assert encryptor.flowfileAttributes.get("encryptcontent.cipher_text_length") == cipherBytes.size() as String
-
- assert encryptor.flowfileAttributes.get("encryptcontent.kdf_salt") == EXPECTED_KDF_SALT
- assert (29..54)*.toString().contains(encryptor.flowfileAttributes.get("encryptcontent.kdf_salt_length"))
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingSalt() throws Exception {
- // Arrange
- final int OPENSSL_EVP_HEADER_SIZE = 8
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- def encryptionMethodsAndKdfs = [
- (KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY): EncryptionMethod.MD5_128AES,
- (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
- ]
-
- // Act
- encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
- PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
-
- // reads the salt
- InputStream saltInputStream = new ByteArrayInputStream(cipherBytes)
- final byte[] saltBytes = cipherProvider.readSalt(saltInputStream)
-
- int skipLength = saltBytes.length
- if (cipherProvider instanceof org.apache.nifi.security.util.crypto.OpenSSLPKCS5CipherProvider) {
- skipLength += OPENSSL_EVP_HEADER_SIZE
- }
-
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
- cipherInputStream.skip(skipLength)
-
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
-
- // This is necessary to run multiple iterations
- plainStream.reset()
- }
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingSaltDelimiter() throws Exception {
- // Arrange
- final String SALT_DELIMITER = "NiFiSALT"
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- def encryptionMethodsAndKdfs = [
- (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
- ]
-
- // Act
- encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
- PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- final String removedDelimiterCipherString = new String(cipherBytes, StandardCharsets.UTF_8).replace(SALT_DELIMITER, "")
-
- InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
-
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
-
- // This is necessary to run multiple iterations
- plainStream.reset()
- }
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingIV() throws Exception {
- // Arrange
- final String SALT_DELIMITER="NiFiSALT"
- final String IV_DELIMITER = "NiFiIV"
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- def encryptionMethodsAndKdfs = [
- (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
- ]
-
- // Act
- encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
- PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
-
- // remove IV in cipher
- final String cipherString = new String(cipherBytes, StandardCharsets.UTF_8)
- final StringBuilder sb = new StringBuilder()
- sb.append(cipherString.split(SALT_DELIMITER)[0])
- sb.append(SALT_DELIMITER)
- sb.append(IV_DELIMITER)
- sb.append(cipherString.split(IV_DELIMITER)[1])
- final String removedIVCipherString = sb.toString()
-
- InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherString.getBytes(StandardCharsets.UTF_8))
-
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
-
- // This is necessary to run multiple iterations
- plainStream.reset()
- }
- }
-
- @Test
- void testDecryptShouldHandleCipherStreamMissingIVDelimiter() throws Exception {
- // Arrange
- final String IV_DELIMITER = "NiFiIV"
-
- final String PLAINTEXT = "This is a plaintext message."
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"))
-
- def encryptionMethodsAndKdfs = [
- (KeyDerivationFunction.BCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.SCRYPT) : EncryptionMethod.AES_CBC,
- (KeyDerivationFunction.PBKDF2) : EncryptionMethod.AES_CBC
- ]
-
- // Act
- encryptionMethodsAndKdfs.each { KeyDerivationFunction kdf, EncryptionMethod encryptionMethod ->
- PBECipherProvider cipherProvider = (PBECipherProvider) CipherProviderFactory.getCipherProvider(kdf)
-
- OutputStream cipherStream = new ByteArrayOutputStream()
- OutputStream recoveredStream = new ByteArrayOutputStream()
-
- PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(encryptionMethod, PASSWORD.toCharArray(), kdf)
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback()
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback()
-
- encryptionCallback.process(plainStream, cipherStream)
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray()
- final String removedDelimiterCipherString = new String(cipherBytes, StandardCharsets.UTF_8).replace(IV_DELIMITER, "")
-
- InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
-
- Exception exception = Assert.assertThrows(ProcessException.class, () -> {
- decryptionCallback.process(cipherInputStream, recoveredStream)
- })
-
- // This is necessary to run multiple iterations
- plainStream.reset()
- }
- }
-}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/KeyedEncryptorTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/KeyedEncryptorTest.java
new file mode 100644
index 0000000000..3cb792e1ca
--- /dev/null
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/KeyedEncryptorTest.java
@@ -0,0 +1,117 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.security.util.crypto;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.io.StreamCallback;
+import org.apache.nifi.security.util.EncryptionMethod;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.jupiter.api.Test;
+
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.security.Security;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class KeyedEncryptorTest {
+ private static final byte[] SECRET_KEY_BYTES = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0};
+
+ private static final SecretKey SECRET_KEY = new SecretKeySpec(SECRET_KEY_BYTES, "AES");
+
+ private static final byte[] INITIALIZATION_VECTOR = new byte[]{7, 6, 5, 4, 3, 2, 1, 0, 0, 1, 2, 3, 4, 5, 6, 7};
+
+ private static final byte[] PLAINTEXT = new byte[]{9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
+
+ private static final EncryptionMethod ENCRYPTION_METHOD = EncryptionMethod.AES_GCM;
+
+ static {
+ Security.addProvider(new BouncyCastleProvider());
+ }
+
+ @Test
+ public void testEncryptDecrypt() throws IOException {
+ final KeyedEncryptor encryptor = new KeyedEncryptor(ENCRYPTION_METHOD, SECRET_KEY);
+
+ assertEncryptDecryptMatched(encryptor, encryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptWithInitializationVector() throws IOException {
+ final KeyedEncryptor encryptor = new KeyedEncryptor(ENCRYPTION_METHOD, SECRET_KEY, INITIALIZATION_VECTOR);
+ final KeyedEncryptor decryptor = new KeyedEncryptor(ENCRYPTION_METHOD, SECRET_KEY);
+
+ assertEncryptDecryptMatched(encryptor, decryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptInitializationVectorRemoved() throws IOException {
+ final KeyedEncryptor encryptor = new KeyedEncryptor(ENCRYPTION_METHOD, SECRET_KEY);
+
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+
+ final byte[] encryptedBytes = encryptedOutputStream.toByteArray();
+ final byte[] encryptedBytesInitializationVectorRemoved = ArrayUtils.subarray(encryptedBytes, INITIALIZATION_VECTOR.length, encryptedBytes.length);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedBytesInitializationVectorRemoved);
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ @Test
+ public void testEncryptDecryptInitializationVectorDelimiterRemoved() throws IOException {
+ final KeyedEncryptor encryptor = new KeyedEncryptor(ENCRYPTION_METHOD, SECRET_KEY);
+
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+
+ final byte[] encryptedBytes = encryptedOutputStream.toByteArray();
+ final int startIndex = INITIALIZATION_VECTOR.length + KeyedCipherProvider.IV_DELIMITER.length;
+ final byte[] encryptedBytesInitializationVectorRemoved = ArrayUtils.subarray(encryptedBytes, startIndex, encryptedBytes.length);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedBytesInitializationVectorRemoved);
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ private void assertEncryptDecryptMatched(final KeyedEncryptor encryptor, final KeyedEncryptor decryptor) throws IOException {
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+ final StreamCallback decryption = decryptor.getDecryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedOutputStream.toByteArray());
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ decryption.process(encryptedInputStream, decryptedOutputStream);
+
+ final byte[] decrypted = decryptedOutputStream.toByteArray();
+ assertArrayEquals(PLAINTEXT, decrypted);
+ }
+}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPKeyBasedEncryptorTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPKeyBasedEncryptorTest.java
index 3f7c82c0d1..c43ae8ab7b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPKeyBasedEncryptorTest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPKeyBasedEncryptorTest.java
@@ -18,131 +18,49 @@ package org.apache.nifi.security.util.crypto;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.Security;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.nifi.processor.io.StreamCallback;
import org.apache.nifi.security.util.EncryptionMethod;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openpgp.PGPEncryptedData;
-import org.bouncycastle.openpgp.PGPUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-public class OpenPGPKeyBasedEncryptorTest {
- private static final Logger logger = LoggerFactory.getLogger(OpenPGPKeyBasedEncryptorTest.class);
+import org.junit.jupiter.api.Test;
+
+import static org.junit.Assert.assertArrayEquals;
- private final File plainFile = new File("src/test/resources/TestEncryptContent/text.txt");
- private final File unsignedFile = new File("src/test/resources/TestEncryptContent/text.txt.unsigned.gpg");
- private final File encryptedFile = new File("src/test/resources/TestEncryptContent/text.txt.gpg");
+public class OpenPGPKeyBasedEncryptorTest {
+ private static final String FILENAME = OpenPGPKeyBasedEncryptorTest.class.getSimpleName();
private static final String SECRET_KEYRING_PATH = "src/test/resources/TestEncryptContent/secring.gpg";
+
private static final String PUBLIC_KEYRING_PATH = "src/test/resources/TestEncryptContent/pubring.gpg";
+
private static final String USER_ID = "NiFi PGP Test Key (Short test key for NiFi PGP unit tests) <al...@gmail.com>";
private static final String PASSWORD = "thisIsABadPassword";
- @BeforeClass
- public static void setUpOnce() throws Exception {
- Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS);
- Security.addProvider(new BouncyCastleProvider());
- }
-
- @Before
- public void setUp() throws Exception {
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- @Test
- public void testShouldEncryptAndDecrypt() throws Exception {
- for (int i = 1; i < 14; i++) {
- if (PGPEncryptedData.SAFER != i) { // SAFER cipher is not supported and therefore its test is skipped
- Integer cipher = i;
- logger.info("Testing PGP encryption with " + PGPUtil.getSymmetricCipherName(cipher) + " cipher.");
- // Arrange
- final String PLAINTEXT = "This is a plaintext message.";
- logger.info("Plaintext: {}", PLAINTEXT);
- InputStream plainStream = new ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"));
- OutputStream cipherStream = new ByteArrayOutputStream();
- OutputStream recoveredStream = new ByteArrayOutputStream();
-
- // No file, just streams
- String filename = "tempFile.txt";
-
-
- // Encryptor does not require password
- OpenPGPKeyBasedEncryptor encryptor = new OpenPGPKeyBasedEncryptor(
- EncryptionMethod.PGP.getAlgorithm(), cipher, EncryptionMethod.PGP.getProvider(), PUBLIC_KEYRING_PATH, USER_ID, new char[0], filename);
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback();
-
- OpenPGPKeyBasedEncryptor decryptor = new OpenPGPKeyBasedEncryptor(
- EncryptionMethod.PGP.getAlgorithm(), cipher, EncryptionMethod.PGP.getProvider(), SECRET_KEYRING_PATH, USER_ID, PASSWORD.toCharArray(), filename);
- StreamCallback decryptionCallback = decryptor.getDecryptionCallback();
+ private static final int CIPHER = PGPEncryptedData.AES_128;
- // Act
- encryptionCallback.process(plainStream, cipherStream);
-
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray();
- logger.info("Encrypted: {}", Hex.encodeHexString(cipherBytes));
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes);
-
- decryptionCallback.process(cipherInputStream, recoveredStream);
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray();
- String recovered = new String(recoveredBytes, "UTF-8");
- logger.info("Recovered: {}", recovered);
- assert PLAINTEXT.equals(recovered);
- }
- }
- }
+ private static final byte[] PLAINTEXT = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
@Test
- public void testShouldDecryptExternalFile() throws Exception {
- for (int i = 1; i<14; i++) {
- if (PGPEncryptedData.SAFER != i) { // SAFER cipher is not supported and therefore its test is skipped
- Integer cipher = i;
- // Arrange
- byte[] plainBytes = Files.readAllBytes(Paths.get(plainFile.getPath()));
- final String PLAINTEXT = new String(plainBytes, "UTF-8");
-
- InputStream cipherStream = new FileInputStream(unsignedFile);
- OutputStream recoveredStream = new ByteArrayOutputStream();
-
- // No file, just streams
- String filename = unsignedFile.getName();
+ public void testEncryptDecrypt() throws Exception {
+ final ByteArrayInputStream plainStream = new ByteArrayInputStream(PLAINTEXT);
+ final OpenPGPKeyBasedEncryptor encryptor = new OpenPGPKeyBasedEncryptor(
+ EncryptionMethod.PGP.getAlgorithm(), CIPHER, EncryptionMethod.PGP.getProvider(), PUBLIC_KEYRING_PATH, USER_ID, new char[0], FILENAME);
+ StreamCallback encryptionCallback = encryptor.getEncryptionCallback();
- OpenPGPKeyBasedEncryptor encryptor = new OpenPGPKeyBasedEncryptor(
- EncryptionMethod.PGP.getAlgorithm(), cipher, EncryptionMethod.PGP.getProvider(), SECRET_KEYRING_PATH, USER_ID, PASSWORD.toCharArray(), filename);
+ OpenPGPKeyBasedEncryptor decryptor = new OpenPGPKeyBasedEncryptor(
+ EncryptionMethod.PGP.getAlgorithm(), CIPHER, EncryptionMethod.PGP.getProvider(), SECRET_KEYRING_PATH, USER_ID, PASSWORD.toCharArray(), FILENAME);
+ StreamCallback decryptionCallback = decryptor.getDecryptionCallback();
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback();
+ final ByteArrayOutputStream encryptedStream = new ByteArrayOutputStream();
+ encryptionCallback.process(plainStream, encryptedStream);
- // Act
- decryptionCallback.process(cipherStream, recoveredStream);
+ final InputStream encryptedInputStream = new ByteArrayInputStream(encryptedStream.toByteArray());
+ final ByteArrayOutputStream decryptedStream = new ByteArrayOutputStream();
+ decryptionCallback.process(encryptedInputStream, decryptedStream);
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray();
- String recovered = new String(recoveredBytes, "UTF-8");
- logger.info("Recovered: {}", recovered);
- Assert.assertEquals("Recovered text", PLAINTEXT, recovered);
- }
- }
+ byte[] decryptedBytes = decryptedStream.toByteArray();
+ assertArrayEquals(PLAINTEXT, decryptedBytes);
}
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPPasswordBasedEncryptorTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPPasswordBasedEncryptorTest.java
index fdd330b358..d335778341 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPPasswordBasedEncryptorTest.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/OpenPGPPasswordBasedEncryptorTest.java
@@ -18,125 +18,42 @@ package org.apache.nifi.security.util.crypto;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.security.Security;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang3.SystemUtils;
+
import org.apache.nifi.processor.io.StreamCallback;
import org.apache.nifi.security.util.EncryptionMethod;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.openpgp.PGPEncryptedData;
-import org.bouncycastle.openpgp.PGPUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class OpenPGPPasswordBasedEncryptorTest {
- private static final Logger logger = LoggerFactory.getLogger(OpenPGPPasswordBasedEncryptorTest.class);
-
- private final File plainFile = new File("src/test/resources/TestEncryptContent/text.txt");
- private final File encryptedFile = new File("src/test/resources/TestEncryptContent/text.txt.asc");
-
- private static final String PASSWORD = "thisIsABadPassword";
- private static final String LEGACY_PASSWORD = "Hello, World!";
-
- @BeforeClass
- public static void setUpOnce() throws Exception {
- Assume.assumeTrue("Test only runs on *nix", !SystemUtils.IS_OS_WINDOWS);
- Security.addProvider(new BouncyCastleProvider());
- }
-
- @Before
- public void setUp() throws Exception {
-
- }
-
- @After
- public void tearDown() throws Exception {
+import org.junit.jupiter.api.Test;
- }
-
- @Test
- public void testShouldEncryptAndDecrypt() throws Exception {
-
- for (int i = 1; i<14; i++) {
- if (PGPEncryptedData.SAFER != i) { // SAFER cipher is not supported and therefore its test is skipped
- Integer cipher = i;
- logger.info("Testing PGP encryption with " + PGPUtil.getSymmetricCipherName(cipher) + " cipher.");
-
- // Arrange
- final String PLAINTEXT = "This is a plaintext message.";
- logger.info("Plaintext: {}", PLAINTEXT);
- InputStream plainStream = new java.io.ByteArrayInputStream(PLAINTEXT.getBytes("UTF-8"));
- OutputStream cipherStream = new ByteArrayOutputStream();
- OutputStream recoveredStream = new ByteArrayOutputStream();
-
- // No file, just streams
- String filename = "tempFile.txt";
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
- OpenPGPPasswordBasedEncryptor encryptor = new OpenPGPPasswordBasedEncryptor(EncryptionMethod.PGP.getAlgorithm(),
- cipher, EncryptionMethod.PGP.getProvider(), PASSWORD.toCharArray(), filename);
-
- StreamCallback encryptionCallback = encryptor.getEncryptionCallback();
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback();
+public class OpenPGPPasswordBasedEncryptorTest {
+ private static final String FILENAME = OpenPGPPasswordBasedEncryptorTest.class.getSimpleName();
- // Act
- encryptionCallback.process(plainStream, cipherStream);
+ private static final int CIPHER = PGPEncryptedData.AES_128;
- final byte[] cipherBytes = ((ByteArrayOutputStream) cipherStream).toByteArray();
- logger.info("Encrypted: {}", Hex.encodeHexString(cipherBytes));
- InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes);
+ private static final byte[] PLAINTEXT = new byte[]{0, 1, 2, 3, 4, 5, 6, 7, 8};
- decryptionCallback.process(cipherInputStream, recoveredStream);
-
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray();
- String recovered = new String(recoveredBytes, "UTF-8");
- logger.info("Recovered: {}", recovered);
- assert PLAINTEXT.equals(recovered);
- }
- }
- }
+ private static final String PASSWORD = OpenPGPPasswordBasedEncryptorTest.class.getName();
@Test
- public void testShouldDecryptExternalFile() throws Exception {
- for (int i = 1; i<14; i++) {
- if (PGPEncryptedData.SAFER != i) { // SAFER cipher is not supported and therefore its test is skipped
- Integer cipher = i;
- // Arrange
- byte[] plainBytes = Files.readAllBytes(Paths.get(plainFile.getPath()));
- final String PLAINTEXT = new String(plainBytes, "UTF-8");
-
- InputStream cipherStream = new FileInputStream(encryptedFile);
- OutputStream recoveredStream = new ByteArrayOutputStream();
+ public void testEncryptDecrypt() throws Exception {
+ final ByteArrayInputStream plainStream = new ByteArrayInputStream(PLAINTEXT);
- // No file, just streams
- String filename = encryptedFile.getName();
+ final OpenPGPPasswordBasedEncryptor encryptor = new OpenPGPPasswordBasedEncryptor(EncryptionMethod.PGP.getAlgorithm(),
+ CIPHER, EncryptionMethod.PGP.getProvider(), PASSWORD.toCharArray(), FILENAME);
- OpenPGPPasswordBasedEncryptor encryptor = new OpenPGPPasswordBasedEncryptor(EncryptionMethod.PGP.getAlgorithm(), cipher,
- EncryptionMethod.PGP.getProvider(), LEGACY_PASSWORD.toCharArray(), filename);
+ final StreamCallback encryptionCallback = encryptor.getEncryptionCallback();
+ final StreamCallback decryptionCallback = encryptor.getDecryptionCallback();
- StreamCallback decryptionCallback = encryptor.getDecryptionCallback();
+ final ByteArrayOutputStream encryptedStream = new ByteArrayOutputStream();
+ encryptionCallback.process(plainStream, encryptedStream);
- // Act
- decryptionCallback.process(cipherStream, recoveredStream);
+ final InputStream encryptedInputStream = new ByteArrayInputStream(encryptedStream.toByteArray());
+ final ByteArrayOutputStream decryptedStream = new ByteArrayOutputStream();
+ decryptionCallback.process(encryptedInputStream, decryptedStream);
- // Assert
- byte[] recoveredBytes = ((ByteArrayOutputStream) recoveredStream).toByteArray();
- String recovered = new String(recoveredBytes, "UTF-8");
- logger.info("Recovered: {}", recovered);
- Assert.assertEquals("Recovered text", PLAINTEXT, recovered);
- }
- }
+ byte[] decryptedBytes = decryptedStream.toByteArray();
+ assertArrayEquals(PLAINTEXT, decryptedBytes);
}
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorTest.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorTest.java
new file mode 100644
index 0000000000..08cda8b74b
--- /dev/null
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorTest.java
@@ -0,0 +1,240 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License") you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.security.util.crypto;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.nifi.processor.exception.ProcessException;
+import org.apache.nifi.processor.io.StreamCallback;
+import org.apache.nifi.security.util.EncryptionMethod;
+import org.apache.nifi.security.util.KeyDerivationFunction;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.Security;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PasswordBasedEncryptorTest {
+ private static final String TEST_RESOURCES_PATH = "src/test/resources/TestEncryptContent";
+
+ private static final char[] FILE_PASSWORD = "thisIsABadPassword".toCharArray();
+
+ private static final Path TEST_SALTED_PATH = Paths.get(String.format("%s/salted_128_raw.enc", TEST_RESOURCES_PATH));
+
+ private static final Path TEST_UNSALTED_PATH = Paths.get(String.format("%s/unsalted_128_raw.enc", TEST_RESOURCES_PATH));
+
+ private static final Path TEST_PLAIN_PATH = Paths.get(String.format("%s/plain.txt", TEST_RESOURCES_PATH));
+
+ private static final byte[] PLAINTEXT = new byte[]{9, 8, 7, 6, 5, 4, 3, 2, 1, 0};
+
+ private static final char[] PASSWORD = new char[]{'a', 'b', 'c', 'd', 'e', 'f', 'g'};
+
+ private static final int SALT_LENGTH = RandomIVPBECipherProvider.SALT_DELIMITER.length;
+
+ private static final String INITIALIZATION_VECTOR_LENGTH = Integer.toString(RandomIVPBECipherProvider.MAX_IV_LIMIT);
+
+ private static final String IV_ATTRIBUTE = "iv";
+
+ private static final EncryptionMethod PBE_ENCRYPTION_METHOD = EncryptionMethod.SHA256_256AES;
+
+ private static final EncryptionMethod KDF_ENCRYPTION_METHOD = EncryptionMethod.AES_GCM;
+
+ static {
+ Security.addProvider(new BouncyCastleProvider());
+ }
+
+ @Test
+ public void testEncryptDecryptLegacy() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(PBE_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.NIFI_LEGACY);
+
+ assertEncryptDecryptMatched(encryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptOpenSsl() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(PBE_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY);
+
+ assertEncryptDecryptMatched(encryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptBcrypt() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.BCRYPT);
+
+ assertEncryptDecryptMatched(encryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptScrypt() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.SCRYPT);
+
+ assertEncryptDecryptMatched(encryptor);
+ }
+
+ @Test
+ public void testEncryptDecryptPbkdf2() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.PBKDF2);
+
+ assertEncryptDecryptMatched(encryptor);
+ }
+
+ @Test
+ public void testDecryptOpenSslSalted() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(EncryptionMethod.MD5_128AES, FILE_PASSWORD, KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY);
+
+ final byte[] plainBytes = Files.readAllBytes(TEST_PLAIN_PATH);
+ final byte[] encryptedBytes = Files.readAllBytes(TEST_SALTED_PATH);
+
+ assertDecryptMatched(encryptor, encryptedBytes, plainBytes);
+ }
+
+ @Test
+ public void testDecryptOpenSslUnsalted() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(EncryptionMethod.MD5_128AES, FILE_PASSWORD, KeyDerivationFunction.OPENSSL_EVP_BYTES_TO_KEY);
+
+ final byte[] plainBytes = Files.readAllBytes(TEST_PLAIN_PATH);
+ final byte[] encryptedBytes = Files.readAllBytes(TEST_UNSALTED_PATH);
+
+ assertDecryptMatched(encryptor, encryptedBytes, plainBytes);
+ }
+
+ @Test
+ public void testEncryptDecryptArgon2SkippedSaltMissing() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.ARGON2);
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final byte[] encryptedBytes = encryptBytes(encryptor);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedBytes);
+ final long skipped = encryptedInputStream.skip(SALT_LENGTH);
+ assertEquals(SALT_LENGTH, skipped);
+
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ @Test
+ public void testEncryptDecryptArgon2SaltDelimiterMissing() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.ARGON2);
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final byte[] encryptedBytes = encryptBytes(encryptor);
+ final byte[] delimiterRemoved = ArrayUtils.removeElements(encryptedBytes, RandomIVPBECipherProvider.SALT_DELIMITER);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(delimiterRemoved);
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ @Test
+ public void testEncryptDecryptArgon2InitializationVectorMissing() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.ARGON2);
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+ final byte[] encryptedBytes = encryptedOutputStream.toByteArray();
+
+ final String initializationVectorAttribute = encryptor.flowfileAttributes.get(getAttributeName(IV_ATTRIBUTE));
+ final byte[] initializationVector = initializationVectorAttribute.getBytes(StandardCharsets.UTF_8);
+
+ final byte[] encryptedBytesUpdated = ArrayUtils.removeElements(encryptedBytes, initializationVector);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedBytesUpdated);
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ @Test
+ public void testEncryptDecryptArgon2InitializationVectorDelimiterMissing() throws IOException {
+ final PasswordBasedEncryptor encryptor = new PasswordBasedEncryptor(KDF_ENCRYPTION_METHOD, PASSWORD, KeyDerivationFunction.ARGON2);
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final byte[] encryptedBytes = encryptBytes(encryptor);
+ final byte[] encryptedBytesUpdated = ArrayUtils.removeElements(encryptedBytes, RandomIVPBECipherProvider.IV_DELIMITER);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedBytesUpdated);
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ assertThrows(ProcessException.class, () -> decryption.process(encryptedInputStream, decryptedOutputStream));
+ }
+
+ private byte[] encryptBytes(final PasswordBasedEncryptor encryptor) throws IOException {
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+
+ return encryptedOutputStream.toByteArray();
+ }
+
+ private void assertEncryptDecryptMatched(final PasswordBasedEncryptor encryptor) throws IOException {
+ final StreamCallback encryption = encryptor.getEncryptionCallback();
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final ByteArrayOutputStream encryptedOutputStream = new ByteArrayOutputStream();
+ encryption.process(new ByteArrayInputStream(PLAINTEXT), encryptedOutputStream);
+
+ final ByteArrayInputStream encryptedInputStream = new ByteArrayInputStream(encryptedOutputStream.toByteArray());
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ decryption.process(encryptedInputStream, decryptedOutputStream);
+
+ final byte[] decrypted = decryptedOutputStream.toByteArray();
+ assertArrayEquals(PLAINTEXT, decrypted);
+
+ assertFlowFileAttributesFound(encryptor.flowfileAttributes);
+ }
+
+ private void assertFlowFileAttributesFound(final Map<String, String> attributes) {
+ assertTrue(attributes.containsKey(getAttributeName("algorithm")));
+ assertTrue(attributes.containsKey(getAttributeName("timestamp")));
+ assertTrue(attributes.containsKey(getAttributeName("cipher_text_length")));
+ assertEquals("decrypted", attributes.get(getAttributeName("action")));
+ assertEquals(Integer.toString(PLAINTEXT.length), attributes.get(getAttributeName("plaintext_length")));
+ assertTrue(attributes.containsKey(getAttributeName("salt")));
+ assertTrue(attributes.containsKey(getAttributeName("salt_length")));
+ assertTrue(attributes.containsKey(getAttributeName(IV_ATTRIBUTE)));
+ assertEquals(INITIALIZATION_VECTOR_LENGTH, attributes.get(getAttributeName("iv_length")));
+ assertTrue(attributes.containsKey(getAttributeName("kdf")));
+ }
+
+ private void assertDecryptMatched(final PasswordBasedEncryptor encryptor, final byte[] encrypted, final byte[] expected) throws IOException {
+ final StreamCallback decryption = encryptor.getDecryptionCallback();
+
+ final ByteArrayOutputStream decryptedOutputStream = new ByteArrayOutputStream();
+ decryption.process(new ByteArrayInputStream(encrypted), decryptedOutputStream);
+
+ final byte[] decrypted = decryptedOutputStream.toByteArray();
+ assertArrayEquals(expected, decrypted);
+ }
+
+ private String getAttributeName(final String name) {
+ return String.format("encryptcontent.%s", name);
+ }
+}
[nifi] 30/31: NIFI-9846 Implement pagination listing for Azure List processors
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 869422d24db5041d600dd77b18ed0d1a940e07f9
Author: Timea Barna <ti...@gmail.com>
AuthorDate: Wed Mar 30 14:43:06 2022 +0200
NIFI-9846 Implement pagination listing for Azure List processors
NIFI-9846 removing paging from ListAzureBlobStorage_v12 and ListAzureDataLakeStorage, adding = to filtering
This closes #5916.
Signed-off-by: Peter Turcsanyi <tu...@apache.org>
---
.../azure/storage/ListAzureBlobStorage.java | 66 +++++++++++++---------
.../azure/storage/ListAzureBlobStorage_v12.java | 49 +++++++++-------
.../azure/storage/ListAzureDataLakeStorage.java | 8 ++-
3 files changed, 73 insertions(+), 50 deletions(-)
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java
index eb439b4126..3e08e481f7 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage.java
@@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map;
import com.microsoft.azure.storage.OperationContext;
+import com.microsoft.azure.storage.ResultContinuation;
+import com.microsoft.azure.storage.ResultSegment;
import com.microsoft.azure.storage.StorageUri;
import com.microsoft.azure.storage.blob.BlobListingDetails;
import com.microsoft.azure.storage.blob.BlobProperties;
@@ -183,6 +185,8 @@ public class ListAzureBlobStorage extends AbstractListProcessor<BlobInfo> {
final String containerName = context.getProperty(AzureStorageUtils.CONTAINER).evaluateAttributeExpressions().getValue();
final String prefix = Optional.ofNullable(context.getProperty(PROP_PREFIX).evaluateAttributeExpressions().getValue()).orElse("");
final List<BlobInfo> listing = new ArrayList<>();
+ final long minimumTimestamp = minTimestamp == null ? 0 : minTimestamp;
+
try {
final CloudBlobClient blobClient = AzureStorageUtils.createCloudBlobClient(context, getLogger(), null);
final CloudBlobContainer container = blobClient.getContainerReference(containerName);
@@ -190,34 +194,44 @@ public class ListAzureBlobStorage extends AbstractListProcessor<BlobInfo> {
final OperationContext operationContext = new OperationContext();
AzureStorageUtils.setProxy(operationContext, context);
- for (final ListBlobItem blob : container.listBlobs(prefix, true, EnumSet.of(BlobListingDetails.METADATA), null, operationContext)) {
- if (blob instanceof CloudBlob) {
- final CloudBlob cloudBlob = (CloudBlob) blob;
- final BlobProperties properties = cloudBlob.getProperties();
- final StorageUri uri = cloudBlob.getSnapshotQualifiedStorageUri();
-
- final Builder builder = new BlobInfo.Builder()
- .primaryUri(uri.getPrimaryUri().toString())
- .blobName(cloudBlob.getName())
- .containerName(containerName)
- .contentType(properties.getContentType())
- .contentLanguage(properties.getContentLanguage())
- .etag(properties.getEtag())
- .lastModifiedTime(properties.getLastModified().getTime())
- .length(properties.getLength());
-
- if (uri.getSecondaryUri() != null) {
- builder.secondaryUri(uri.getSecondaryUri().toString());
- }
-
- if (blob instanceof CloudBlockBlob) {
- builder.blobType(AzureStorageUtils.BLOCK);
- } else {
- builder.blobType(AzureStorageUtils.PAGE);
+ ResultContinuation continuationToken = null;
+
+ do {
+ final ResultSegment<ListBlobItem> result = container.listBlobsSegmented(prefix, true, EnumSet.of(BlobListingDetails.METADATA), null, continuationToken, null, operationContext);
+ continuationToken = result.getContinuationToken();
+
+ for (final ListBlobItem blob : result.getResults()) {
+ if (blob instanceof CloudBlob) {
+ final CloudBlob cloudBlob = (CloudBlob) blob;
+ final BlobProperties properties = cloudBlob.getProperties();
+
+ if (properties.getLastModified().getTime() >= minimumTimestamp) {
+ final StorageUri uri = cloudBlob.getSnapshotQualifiedStorageUri();
+
+ final Builder builder = new BlobInfo.Builder()
+ .primaryUri(uri.getPrimaryUri().toString())
+ .blobName(cloudBlob.getName())
+ .containerName(containerName)
+ .contentType(properties.getContentType())
+ .contentLanguage(properties.getContentLanguage())
+ .etag(properties.getEtag())
+ .lastModifiedTime(properties.getLastModified().getTime())
+ .length(properties.getLength());
+
+ if (uri.getSecondaryUri() != null) {
+ builder.secondaryUri(uri.getSecondaryUri().toString());
+ }
+
+ if (blob instanceof CloudBlockBlob) {
+ builder.blobType(AzureStorageUtils.BLOCK);
+ } else {
+ builder.blobType(AzureStorageUtils.PAGE);
+ }
+ listing.add(builder.build());
+ }
}
- listing.add(builder.build());
}
- }
+ } while (continuationToken != null);
} catch (final Throwable t) {
throw new IOException(ExceptionUtils.getRootCause(t));
}
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java
index de776a88e3..82bb821774 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureBlobStorage_v12.java
@@ -53,6 +53,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -199,33 +200,39 @@ public class ListAzureBlobStorage_v12 extends AbstractListProcessor<BlobInfo> {
}
@Override
- protected List<BlobInfo> performListing(ProcessContext context, Long minTimestamp, ListingMode listingMode) throws IOException {
- String containerName = context.getProperty(CONTAINER).evaluateAttributeExpressions().getValue();
- String prefix = context.getProperty(BLOB_NAME_PREFIX).evaluateAttributeExpressions().getValue();
+ protected List<BlobInfo> performListing(final ProcessContext context, final Long minTimestamp, final ListingMode listingMode) throws IOException {
+ final String containerName = context.getProperty(CONTAINER).evaluateAttributeExpressions().getValue();
+ final String prefix = context.getProperty(BLOB_NAME_PREFIX).evaluateAttributeExpressions().getValue();
+ final long minimumTimestamp = minTimestamp == null ? 0 : minTimestamp;
try {
- List<BlobInfo> listing = new ArrayList<>();
+ final List<BlobInfo> listing = new ArrayList<>();
- BlobContainerClient containerClient = storageClient.getBlobContainerClient(containerName);
+ final BlobContainerClient containerClient = storageClient.getBlobContainerClient(containerName);
- ListBlobsOptions options = new ListBlobsOptions()
+ final ListBlobsOptions options = new ListBlobsOptions()
.setPrefix(prefix);
- for (BlobItem blob : containerClient.listBlobs(options, null)) {
- BlobItemProperties properties = blob.getProperties();
-
- Builder builder = new Builder()
- .containerName(containerName)
- .blobName(blob.getName())
- .primaryUri(String.format("%s/%s", containerClient.getBlobContainerUrl(), blob.getName()))
- .etag(properties.getETag())
- .blobType(properties.getBlobType().toString())
- .contentType(properties.getContentType())
- .contentLanguage(properties.getContentLanguage())
- .lastModifiedTime(properties.getLastModified().toInstant().toEpochMilli())
- .length(properties.getContentLength());
-
- listing.add(builder.build());
+ final Iterator<BlobItem> result = containerClient.listBlobs(options, null).iterator();
+
+ while (result.hasNext()) {
+ final BlobItem blob = result.next();
+ final BlobItemProperties properties = blob.getProperties();
+
+ if (properties.getLastModified().toInstant().toEpochMilli() >= minimumTimestamp) {
+ final Builder builder = new Builder()
+ .containerName(containerName)
+ .blobName(blob.getName())
+ .primaryUri(String.format("%s/%s", containerClient.getBlobContainerUrl(), blob.getName()))
+ .etag(properties.getETag())
+ .blobType(properties.getBlobType().toString())
+ .contentType(properties.getContentType())
+ .contentLanguage(properties.getContentLanguage())
+ .lastModifiedTime(properties.getLastModified().toInstant().toEpochMilli())
+ .length(properties.getContentLength());
+
+ listing.add(builder.build());
+ }
}
return listing;
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java
index 268b8c168e..1de2ee9b99 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/storage/ListAzureDataLakeStorage.java
@@ -210,12 +210,12 @@ public class ListAzureDataLakeStorage extends AbstractListProcessor<ADLSFileInfo
@Override
protected List<ADLSFileInfo> performListing(final ProcessContext context, final Long minTimestamp, final ListingMode listingMode) throws IOException {
- return performListing(context, listingMode, true);
+ return performListing(context, minTimestamp, listingMode, true);
}
@Override
protected Integer countUnfilteredListing(final ProcessContext context) throws IOException {
- return performListing(context, ListingMode.CONFIGURATION_VERIFICATION, false).size();
+ return performListing(context, null, ListingMode.CONFIGURATION_VERIFICATION, false).size();
}
@Override
@@ -238,7 +238,7 @@ public class ListAzureDataLakeStorage extends AbstractListProcessor<ADLSFileInfo
return attributes;
}
- private List<ADLSFileInfo> performListing(final ProcessContext context, final ListingMode listingMode,
+ private List<ADLSFileInfo> performListing(final ProcessContext context, final Long minTimestamp, final ListingMode listingMode,
final boolean applyFilters) throws IOException {
try {
final String fileSystem = evaluateFileSystemProperty(context, null);
@@ -256,9 +256,11 @@ public class ListAzureDataLakeStorage extends AbstractListProcessor<ADLSFileInfo
options.setRecursive(recurseSubdirectories);
final Pattern baseDirectoryPattern = Pattern.compile("^" + baseDirectory + "/?");
+ final long minimumTimestamp = minTimestamp == null ? 0 : minTimestamp;
final List<ADLSFileInfo> listing = fileSystemClient.listPaths(options, null).stream()
.filter(pathItem -> !pathItem.isDirectory())
+ .filter(pathItem -> pathItem.getLastModified().toInstant().toEpochMilli() >= minimumTimestamp)
.map(pathItem -> new ADLSFileInfo.Builder()
.fileSystem(fileSystem)
.filePath(pathItem.getName())
[nifi] 11/31: NIFI-9841 Improved Encryptor test reliability
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7f8aa88842a5063712b1f51e00e78628b8b1f1e4
Author: Emilio Setiadarma <em...@gmail.com>
AuthorDate: Mon Mar 28 09:09:03 2022 -0700
NIFI-9841 Improved Encryptor test reliability
- Changed expected exception to ProcessException in KeyedEncryptorGroovyTest and PasswordBasedEncryptorGroovyTest to avoid intermittent failures
This closes #5911
Signed-off-by: David Handermann <ex...@apache.org>
---
.../util/crypto/KeyedEncryptorGroovyTest.groovy | 11 +++--------
.../crypto/PasswordBasedEncryptorGroovyTest.groovy | 23 +++++-----------------
2 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
index 1b6110bcf1..ab2d0f7759 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/KeyedEncryptorGroovyTest.groovy
@@ -17,6 +17,7 @@
package org.apache.nifi.security.util.crypto
import org.apache.commons.codec.binary.Hex
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processor.io.StreamCallback
import org.apache.nifi.security.util.EncryptionMethod
import org.apache.nifi.security.util.KeyDerivationFunction
@@ -211,12 +212,9 @@ class KeyedEncryptorGroovyTest {
final byte[] removedIVCipherBytes = cipherString.split(IV_DELIMITER)[1].getBytes(StandardCharsets.UTF_8)
InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherBytes)
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
-
- // Assert
- assert exception.getCause() instanceof BytePatternNotFoundException
}
@Test
@@ -249,11 +247,8 @@ class KeyedEncryptorGroovyTest {
InputStream cipherInputStream = new ByteArrayInputStream(removedIVDelimiterCipherBytes)
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
-
- // Assert
- assert exception.getCause() instanceof BytePatternNotFoundException
}
}
\ No newline at end of file
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
index 96c7435221..d79474e444 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/groovy/org/apache/nifi/security/util/crypto/PasswordBasedEncryptorGroovyTest.groovy
@@ -17,6 +17,7 @@
package org.apache.nifi.security.util.crypto
import org.apache.commons.codec.binary.Hex
+import org.apache.nifi.processor.exception.ProcessException
import org.apache.nifi.processor.io.StreamCallback
import org.apache.nifi.processors.standard.TestEncryptContentGroovy
import org.apache.nifi.security.util.EncryptionMethod
@@ -552,15 +553,10 @@ class PasswordBasedEncryptorGroovyTest {
InputStream cipherInputStream = new ByteArrayInputStream(cipherBytes)
cipherInputStream.skip(skipLength)
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
- // Assert
- if (!(cipherProvider instanceof OpenSSLPKCS5CipherProvider)) {
- assert exception.getCause() instanceof IllegalArgumentException
- }
-
// This is necessary to run multiple iterations
plainStream.reset()
}
@@ -599,13 +595,10 @@ class PasswordBasedEncryptorGroovyTest {
InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
- // Assert
- assert exception.getCause() instanceof BytePatternNotFoundException
-
// This is necessary to run multiple iterations
plainStream.reset()
}
@@ -653,13 +646,10 @@ class PasswordBasedEncryptorGroovyTest {
InputStream cipherInputStream = new ByteArrayInputStream(removedIVCipherString.getBytes(StandardCharsets.UTF_8))
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
- // Assert
- assert exception.getCause() instanceof IllegalArgumentException
-
// This is necessary to run multiple iterations
plainStream.reset()
}
@@ -698,13 +688,10 @@ class PasswordBasedEncryptorGroovyTest {
InputStream cipherInputStream = new ByteArrayInputStream(removedDelimiterCipherString.getBytes(StandardCharsets.UTF_8))
- Exception exception = Assert.assertThrows(Exception.class, () -> {
+ Exception exception = Assert.assertThrows(ProcessException.class, () -> {
decryptionCallback.process(cipherInputStream, recoveredStream)
})
- // Assert
- assert exception.getCause() instanceof BytePatternNotFoundException
-
// This is necessary to run multiple iterations
plainStream.reset()
}
[nifi] 07/31: NIFI-9835: Fixed threading bug in which NioAsyncLoadBalanceClient calls LoadBalanceSession.isComplete() followed by LoadBalanceSession.isCanceled() but it's possible for the complete flag to change before the canceled flag (they are not updated atomically). So changed to use a single LoadBalanceSessionState enum that represents the state. Also made the private StandardProcessSession.commit(boolean) method synchronized. When a processor is terminated (as is the case in Offload), we roll bac [...]
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 854c419635f37dffc2c56f74b41fab259e06bd6c
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Fri Mar 25 11:43:03 2022 -0400
NIFI-9835: Fixed threading bug in which NioAsyncLoadBalanceClient calls LoadBalanceSession.isComplete() followed by LoadBalanceSession.isCanceled() but it's possible for the complete flag to change before the canceled flag (they are not updated atomically). So changed to use a single LoadBalanceSessionState enum that represents the state. Also made the private StandardProcessSession.commit(boolean) method synchronized. When a processor is terminated (as is the case in Offload), we rol [...]
This closes #5902
Signed-off-by: David Handermann <ex...@apache.org>
---
.../repository/StandardProcessSession.java | 2 +-
.../client/async/nio/LoadBalanceSession.java | 72 ++++++++++------------
.../async/nio/NioAsyncLoadBalanceClient.java | 9 +--
.../client/async/nio/TestLoadBalanceSession.java | 2 +-
.../nifi/processors/standard/MergeRecord.java | 2 +-
5 files changed, 42 insertions(+), 45 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
index bf1a1ab1fd..3965b8683e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
@@ -543,7 +543,7 @@ public class StandardProcessSession implements ProcessSession, ProvenanceEventEn
LOG.debug("Successfully committed session {} for {}", this, connectableDescription);
}
- private void commit(final boolean asynchronous) {
+ private synchronized void commit(final boolean asynchronous) {
checkpoint(this.checkpoint != null); // If a checkpoint already exists, we need to copy the collection
commit(this.checkpoint, asynchronous);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
index 8b068cd299..56283b91d0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/LoadBalanceSession.java
@@ -45,7 +45,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.OptionalInt;
-import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import java.util.zip.CRC32;
import java.util.zip.Checksum;
@@ -64,7 +63,6 @@ import static org.apache.nifi.controller.queue.clustered.protocol.LoadBalancePro
public class LoadBalanceSession {
private static final Logger logger = LoggerFactory.getLogger(LoadBalanceSession.class);
static final int MAX_DATA_FRAME_SIZE = 65535;
- private static final long PENALTY_MILLIS = TimeUnit.SECONDS.toMillis(2L);
private final RegisteredPartition partition;
private final Supplier<FlowFileRecord> flowFileSupplier;
@@ -75,7 +73,6 @@ public class LoadBalanceSession {
private final String peerDescription;
private final String connectionId;
private final TransactionThreshold transactionThreshold;
- private volatile boolean canceled = false;
final VersionNegotiator negotiator = new StandardVersionNegotiator(1);
private int protocolVersion = 1;
@@ -85,13 +82,12 @@ public class LoadBalanceSession {
// guarded by synchronizing on 'this'
private ByteBuffer preparedFrame;
private FlowFileRecord currentFlowFile;
- private List<FlowFileRecord> flowFilesSent = new ArrayList<>();
+ private final List<FlowFileRecord> flowFilesSent = new ArrayList<>();
private TransactionPhase phase = TransactionPhase.RECOMMEND_PROTOCOL_VERSION;
private InputStream flowFileInputStream;
- private byte[] byteBuffer = new byte[MAX_DATA_FRAME_SIZE];
- private boolean complete = false;
+ private final byte[] byteBuffer = new byte[MAX_DATA_FRAME_SIZE];
private long readTimeout;
- private long penaltyExpiration = -1L;
+ private volatile LoadBalanceSessionState sessionState = LoadBalanceSessionState.ACTIVE;
public LoadBalanceSession(final RegisteredPartition partition, final FlowFileContentAccess contentAccess, final LoadBalanceFlowFileCodec flowFileCodec, final PeerChannel peerChannel,
final int timeoutMillis, final TransactionThreshold transactionThreshold) {
@@ -124,17 +120,12 @@ public class LoadBalanceSession {
return copy;
}
- public synchronized boolean isComplete() {
- return complete;
+ public synchronized LoadBalanceSessionState getSessionState() {
+ return sessionState;
}
public synchronized boolean communicate() throws IOException {
- if (isComplete()) {
- return false;
- }
-
- if (isPenalized()) {
- logger.debug("Will not communicate with Peer {} for Connection {} because session is penalized", peerDescription, connectionId);
+ if (sessionState.isComplete()) {
return false;
}
@@ -167,25 +158,20 @@ public class LoadBalanceSession {
final int bytesWritten = channel.write(preparedFrame);
return bytesWritten > 0;
} catch (final Exception e) {
- complete = true;
+ sessionState = LoadBalanceSessionState.COMPLETED_EXCEPTIONALLY;
throw e;
}
}
public synchronized boolean cancel() {
- if (complete) {
+ if (sessionState.isComplete()) {
return false;
}
- complete = true;
- canceled = true;
+ sessionState = LoadBalanceSessionState.CANCELED;
return true;
}
- public boolean isCanceled() {
- return canceled;
- }
-
private boolean confirmTransactionComplete() throws IOException {
logger.debug("Confirming Transaction Complete for Peer {}", peerDescription);
@@ -210,7 +196,7 @@ public class LoadBalanceSession {
throw new IOException("Expected a CONFIRM_COMPLETE_TRANSACTION response from Peer " + peerDescription + " but received a value of " + response);
}
- complete = true;
+ sessionState = LoadBalanceSessionState.COMPLETED_SUCCESSFULLY;
logger.debug("Successfully completed Transaction to send {} FlowFiles to Peer {} for Connection {}", flowFilesSent.size(), peerDescription, connectionId);
return true;
@@ -496,21 +482,19 @@ public class LoadBalanceSession {
protocolVersion = requestedVersion;
phase = TransactionPhase.SEND_CONNECTION_ID;
logger.debug("Peer {} recommended Protocol Version of {}. Accepting version.", peerDescription, requestedVersion);
-
- return true;
} else {
final Integer preferred = negotiator.getPreferredVersion(requestedVersion);
if (preferred == null) {
logger.debug("Peer {} requested version {} of the Load Balance Protocol. This version is not acceptable. Aborting communications.", peerDescription, requestedVersion);
phase = TransactionPhase.ABORT_PROTOCOL_NEGOTIATION;
- return true;
} else {
logger.debug("Peer {} requested version {} of the Protocol. Recommending version {} instead", peerDescription, requestedVersion, preferred);
protocolVersion = preferred;
phase = TransactionPhase.RECOMMEND_PROTOCOL_VERSION;
- return true;
}
}
+
+ return true;
}
private ByteBuffer noMoreFlowFiles() {
@@ -592,7 +576,9 @@ public class LoadBalanceSession {
logger.debug("Peer {} has confirmed that the queue is full for Connection {}", peerDescription, connectionId);
phase = TransactionPhase.RECOMMEND_PROTOCOL_VERSION;
checksum.reset(); // We are restarting the session entirely so we need to reset our checksum
- complete = true; // consider complete because there's nothing else that we can do in this session. Allow client to move on to a different session.
+
+ // consider complete because there's nothing else that we can do in this session. Allow client to move on to a different session.
+ sessionState = LoadBalanceSessionState.COMPLETED_SUCCESSFULLY;
partition.penalize(1000L);
} else {
throw new TransactionAbortedException("After requesting to know whether or not Peer " + peerDescription + " has space available in Connection " + connectionId
@@ -602,15 +588,6 @@ public class LoadBalanceSession {
return true;
}
- private void penalize() {
- penaltyExpiration = System.currentTimeMillis() + PENALTY_MILLIS;
- }
-
- private boolean isPenalized() {
- // check for penaltyExpiration > -1L is not strictly necessary as it's implied by the second check but is still
- // here because it's more efficient to check this than to make the system call to System.currentTimeMillis().
- return penaltyExpiration > -1L && System.currentTimeMillis() < penaltyExpiration;
- }
private enum TransactionPhase {
@@ -653,4 +630,23 @@ public class LoadBalanceSession {
return requiredSelectionKey;
}
}
+
+ public enum LoadBalanceSessionState {
+ ACTIVE(false),
+
+ COMPLETED_SUCCESSFULLY(true),
+
+ COMPLETED_EXCEPTIONALLY(true),
+
+ CANCELED(true);
+
+ private final boolean complete;
+ LoadBalanceSessionState(final boolean complete) {
+ this.complete = complete;
+ }
+
+ public boolean isComplete() {
+ return complete;
+ }
+ }
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClient.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClient.java
index 4412987216..3ff1ef0827 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClient.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/queue/clustered/client/async/nio/NioAsyncLoadBalanceClient.java
@@ -130,7 +130,7 @@ public class NioAsyncLoadBalanceClient implements AsyncLoadBalanceClient {
logger.debug("{} Unregistered Connection with ID {}. Will fail any in-flight FlowFiles for Registered Partition {}", this, connectionId, removedPartition);
final boolean validSession = loadBalanceSession != null && connectionId.equals(loadBalanceSession.getPartition().getConnectionId());
- if (validSession && !loadBalanceSession.isComplete()) {
+ if (validSession && !loadBalanceSession.getSessionState().isComplete()) {
// Attempt to cancel the session. If successful, trigger the failure callback for the partition.
// If not successful, it indicates that another thread has completed the session and is responsible or the transaction success/failure
if (loadBalanceSession.cancel()) {
@@ -278,7 +278,8 @@ public class NioAsyncLoadBalanceClient implements AsyncLoadBalanceClient {
anySuccess = anySuccess || success;
} while (success);
- if (loadBalanceSession.isComplete() && !loadBalanceSession.isCanceled()) {
+ final LoadBalanceSession.LoadBalanceSessionState sessionState = loadBalanceSession.getSessionState();
+ if (sessionState.isComplete() && sessionState != LoadBalanceSession.LoadBalanceSessionState.CANCELED) {
loadBalanceSession.getPartition().getSuccessCallback().onTransactionComplete(loadBalanceSession.getAndPurgeFlowFilesSent(), nodeIdentifier);
}
@@ -356,7 +357,7 @@ public class NioAsyncLoadBalanceClient implements AsyncLoadBalanceClient {
}
private synchronized LoadBalanceSession getFailoverSession() {
- if (loadBalanceSession != null && !loadBalanceSession.isComplete()) {
+ if (loadBalanceSession != null && !loadBalanceSession.getSessionState().isComplete()) {
return loadBalanceSession;
}
@@ -402,7 +403,7 @@ public class NioAsyncLoadBalanceClient implements AsyncLoadBalanceClient {
}
private synchronized LoadBalanceSession getActiveTransaction(final RegisteredPartition proposedPartition) {
- if (loadBalanceSession != null && !loadBalanceSession.isComplete()) {
+ if (loadBalanceSession != null && !loadBalanceSession.getSessionState().isComplete()) {
return loadBalanceSession;
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/client/async/nio/TestLoadBalanceSession.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/client/async/nio/TestLoadBalanceSession.java
index 43a3cfe3ec..d43ee2be44 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/client/async/nio/TestLoadBalanceSession.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/queue/clustered/client/async/nio/TestLoadBalanceSession.java
@@ -136,7 +136,7 @@ public class TestLoadBalanceSession {
while (transaction.communicate()) {
}
- assertTrue(transaction.isComplete());
+ assertTrue(transaction.getSessionState().isComplete());
socketChannel.close();
final Checksum expectedChecksum = new CRC32();
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
index ce38273d65..187bcec634 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeRecord.java
@@ -195,7 +195,7 @@ public class MergeRecord extends AbstractSessionFactoryProcessor {
.name("max.bin.count")
.displayName("Maximum Number of Bins")
.description("Specifies the maximum number of bins that can be held in memory at any one time. "
- + "This number should not be smaller than the maximum number of conurrent threads for this Processor, "
+ + "This number should not be smaller than the maximum number of concurrent threads for this Processor, "
+ "or the bins that are created will often consist only of a single incoming FlowFile.")
.defaultValue("10")
.required(true)
[nifi] 19/31: NIFI-9816 Added lang attribute to html tag for WCAG 2.1 Accessibility
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 65c7e9929e1621f70d4777d7a68dafd98cb53563
Author: Jonathan Conti-Vock <jo...@gmail.com>
AuthorDate: Tue Mar 22 23:38:31 2022 +0000
NIFI-9816 Added lang attribute to html tag for WCAG 2.1 Accessibility
This closes #5893
Signed-off-by: David Handermann <ex...@apache.org>
---
.../nifi-web-api/src/main/resources/templates/index.html.hbs | 2 +-
.../nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp | 4 ++--
.../nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp | 5 +++--
.../nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp | 4 ++--
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/logout.jsp | 4 ++--
.../nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp | 2 +-
.../nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp | 2 +-
.../nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/documentation.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp | 2 +-
.../nifi-registry-web-ui/src/main/webapp/template.dev.html | 2 +-
.../nifi-registry-web-ui/src/main/webapp/template.html | 2 +-
23 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs
index 4ce9d5653d..b1c02337b1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/templates/index.html.hbs
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html>
+<html lang="en">
<head>
<title>{{info.title}}-{{info.version}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
index 8a092c265b..503ebdc7e3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
@@ -133,4 +133,4 @@
<div id="view-as" class="pointer button-normal"></div>
<div id="content-filename"><span class="content-label">Filename:</span><%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %></div>
<div id="content-type"><span class="content-label">Content Type:</span><%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %></div>
- <div class="message-pane-message-box">
\ No newline at end of file
+ <div class="message-pane-message-box">
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index 80b07b06a9..c2bfc18304 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -17,7 +17,7 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
index 567d0bed74..8cfa9e75b5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
@@ -15,8 +15,9 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -28,4 +29,4 @@
<h2>Yikes!</h2>
<p>Unable to locate the documentation for the selected item.</p>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
index c7cfa921f5..b95c0377c2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<%
// Sanitize the contextPath to ensure it is on this server
// rather than getting it from the header directly
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index 53fd38e86a..1c05da533e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -68,7 +68,7 @@
<plugins>
<!--
Precompile jsp's and add entries into the web.xml - the web.xml
- is automatically places in ${project.build.directory}. Do not
+ is automatically placed in ${project.build.directory}. Do not
precompile canvas.jsp, summary.jsp, history.jsp, etc.
These jsp's need to have the artifacts version filtered in to
eliminate broswer caching issues and set up the proper includes.
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
index e84bf720cd..c9ee08d827 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Bulletin Board</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index 46a6407a56..7a017e3986 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index b1c8441585..a2c76ca43c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Cluster</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
index 1553bd9b24..682338befa 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Counters</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
index 6d988db714..b107a8970a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi History</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
index 5a666e17df..20327f8d00 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Login</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -63,4 +63,4 @@
</div>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/logout.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/logout.jsp
index 5898b110e8..3bb31f5624 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/logout.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/logout.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Logout</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@@ -51,4 +51,4 @@
<jsp:include page="/WEB-INF/partials/logout/logout-message.jsp"/>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
index 2ba6ae4a2a..e22d16dc6b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<%
// Sanitize the contextPath to ensure it is on this server
// rather than getting it from the header directly
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
index a968f99914..fa8d368356 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Data Provenance</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
index fa32d39cbf..89e4629f15 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Summary</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
index 5c17fdb5b7..52f1582b55 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Templates</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
index 10063eb634..e7a0dc8cb1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Users</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
index 475ff6d850..6383eeb371 100644
--- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
+++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="stylesheet" href="../nifi/assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" />
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
index c29fca2c88..fbeb9cf840 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp
@@ -17,7 +17,7 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
index ce34b1be92..b291df2327 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-docs/src/main/webapp/WEB-INF/jsp/no-documentation-found.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.dev.html b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.dev.html
index c3f06c0502..fc13d76788 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.dev.html
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.dev.html
@@ -16,7 +16,7 @@
-->
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Registry</title>
<meta charset='UTF-8'>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.html b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.html
index c3f06c0502..fc13d76788 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.html
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/template.html
@@ -16,7 +16,7 @@
-->
<!DOCTYPE html>
-<html>
+<html lang="en">
<head>
<title>NiFi Registry</title>
<meta charset='UTF-8'>
[nifi] 02/31: NIFI-9793 Added wait for Controller Service run status in tests
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit d02d119bfad9637add588bc1739c8dd38fe3978f
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Mar 14 10:08:49 2022 -0500
NIFI-9793 Added wait for Controller Service run status in tests
- Added check for controller-level service run status in disableControllerLevelServices to avoid HTTP 409 Conflict response when attempting to delete services
This closes #5863
Signed-off-by: Paul Grey <gr...@apache.org>
---
.../org/apache/nifi/tests/system/NiFiClientUtil.java | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
index ba8ec40a94..0dc64eac5f 100644
--- a/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
+++ b/nifi-system-tests/nifi-system-test-suite/src/test/java/org/apache/nifi/tests/system/NiFiClientUtil.java
@@ -708,6 +708,7 @@ public class NiFiClientUtil {
runStatusEntity.setRevision(service.getRevision());
runStatusEntity.setState(ActivateControllerServicesEntity.STATE_DISABLED);
nifiClient.getControllerServicesClient().activateControllerService(service.getId(), runStatusEntity);
+ waitForControllerServiceRunStatus(service.getId(), ActivateControllerServicesEntity.STATE_DISABLED);
}
}
@@ -719,6 +720,25 @@ public class NiFiClientUtil {
}
}
+ public void waitForControllerServiceRunStatus(final String id, final String requestedRunStatus) throws NiFiClientException, IOException {
+ while (true) {
+ final ControllerServiceEntity serviceEntity = nifiClient.getControllerServicesClient().getControllerService(id);
+ final String runStatus = serviceEntity.getStatus().getRunStatus();
+ if (requestedRunStatus.equals(runStatus)) {
+ logger.info("Controller Service [{}] run status [{}] found", id, runStatus);
+ break;
+ }
+
+ logger.info("Controller Service [{}] run status [{}] not matched [{}]: sleeping before retrying", id, runStatus, requestedRunStatus);
+
+ try {
+ Thread.sleep(500L);
+ } catch (final Exception e) {
+ Assert.fail(e.toString());
+ }
+ }
+ }
+
public void waitForControllerSerivcesDisabled(final String groupId, final String... serviceIdsOfInterest) throws NiFiClientException, IOException {
waitForControllerServiceState(groupId, "DISABLED", Arrays.asList(serviceIdsOfInterest));
}
[nifi] 16/31: NIFI-9836: fix database selection during nifi registry startup (#5907)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 035b64d7234deffe2e2b6e879b666b61fcaaf827
Author: Zoltán Kornél Török <zt...@cloudera.com>
AuthorDate: Tue Mar 29 17:32:21 2022 +0200
NIFI-9836: fix database selection during nifi registry startup (#5907)
---
.../java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
index f473ef6708..4fc2694c2d 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/db/CustomFlywayConfiguration.java
@@ -58,10 +58,10 @@ public class CustomFlywayConfiguration implements FlywayConfigurationCustomizer
final DatabaseType databaseType = getDatabaseType(configuration.getDataSource());
LOGGER.info("Determined database type is {}", databaseType.getName());
- if (databaseType.equals(new MySQLDatabaseType())) {
+ if (databaseType instanceof MySQLDatabaseType) {
LOGGER.info("Setting migration locations to {}", Arrays.asList(LOCATIONS_MYSQL));
configuration.locations(LOCATIONS_MYSQL);
- } else if (databaseType.equals(new PostgreSQLDatabaseType())) {
+ } else if (databaseType instanceof PostgreSQLDatabaseType) {
LOGGER.info("Setting migration locations to {}", Arrays.asList(LOCATIONS_POSTGRES));
configuration.locations(LOCATIONS_POSTGRES);
} else {
[nifi] 28/31: NIFI-9853: Refactored StandardProcessGroupSynchronizer to make use of… (#5919)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 126ab0b8d8ff3f14dfb56d1c8ec6fb71351e4234
Author: markap14 <ma...@hotmail.com>
AuthorDate: Fri Apr 1 14:28:38 2022 -0400
NIFI-9853: Refactored StandardProcessGroupSynchronizer to make use of… (#5919)
* NIFI-9853: Refactored StandardProcessGroupSynchronizer to make use of State Lookups and Compoennt Schedulers to ensure that we properly synchronize states when starting up, when exporting flow definitions, and when importing Flow Definitions
* NIFI-9853: Fixed NPE
---
.../nifi/groups/DefaultComponentScheduler.java | 15 ++
.../RetainExistingStateComponentScheduler.java | 145 ++++++++++++++++++
.../apache/nifi/groups/StandardProcessGroup.java | 8 +-
.../groups/StandardProcessGroupSynchronizer.java | 84 +----------
.../nifi/groups/AbstractComponentScheduler.java | 162 +++++++++++++++++++++
.../org/apache/nifi/groups/ComponentScheduler.java | 28 ++++
.../mapping/VersionedComponentStateLookup.java | 9 +-
.../org/apache/nifi/controller/FlowController.java | 98 ++++++++++---
.../serialization/VersionedFlowSynchronizer.java | 22 ++-
9 files changed, 460 insertions(+), 111 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/DefaultComponentScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/DefaultComponentScheduler.java
index ee7fa9b003..a54ec61ab6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/DefaultComponentScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/DefaultComponentScheduler.java
@@ -20,9 +20,19 @@ package org.apache.nifi.groups;
import org.apache.nifi.connectable.Connectable;
import org.apache.nifi.connectable.Port;
import org.apache.nifi.controller.ProcessorNode;
+import org.apache.nifi.controller.service.ControllerServiceNode;
+import org.apache.nifi.controller.service.ControllerServiceProvider;
+import org.apache.nifi.registry.flow.mapping.VersionedComponentStateLookup;
import org.apache.nifi.remote.RemoteGroupPort;
+import java.util.Collection;
+
public class DefaultComponentScheduler extends AbstractComponentScheduler {
+
+ public DefaultComponentScheduler(final ControllerServiceProvider controllerServiceProvider, final VersionedComponentStateLookup stateLookup) {
+ super(controllerServiceProvider, stateLookup);
+ }
+
@Override
protected void startNow(final Connectable component) {
switch (component.getConnectableType()) {
@@ -48,4 +58,9 @@ public class DefaultComponentScheduler extends AbstractComponentScheduler {
}
}
}
+
+ @Override
+ protected void enableNow(final Collection<ControllerServiceNode> controllerServices) {
+ getControllerServiceProvider().enableControllerServices(controllerServices);
+ }
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/RetainExistingStateComponentScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/RetainExistingStateComponentScheduler.java
new file mode 100644
index 0000000000..b6ed741889
--- /dev/null
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/RetainExistingStateComponentScheduler.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.nifi.groups;
+
+import org.apache.nifi.connectable.Connectable;
+import org.apache.nifi.controller.ScheduledState;
+import org.apache.nifi.controller.Triggerable;
+import org.apache.nifi.controller.service.ControllerServiceNode;
+import org.apache.nifi.controller.service.ControllerServiceState;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class RetainExistingStateComponentScheduler implements ComponentScheduler {
+ private static final Logger logger = LoggerFactory.getLogger(RetainExistingStateComponentScheduler.class);
+
+ private final ComponentScheduler delegate;
+ private final Map<String, ScheduledState> connectableStates;
+ private final Map<String, ControllerServiceState> controllerServiceStates;
+
+ public RetainExistingStateComponentScheduler(final ProcessGroup processGroup, final ComponentScheduler delegate) {
+ this.delegate = delegate;
+ this.connectableStates = mapConnectableStates(processGroup);
+ this.controllerServiceStates = mapControllerServiceStates(processGroup);
+ }
+
+ @Override
+ public void startComponent(final Connectable component) {
+ final ScheduledState existingState = connectableStates.get(component.getIdentifier());
+ if (existingState == null) {
+ logger.debug("Will not start {} because it was not previously known in this Process Group", component);
+ return;
+ }
+
+ if (existingState != ScheduledState.RUNNING && existingState != ScheduledState.STARTING) {
+ logger.debug("Will not start {} because its previous state was {}", component, existingState);
+ return;
+ }
+
+ logger.debug("Starting {}", component);
+ delegate.startComponent(component);
+ }
+
+ @Override
+ public void stopComponent(final Connectable component) {
+ delegate.stopComponent(component);
+ }
+
+ @Override
+ public void transitionComponentState(final Connectable component, final org.apache.nifi.flow.ScheduledState desiredState) {
+ delegate.transitionComponentState(component, desiredState);
+ }
+
+ @Override
+ public void enableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ final Set<ControllerServiceNode> toEnable = new HashSet<>();
+
+ for (final ControllerServiceNode service : controllerServices) {
+ final ControllerServiceState existingState = controllerServiceStates.get(service.getIdentifier());
+
+ if (existingState == null) {
+ logger.debug("Will not enable {} because it was not previously known in this Process Group", service);
+ continue;
+ }
+
+ if (existingState != ControllerServiceState.ENABLED && existingState != ControllerServiceState.ENABLING) {
+ logger.debug("Will not enable {} because its previously state was {}", service, existingState);
+ continue;
+ }
+
+ toEnable.add(service);
+ }
+
+ logger.debug("Enabling {}", toEnable);
+ delegate.enableControllerServicesAsync(toEnable);
+ }
+
+ @Override
+ public void disableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ delegate.disableControllerServicesAsync(controllerServices);
+ }
+
+ @Override
+ public void pause() {
+ delegate.pause();
+ }
+
+ @Override
+ public void resume() {
+ delegate.resume();
+ }
+
+ private Map<String, ControllerServiceState> mapControllerServiceStates(final ProcessGroup group) {
+ final Set<ControllerServiceNode> services = group.findAllControllerServices();
+ final Map<String, ControllerServiceState> serviceStates = services.stream()
+ .collect(Collectors.toMap(ControllerServiceNode::getIdentifier, ControllerServiceNode::getState));
+
+ return serviceStates;
+ }
+
+ private Map<String, ScheduledState> mapConnectableStates(final ProcessGroup group) {
+ final Set<Connectable> connectables = new HashSet<>();
+ findAllConnectables(group, connectables);
+
+ final Map<String, ScheduledState> connectableStates = connectables.stream()
+ .collect(Collectors.toMap(Connectable::getIdentifier, Triggerable::getScheduledState));
+
+ return connectableStates;
+ }
+
+ private void findAllConnectables(final ProcessGroup group, final Set<Connectable> connectables) {
+ connectables.addAll(group.getInputPorts());
+ connectables.addAll(group.getOutputPorts());
+ connectables.addAll(group.getFunnels());
+ connectables.addAll(group.getProcessors());
+ for (final RemoteProcessGroup remoteGroup : group.getRemoteProcessGroups()) {
+ connectables.addAll(remoteGroup.getInputPorts());
+ connectables.addAll(remoteGroup.getOutputPorts());
+ }
+
+ for (final ProcessGroup childGroup : group.getProcessGroups()) {
+ findAllConnectables(childGroup, connectables);
+ }
+ }
+}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 58505f9cd5..1924f9bcfb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -3783,11 +3783,13 @@ public final class StandardProcessGroup implements ProcessGroup {
final boolean updateDescendantVersionedFlows) {
final ComponentIdGenerator idGenerator = (proposedId, instanceId, destinationGroupId) -> generateUuid(proposedId, destinationGroupId, componentIdSeed);
- final ComponentScheduler componentScheduler = new DefaultComponentScheduler();
+ final VersionedComponentStateLookup stateLookup = VersionedComponentStateLookup.ENABLED_OR_DISABLED;
+ final ComponentScheduler defaultComponentScheduler = new DefaultComponentScheduler(controllerServiceProvider, stateLookup);
+ final ComponentScheduler retainExistingStateScheduler = new RetainExistingStateComponentScheduler(this, defaultComponentScheduler);
final GroupSynchronizationOptions synchronizationOptions = new GroupSynchronizationOptions.Builder()
.componentIdGenerator(idGenerator)
- .componentScheduler(componentScheduler)
+ .componentScheduler(retainExistingStateScheduler)
.ignoreLocalModifications(!verifyNotDirty)
.updateDescendantVersionedFlows(updateDescendantVersionedFlows)
.updateGroupSettings(updateSettings)
@@ -3800,7 +3802,7 @@ public final class StandardProcessGroup implements ProcessGroup {
final FlowMappingOptions flowMappingOptions = new FlowMappingOptions.Builder()
.mapSensitiveConfiguration(false)
.mapPropertyDescriptors(true)
- .stateLookup(VersionedComponentStateLookup.ENABLED_OR_DISABLED)
+ .stateLookup(stateLookup)
.sensitiveValueEncryptor(null)
.componentIdLookup(ComponentIdLookup.VERSIONED_OR_GENERATE)
.mapInstanceIdentifiers(false)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroupSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroupSynchronizer.java
index 3761f65f73..cefaf22ada 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroupSynchronizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroupSynchronizer.java
@@ -502,8 +502,7 @@ public class StandardProcessGroupSynchronizer implements ProcessGroupSynchronize
// therefore is not valid until all have been created.
toEnable.forEach(service -> {
if (service.getState() == ControllerServiceState.DISABLED) {
- LOG.debug("Enabling {}", service);
- context.getControllerServiceProvider().enableControllerServicesAsync(Collections.singleton(service));
+ context.getComponentScheduler().enableControllerServicesAsync(Collections.singleton(service));
}
});
}
@@ -1447,52 +1446,7 @@ public class StandardProcessGroupSynchronizer implements ProcessGroupSynchronize
port.setPosition(new Position(proposed.getPosition().getX(), proposed.getPosition().getY()));
port.setMaxConcurrentTasks(proposed.getConcurrentlySchedulableTaskCount());
- final org.apache.nifi.flow.ScheduledState scheduledState = proposed.getScheduledState() == null ? org.apache.nifi.flow.ScheduledState.ENABLED : proposed.getScheduledState();
-
- final ProcessGroup group = port.getProcessGroup();
- if (port.getConnectableType() == ConnectableType.INPUT_PORT) {
- switch (scheduledState) {
- case DISABLED:
- group.disableInputPort(port);
- break;
- case ENABLED:
- if (port.getScheduledState() == ScheduledState.DISABLED) {
- group.enableInputPort(port);
- } else if (port.getScheduledState() == ScheduledState.RUNNING) {
- group.stopInputPort(port);
- }
- break;
- case RUNNING:
- if (port.getScheduledState() == ScheduledState.DISABLED) {
- group.enableInputPort(port);
- }
- if (port.getScheduledState() == ScheduledState.STOPPED) {
- context.getComponentScheduler().startComponent(port);
- }
- break;
- }
- } else if (port.getConnectableType() == ConnectableType.OUTPUT_PORT) {
- switch (scheduledState) {
- case DISABLED:
- group.disableOutputPort(port);
- break;
- case ENABLED:
- if (port.getScheduledState() == ScheduledState.DISABLED) {
- group.enableOutputPort(port);
- } else if (port.getScheduledState() == ScheduledState.RUNNING) {
- group.stopOutputPort(port);
- }
- break;
- case RUNNING:
- if (port.getScheduledState() == ScheduledState.DISABLED) {
- group.enableOutputPort(port);
- }
- if (port.getScheduledState() == ScheduledState.STOPPED) {
- context.getComponentScheduler().startComponent(port);
- }
- break;
- }
- }
+ context.getComponentScheduler().transitionComponentState(port, proposed.getScheduledState());
}
private Port addInputPort(final ProcessGroup destination, final VersionedPort proposed, final ComponentIdGenerator componentIdGenerator, final String temporaryName) {
@@ -1606,36 +1560,8 @@ public class StandardProcessGroupSynchronizer implements ProcessGroupSynchronize
processor.setBackoffMechanism(BackoffMechanism.valueOf(proposed.getBackoffMechanism()));
}
- final ScheduledState procState = processor.getScheduledState();
- final ProcessGroup group = processor.getProcessGroup();
- switch (proposed.getScheduledState()) {
- case DISABLED:
- if (procState == ScheduledState.RUNNING) {
- LOG.debug("Stopping {}", processor);
- group.stopProcessor(processor);
- }
-
- LOG.debug("Disabling {}", processor);
- group.disableProcessor(processor);
- break;
- case ENABLED:
- if (procState == ScheduledState.DISABLED) {
- LOG.debug("Enabling {}", processor);
- group.enableProcessor(processor);
- } else if (procState == ScheduledState.RUNNING) {
- LOG.debug("Stopping {}", processor);
- group.stopProcessor(processor);
- }
- break;
- case RUNNING:
- if (procState == ScheduledState.DISABLED) {
- LOG.debug("Enabling {}", processor);
- group.enableProcessor(processor);
- }
- LOG.debug("Starting {}", processor);
- context.getComponentScheduler().startComponent(processor);
- break;
- }
+ // Transition state to disabled/enabled/running
+ context.getComponentScheduler().transitionComponentState(processor, proposed.getScheduledState());
if (!isEqual(processor.getBundleCoordinate(), proposed.getBundle())) {
final BundleCoordinate newBundleCoordinate = toCoordinate(proposed.getBundle());
@@ -1751,7 +1677,7 @@ public class StandardProcessGroupSynchronizer implements ProcessGroupSynchronize
}
} else {
if (portState == ScheduledState.RUNNING) {
- remoteGroupPort.getRemoteProcessGroup().stopTransmitting(remoteGroupPort);
+ context.getComponentScheduler().stopComponent(remoteGroupPort);
}
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/AbstractComponentScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/AbstractComponentScheduler.java
index 3add0ac472..d1f6cc1ac0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/AbstractComponentScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/AbstractComponentScheduler.java
@@ -18,9 +18,17 @@
package org.apache.nifi.groups;
import org.apache.nifi.connectable.Connectable;
+import org.apache.nifi.connectable.Port;
+import org.apache.nifi.controller.ProcessorNode;
+import org.apache.nifi.controller.service.ControllerServiceNode;
+import org.apache.nifi.controller.service.ControllerServiceProvider;
+import org.apache.nifi.flow.ScheduledState;
+import org.apache.nifi.registry.flow.mapping.VersionedComponentStateLookup;
+import org.apache.nifi.remote.RemoteGroupPort;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Collection;
import java.util.Queue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicLong;
@@ -28,8 +36,17 @@ import java.util.concurrent.atomic.AtomicLong;
public abstract class AbstractComponentScheduler implements ComponentScheduler {
private static final Logger logger = LoggerFactory.getLogger(AbstractComponentScheduler.class);
+ private final ControllerServiceProvider serviceProvider;
+ private final VersionedComponentStateLookup stateLookup;
+
private final AtomicLong pauseCount = new AtomicLong(0L);
private final Queue<Connectable> toStart = new LinkedBlockingQueue<>();
+ private final Queue<ControllerServiceNode> toEnable = new LinkedBlockingQueue<>();
+
+ public AbstractComponentScheduler(final ControllerServiceProvider controllerServiceProvider, final VersionedComponentStateLookup stateLookup) {
+ this.serviceProvider = controllerServiceProvider;
+ this.stateLookup = stateLookup;
+ }
@Override
public void pause() {
@@ -46,6 +63,9 @@ public abstract class AbstractComponentScheduler implements ComponentScheduler {
return;
}
+ logger.debug("{} enabling {}", this, toEnable);
+ enableNow(toEnable);
+
Connectable connectable;
while ((connectable = toStart.poll()) != null) {
logger.debug("{} starting {}", this, connectable);
@@ -57,6 +77,105 @@ public abstract class AbstractComponentScheduler implements ComponentScheduler {
return pauseCount.get() > 0;
}
+
+ @Override
+ public void transitionComponentState(final Connectable component, final ScheduledState desiredState) {
+ final ScheduledState scheduledState = getScheduledState(component);
+ final ScheduledState finalState = desiredState == null ? ScheduledState.ENABLED : desiredState;
+
+ switch (finalState) {
+ case DISABLED:
+ if (scheduledState == ScheduledState.RUNNING) {
+ logger.debug("Stopping {}", component);
+ stopComponent(component);
+ }
+
+ logger.debug("Disabling {}", component);
+ disable(component);
+ break;
+ case ENABLED:
+ if (scheduledState == ScheduledState.DISABLED) {
+ logger.debug("Enabling {}", component);
+ enable(component);
+ } else if (scheduledState == ScheduledState.RUNNING) {
+ logger.debug("Stopping {}", component);
+ stopComponent(component);
+ }
+
+ break;
+ case RUNNING:
+ if (scheduledState == ScheduledState.DISABLED) {
+ logger.debug("Enabling {}", component);
+ enable(component);
+ }
+
+ logger.debug("Starting {}", component);
+ startComponent(component);
+ break;
+ }
+ }
+
+ private ScheduledState getScheduledState(final Connectable component) {
+ // Use the State Lookup to get the state, if possible. If, for some reason, it doesn't
+ // provide us a state (which should never happen) just fall back to the component's scheduled state.
+ switch (component.getConnectableType()) {
+ case INPUT_PORT:
+ case OUTPUT_PORT:
+ case REMOTE_INPUT_PORT:
+ case REMOTE_OUTPUT_PORT:
+ return stateLookup.getState((Port) component);
+ case PROCESSOR:
+ return stateLookup.getState((ProcessorNode) component);
+ case FUNNEL:
+ return ScheduledState.RUNNING;
+ }
+
+ switch (component.getScheduledState()) {
+ case DISABLED:
+ return ScheduledState.DISABLED;
+ case RUN_ONCE:
+ case STOPPED:
+ case STOPPING:
+ return ScheduledState.ENABLED;
+ case RUNNING:
+ case STARTING:
+ default:
+ return ScheduledState.RUNNING;
+ }
+ }
+
+
+ private void enable(final Connectable component) {
+ final ProcessGroup group = component.getProcessGroup();
+ switch (component.getConnectableType()) {
+ case INPUT_PORT:
+ group.enableInputPort((Port) component);
+ break;
+ case OUTPUT_PORT:
+ group.enableOutputPort((Port) component);
+ break;
+ case PROCESSOR:
+ group.enableProcessor((ProcessorNode) component);
+ break;
+ }
+ }
+
+ private void disable(final Connectable component) {
+ final ProcessGroup group = component.getProcessGroup();
+ switch (component.getConnectableType()) {
+ case INPUT_PORT:
+ group.disableInputPort((Port) component);
+ break;
+ case OUTPUT_PORT:
+ group.disableOutputPort((Port) component);
+ break;
+ case PROCESSOR:
+ group.disableProcessor((ProcessorNode) component);
+ break;
+ }
+ }
+
+
@Override
public void startComponent(final Connectable component) {
if (isPaused()) {
@@ -68,5 +187,48 @@ public abstract class AbstractComponentScheduler implements ComponentScheduler {
}
}
+ @Override
+ public void stopComponent(final Connectable component) {
+ final ProcessGroup processGroup = component.getProcessGroup();
+ switch (component.getConnectableType()) {
+ case INPUT_PORT:
+ processGroup.stopInputPort((Port) component);
+ break;
+ case OUTPUT_PORT:
+ processGroup.stopOutputPort((Port) component);
+ break;
+ case PROCESSOR:
+ processGroup.stopProcessor((ProcessorNode) component);
+ break;
+ case REMOTE_INPUT_PORT:
+ case REMOTE_OUTPUT_PORT:
+ final RemoteGroupPort port = (RemoteGroupPort) component;
+ port.getRemoteProcessGroup().stopTransmitting(port);
+ break;
+ }
+ }
+
+ @Override
+ public void enableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ if (isPaused()) {
+ logger.debug("{} called to enable {} but paused so will queue them for start later", this, controllerServices);
+ toEnable.addAll(controllerServices);
+ } else {
+ logger.debug("{} enabling {} now", this, controllerServices);
+ enableNow(controllerServices);
+ }
+ }
+
+ @Override
+ public void disableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ serviceProvider.disableControllerServicesAsync(controllerServices);
+ }
+
+ protected ControllerServiceProvider getControllerServiceProvider() {
+ return serviceProvider;
+ }
+
protected abstract void startNow(Connectable component);
+
+ protected abstract void enableNow(Collection<ControllerServiceNode> controllerServices);
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ComponentScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ComponentScheduler.java
index bc6afcb979..6a38dde93d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ComponentScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ComponentScheduler.java
@@ -18,10 +18,22 @@
package org.apache.nifi.groups;
import org.apache.nifi.connectable.Connectable;
+import org.apache.nifi.controller.service.ControllerServiceNode;
+import org.apache.nifi.flow.ScheduledState;
+
+import java.util.Collection;
public interface ComponentScheduler {
void startComponent(Connectable component);
+ void stopComponent(Connectable component);
+
+ void transitionComponentState(Connectable component, ScheduledState desiredState);
+
+ void enableControllerServicesAsync(Collection<ControllerServiceNode> controllerServices);
+
+ void disableControllerServicesAsync(Collection<ControllerServiceNode> controllerServices);
+
void pause();
void resume();
@@ -32,6 +44,22 @@ public interface ComponentScheduler {
public void startComponent(final Connectable component) {
}
+ @Override
+ public void stopComponent(final Connectable component) {
+ }
+
+ @Override
+ public void transitionComponentState(final Connectable component, final ScheduledState desiredState) {
+ }
+
+ @Override
+ public void enableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ }
+
+ @Override
+ public void disableControllerServicesAsync(final Collection<ControllerServiceNode> controllerServices) {
+ }
+
@Override
public void pause() {
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/VersionedComponentStateLookup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/VersionedComponentStateLookup.java
index a1ceccd41f..3c855e7749 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/VersionedComponentStateLookup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/registry/flow/mapping/VersionedComponentStateLookup.java
@@ -21,7 +21,6 @@ import org.apache.nifi.connectable.Port;
import org.apache.nifi.controller.ProcessorNode;
import org.apache.nifi.controller.ReportingTaskNode;
import org.apache.nifi.controller.service.ControllerServiceNode;
-import org.apache.nifi.controller.service.ControllerServiceState;
import org.apache.nifi.flow.ScheduledState;
public interface VersionedComponentStateLookup {
@@ -54,7 +53,7 @@ public interface VersionedComponentStateLookup {
@Override
public ScheduledState getState(final ControllerServiceNode serviceNode) {
- return (serviceNode.getState() == ControllerServiceState.DISABLED || serviceNode.getState() == ControllerServiceState.DISABLING) ? ScheduledState.DISABLED : ScheduledState.ENABLED;
+ return ScheduledState.DISABLED;
}
};
@@ -64,7 +63,7 @@ public interface VersionedComponentStateLookup {
VersionedComponentStateLookup IDENTITY_LOOKUP = new VersionedComponentStateLookup() {
@Override
public ScheduledState getState(final ProcessorNode processorNode) {
- return map(processorNode.getPhysicalScheduledState());
+ return map(processorNode.getDesiredState());
}
@Override
@@ -91,6 +90,10 @@ public interface VersionedComponentStateLookup {
}
private ScheduledState map(final org.apache.nifi.controller.ScheduledState componentState) {
+ if (componentState == null) {
+ return null;
+ }
+
switch (componentState) {
case DISABLED:
return ScheduledState.DISABLED;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
index 4c8af1d0db..ec5e438dc6 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -168,6 +168,7 @@ import org.apache.nifi.provenance.StandardProvenanceAuthorizableFactory;
import org.apache.nifi.provenance.StandardProvenanceEventRecord;
import org.apache.nifi.registry.VariableRegistry;
import org.apache.nifi.registry.flow.FlowRegistryClient;
+import org.apache.nifi.registry.flow.mapping.VersionedComponentStateLookup;
import org.apache.nifi.registry.variable.MutableVariableRegistry;
import org.apache.nifi.remote.HttpRemoteSiteListener;
import org.apache.nifi.remote.RemoteGroupPort;
@@ -1416,28 +1417,7 @@ public class FlowController implements ReportingTaskProvider, Authorizable, Node
readLock.lock();
try {
- final ScheduledStateLookup scheduledStateLookup = new ScheduledStateLookup() {
- @Override
- public ScheduledState getScheduledState(final ProcessorNode procNode) {
- if (startConnectablesAfterInitialization.contains(procNode)) {
- return ScheduledState.RUNNING;
- }
-
- return procNode.getDesiredState();
- }
-
- @Override
- public ScheduledState getScheduledState(final Port port) {
- if (startConnectablesAfterInitialization.contains(port)) {
- return ScheduledState.RUNNING;
- }
- if (startRemoteGroupPortsAfterInitialization.contains(port)) {
- return ScheduledState.RUNNING;
- }
-
- return port.getScheduledState();
- }
- };
+ final ScheduledStateLookup scheduledStateLookup = createScheduledStateLookup();
flowConfiguration = serializer.transform(this, scheduledStateLookup);
} finally {
@@ -1447,11 +1427,76 @@ public class FlowController implements ReportingTaskProvider, Authorizable, Node
serializer.serialize(flowConfiguration, os);
}
+ public ScheduledStateLookup createScheduledStateLookup() {
+ return new ScheduledStateLookup() {
+ @Override
+ public ScheduledState getScheduledState(final ProcessorNode procNode) {
+ if (startConnectablesAfterInitialization.contains(procNode)) {
+ return ScheduledState.RUNNING;
+ }
+
+ return procNode.getDesiredState();
+ }
+
+ @Override
+ public ScheduledState getScheduledState(final Port port) {
+ if (startConnectablesAfterInitialization.contains(port)) {
+ return ScheduledState.RUNNING;
+ }
+ if (startRemoteGroupPortsAfterInitialization.contains(port)) {
+ return ScheduledState.RUNNING;
+ }
+
+ return port.getScheduledState();
+ }
+ };
+ }
+
+ /**
+ * Creates a VersionedComponentStateLookup that checks whether or not the given component is scheduled to start when the FlowController
+ * is initialized. If the FlowController has already been initialized or if the given component is not scheduled to start upon FlowController
+ * initialization, delegates the call to the provided lookup
+ *
+ * @param delegate the lookup to delegate calls to if a component is not scheduled to start upon FlowController initialization
+ * @return the VersionedComponentStateLookup that is created
+ */
+ public VersionedComponentStateLookup createVersionedComponentStateLookup(final VersionedComponentStateLookup delegate) {
+ return new VersionedComponentStateLookup() {
+ @Override
+ public org.apache.nifi.flow.ScheduledState getState(final ProcessorNode processorNode) {
+ if (isStartAfterInitialization(processorNode)) {
+ return org.apache.nifi.flow.ScheduledState.RUNNING;
+ }
+
+ return delegate.getState(processorNode);
+ }
+
+ @Override
+ public org.apache.nifi.flow.ScheduledState getState(final Port port) {
+ if (isStartAfterInitialization(port)) {
+ return org.apache.nifi.flow.ScheduledState.RUNNING;
+ }
+
+ return delegate.getState(port);
+ }
+
+ @Override
+ public org.apache.nifi.flow.ScheduledState getState(final ReportingTaskNode taskNode) {
+ return delegate.getState(taskNode);
+ }
+
+ @Override
+ public org.apache.nifi.flow.ScheduledState getState(final ControllerServiceNode serviceNode) {
+ return delegate.getState(serviceNode);
+ }
+ };
+ }
+
/**
* Synchronizes this controller with the proposed flow.
* <p>
* For more details, see
- * {@link FlowSynchronizer#sync(FlowController, DataFlow, PropertyEncryptor, FlowService)}.
+ * {@link FlowSynchronizer#sync(FlowController, DataFlow, PropertyEncryptor, FlowService, BundleUpdateStrategy)}.
*
* @param synchronizer synchronizer
* @param dataFlow the flow to load the controller with. If the flow is null
@@ -1817,6 +1862,9 @@ public class FlowController implements ReportingTaskProvider, Authorizable, Node
case REMOTE_OUTPUT_PORT:
group.startOutputPort((Port) connectable);
break;
+ case PROCESSOR:
+ group.startProcessor((ProcessorNode) connectable, true);
+ break;
default:
throw new IllegalArgumentException();
}
@@ -1847,6 +1895,10 @@ public class FlowController implements ReportingTaskProvider, Authorizable, Node
startConnectablesAfterInitialization.remove(connectable);
group.stopOutputPort((Port) connectable);
break;
+ case PROCESSOR:
+ startConnectablesAfterInitialization.remove(connectable);
+ group.stopProcessor((ProcessorNode) connectable);
+ break;
default:
throw new IllegalArgumentException();
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
index 14f2799009..1dbf3b5b38 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/VersionedFlowSynchronizer.java
@@ -100,6 +100,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -310,7 +311,11 @@ public class VersionedFlowSynchronizer implements FlowSynchronizer {
final ComponentIdGenerator componentIdGenerator = (proposedId, instanceId, destinationGroupId) -> instanceId;
- final ComponentScheduler componentScheduler = new FlowControllerComponentScheduler(controller);
+ // Use a Versioned Component State Lookup that will check to see if the component is scheduled to start upon FlowController initialization.
+ // Otherwise, fallback to the identity lookup (i.e., use whatever is set on the component itself).
+ final VersionedComponentStateLookup stateLookup = controller.createVersionedComponentStateLookup(VersionedComponentStateLookup.IDENTITY_LOOKUP);
+
+ final ComponentScheduler componentScheduler = new FlowControllerComponentScheduler(controller, stateLookup);
if (rootGroup.isEmpty()) {
final VersionedProcessGroup versionedRoot = versionedExternalFlow.getFlowContents();
@@ -343,7 +348,7 @@ public class VersionedFlowSynchronizer implements FlowSynchronizer {
final FlowMappingOptions flowMappingOptions = new FlowMappingOptions.Builder()
.mapSensitiveConfiguration(true)
.mapPropertyDescriptors(false)
- .stateLookup(VersionedComponentStateLookup.IDENTITY_LOOKUP)
+ .stateLookup(stateLookup)
.sensitiveValueEncryptor(encryptor::encrypt)
.componentIdLookup(ComponentIdLookup.VERSIONED_OR_GENERATE)
.mapInstanceIdentifiers(true)
@@ -985,7 +990,8 @@ public class VersionedFlowSynchronizer implements FlowSynchronizer {
private static class FlowControllerComponentScheduler extends AbstractComponentScheduler implements ComponentScheduler {
private final FlowController flowController;
- public FlowControllerComponentScheduler(final FlowController flowController) {
+ public FlowControllerComponentScheduler(final FlowController flowController, final VersionedComponentStateLookup stateLookup) {
+ super(flowController.getControllerServiceProvider(), stateLookup);
this.flowController = flowController;
}
@@ -1005,5 +1011,15 @@ public class VersionedFlowSynchronizer implements FlowSynchronizer {
break;
}
}
+
+ @Override
+ public void stopComponent(final Connectable component) {
+ flowController.stopConnectable(component);
+ }
+
+ @Override
+ protected void enableNow(final Collection<ControllerServiceNode> controllerServices) {
+ flowController.getControllerServiceProvider().enableControllerServices(controllerServices);
+ }
}
}
[nifi] 31/31: NIFI-9860 Upgraded JRuby from 9.2.6.0 to 9.3.4.0
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 5ef8f3b4268afdeb051d308b601141699495907b
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Apr 1 10:21:22 2022 -0500
NIFI-9860 Upgraded JRuby from 9.2.6.0 to 9.3.4.0
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #5924
---
nifi-assembly/NOTICE | 2 +-
.../nifi-scripting-nar/src/main/resources/META-INF/NOTICE | 2 +-
.../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE
index 14278757eb..061756efc3 100644
--- a/nifi-assembly/NOTICE
+++ b/nifi-assembly/NOTICE
@@ -2047,7 +2047,7 @@ The following binary components are provided under the Eclipse Public License 1.
(EPL 1.0)(MPL 2.0) H2 Database (com.h2database:h2:jar:1.3.176 - http://www.h2database.com/html/license.html)
(EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.2.6 - http://logback.qos.ch/)
(EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.2.6 - http://logback.qos.ch/)
- (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.1.9.0 - http://jruby.org).
+ (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete - http://jruby.org).
(EPL 1.0) Eclipse Paho MQTT Client (org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0 - https://github.com/eclipse/paho.mqtt.java)
(EPL 1.0) Eclipse Link (org.eclipse.persistence:eclipselink:2.5.2 - http://www.eclipse.org/eclipselink/)
(EPL 1.0) Common Service Data Objects (org.eclipse.persistence:commonj.sdo:2.1.1 - http://www.eclipse.org/eclipselink/)
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
index f9eca9fcc3..f4a11d9068 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-nar/src/main/resources/META-INF/NOTICE
@@ -156,5 +156,5 @@ Eclipse Public License v1.0
The following binary components are provided under a EPL v1.0 license
- (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete:9.1.9.0 - http://jruby.org).
+ (EPLv1.0)(GPL 2)(LGPL 2.1) JRuby (org.jruby:jruby-complete - http://jruby.org).
(EPLv1.0) Clojure (org.clojure:clojure:1.8.0 - http://clojure.org)
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 2b9b4ebe8d..80efc85037 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>9.2.6.0</version>
+ <version>9.3.4.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
[nifi] 06/31: NIFI-7262 Added debug logging for the generated query in PutCassandraRecord. (#5898)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 79b375fc834262981987634a02a05b8e668f6885
Author: Mike <mt...@apache.org>
AuthorDate: Fri Mar 25 06:48:57 2022 -0400
NIFI-7262 Added debug logging for the generated query in PutCassandraRecord. (#5898)
Signed-off-by: Otto Fowler <ot...@apache.org>
---
.../org/apache/nifi/processors/cassandra/PutCassandraRecord.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java
index f5e6492fe8..b068f5ad81 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/src/main/java/org/apache/nifi/processors/cassandra/PutCassandraRecord.java
@@ -290,6 +290,11 @@ public class PutCassandraRecord extends AbstractCassandraProcessor {
} else {
throw new IllegalArgumentException(format("Statement Type %s is not valid, FlowFile %s", statementType, inputFlowFile));
}
+
+ if (getLogger().isDebugEnabled()) {
+ getLogger().debug("Query: {}", query.toString());
+ }
+
batchStatement.add(query);
if (recordsAdded.incrementAndGet() == batchSize) {
[nifi] 25/31: NIFI-9852 Upgraded Spring Framework from 5.3.16 to 5.3.18
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 17c386df0c5e8146ddce8816b05adfb28189e201
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Thu Mar 31 11:48:00 2022 -0500
NIFI-9852 Upgraded Spring Framework from 5.3.16 to 5.3.18
- Upgraded Spring Boot from 2.6.4 to 2.6.6
Signed-off-by: Nathan Gough <th...@gmail.com>
This closes #5921.
---
nifi-registry/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index f581b7b848..06f8c70e32 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -37,7 +37,7 @@
</modules>
<properties>
<jax.rs.api.version>2.1</jax.rs.api.version>
- <spring.boot.version>2.6.4</spring.boot.version>
+ <spring.boot.version>2.6.6</spring.boot.version>
<flyway.version>8.4.2</flyway.version>
<flyway.tests.version>7.0.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
diff --git a/pom.xml b/pom.xml
index 56b3aa2d83..c0d414ff87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<mockito.version>3.11.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<netty.4.version>4.1.74.Final</netty.4.version>
- <spring.version>5.3.16</spring.version>
+ <spring.version>5.3.18</spring.version>
<spring.security.version>5.6.2</spring.security.version>
<h2.version>2.1.210</h2.version>
</properties>
[nifi] 01/31: NIFI-9868
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 17b191f707116c27ccb4fab91bf4d2f69f25adac
Author: Joe Witt <jo...@apache.org>
AuthorDate: Mon Apr 4 10:59:26 2022 -0700
NIFI-9868
---
c2/c2-protocol/c2-protocol-api/pom.xml | 4 +-
c2/c2-protocol/c2-protocol-component-api/pom.xml | 2 +-
c2/c2-protocol/pom.xml | 2 +-
c2/pom.xml | 4 +-
minifi/minifi-assembly/pom.xml | 6 +-
minifi/minifi-bootstrap/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-api/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-assembly/pom.xml | 2 +-
.../minifi-c2-cache-filesystem/pom.xml | 2 +-
.../minifi-c2-cache/minifi-c2-cache-s3/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-cache/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-docker/pom.xml | 4 +-
.../minifi-c2/minifi-c2-integration-tests/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-jetty/pom.xml | 2 +-
.../minifi-c2-provider-cache/pom.xml | 2 +-
.../minifi-c2-provider-delegating/pom.xml | 2 +-
.../minifi-c2-provider-nifi-rest/pom.xml | 2 +-
.../minifi-c2-provider-util/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-provider/pom.xml | 2 +-
minifi/minifi-c2/minifi-c2-service/pom.xml | 2 +-
minifi/minifi-c2/pom.xml | 2 +-
.../minifi-commons/minifi-commons-schema/pom.xml | 2 +-
minifi/minifi-commons/minifi-utils/pom.xml | 2 +-
minifi/minifi-commons/pom.xml | 2 +-
minifi/minifi-docker/pom.xml | 4 +-
minifi/minifi-docs/pom.xml | 2 +-
minifi/minifi-integration-tests/pom.xml | 2 +-
.../minifi-framework-nar/pom.xml | 6 +-
.../minifi-framework/minifi-framework-api/pom.xml | 8 +-
.../minifi-framework/minifi-framework-core/pom.xml | 4 +-
.../minifi-framework/minifi-resources/pom.xml | 2 +-
.../minifi-framework/minifi-runtime/pom.xml | 2 +-
.../minifi-framework/minifi-server/pom.xml | 2 +-
.../minifi-framework/pom.xml | 2 +-
.../minifi-server-nar/pom.xml | 8 +-
.../minifi-framework-bundle/pom.xml | 18 +-
.../minifi-provenance-repositories/pom.xml | 2 +-
.../minifi-provenance-repository-nar/pom.xml | 2 +-
.../minifi-provenance-repository-bundle/pom.xml | 2 +-
.../minifi-nar-bundles/minifi-standard-nar/pom.xml | 8 +-
.../minifi-update-attribute-nar/pom.xml | 6 +-
minifi/minifi-nar-bundles/pom.xml | 2 +-
.../minifi-toolkit/minifi-toolkit-assembly/pom.xml | 2 +-
.../minifi-toolkit-configuration/pom.xml | 2 +-
minifi/minifi-toolkit/pom.xml | 2 +-
minifi/pom.xml | 122 ++++-----
nifi-api/pom.xml | 2 +-
nifi-assembly/pom.xml | 278 ++++++++++-----------
nifi-bootstrap/pom.xml | 20 +-
nifi-commons/nifi-bootstrap-utils/pom.xml | 2 +-
nifi-commons/nifi-data-provenance-utils/pom.xml | 8 +-
nifi-commons/nifi-expression-language/pom.xml | 10 +-
nifi-commons/nifi-flow-encryptor/pom.xml | 4 +-
nifi-commons/nifi-flowfile-packager/pom.xml | 2 +-
nifi-commons/nifi-hl7-query-language/pom.xml | 2 +-
nifi-commons/nifi-json-utils/pom.xml | 6 +-
nifi-commons/nifi-logging-utils/pom.xml | 2 +-
nifi-commons/nifi-metrics/pom.xml | 4 +-
nifi-commons/nifi-parameter/pom.xml | 4 +-
nifi-commons/nifi-properties/pom.xml | 4 +-
nifi-commons/nifi-property-encryptor/pom.xml | 4 +-
nifi-commons/nifi-property-protection-api/pom.xml | 4 +-
nifi-commons/nifi-property-protection-aws/pom.xml | 6 +-
.../nifi-property-protection-azure/pom.xml | 6 +-
.../nifi-property-protection-cipher/pom.xml | 4 +-
.../nifi-property-protection-factory/pom.xml | 22 +-
nifi-commons/nifi-property-protection-gcp/pom.xml | 6 +-
.../nifi-property-protection-hashicorp/pom.xml | 6 +-
.../nifi-property-protection-shared/pom.xml | 4 +-
nifi-commons/nifi-property-utils/pom.xml | 2 +-
nifi-commons/nifi-record-path/pom.xml | 10 +-
nifi-commons/nifi-record/pom.xml | 2 +-
nifi-commons/nifi-repository-encryption/pom.xml | 8 +-
nifi-commons/nifi-rocksdb-utils/pom.xml | 8 +-
nifi-commons/nifi-schema-utils/pom.xml | 2 +-
nifi-commons/nifi-security-kerberos-api/pom.xml | 2 +-
nifi-commons/nifi-security-kerberos/pom.xml | 6 +-
nifi-commons/nifi-security-kms/pom.xml | 2 +-
nifi-commons/nifi-security-socket-ssl/pom.xml | 6 +-
nifi-commons/nifi-security-utils-api/pom.xml | 2 +-
nifi-commons/nifi-security-utils/pom.xml | 12 +-
nifi-commons/nifi-single-user-utils/pom.xml | 2 +-
nifi-commons/nifi-site-to-site-client/pom.xml | 12 +-
nifi-commons/nifi-socket-utils/pom.xml | 8 +-
nifi-commons/nifi-utils/pom.xml | 6 +-
nifi-commons/nifi-uuid5/pom.xml | 2 +-
nifi-commons/nifi-vault-utils/pom.xml | 8 +-
nifi-commons/nifi-web-utils/pom.xml | 2 +-
nifi-commons/nifi-write-ahead-log/pom.xml | 4 +-
nifi-commons/pom.xml | 2 +-
nifi-docker/dockerhub/pom.xml | 2 +-
nifi-docker/dockermaven/pom.xml | 2 +-
nifi-docker/pom.xml | 2 +-
nifi-docs/pom.xml | 2 +-
.../nifi-nifi-example-nar/pom.xml | 2 +-
.../nifi-nifi-example-processors/pom.xml | 6 +-
nifi-external/nifi-example-bundle/pom.xml | 4 +-
.../nifi-kafka-connector-assembly/pom.xml | 24 +-
.../nifi-kafka-connector-tests/pom.xml | 10 +-
.../nifi-kafka-connector/pom.xml | 24 +-
nifi-external/nifi-kafka-connect/pom.xml | 2 +-
nifi-external/nifi-spark-receiver/pom.xml | 4 +-
nifi-external/pom.xml | 2 +-
nifi-framework-api/pom.xml | 4 +-
nifi-h2/nifi-h2-database-migrator/pom.xml | 4 +-
nifi-h2/nifi-h2-database/pom.xml | 4 +-
nifi-h2/pom.xml | 2 +-
.../nifi-extension-manifest-model/pom.xml | 2 +-
.../nifi-extension-manifest-parser/pom.xml | 4 +-
nifi-manifest/nifi-runtime-manifest-core/pom.xml | 10 +-
nifi-manifest/nifi-runtime-manifest-test/pom.xml | 6 +-
nifi-manifest/nifi-runtime-manifest/pom.xml | 6 +-
nifi-manifest/pom.xml | 2 +-
.../nifi-processor-bundle-archetype/pom.xml | 2 +-
.../nifi-service-bundle-archetype/pom.xml | 2 +-
nifi-maven-archetypes/pom.xml | 2 +-
nifi-mock/pom.xml | 16 +-
.../nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml | 10 +-
.../nifi-accumulo-processors/pom.xml | 20 +-
.../nifi-accumulo-services-api-nar/pom.xml | 10 +-
.../nifi-accumulo-services-api/pom.xml | 10 +-
.../nifi-accumulo-services-nar/pom.xml | 10 +-
.../nifi-accumulo-services/pom.xml | 24 +-
nifi-nar-bundles/nifi-accumulo-bundle/pom.xml | 6 +-
.../nifi-ambari-bundle/nifi-ambari-nar/pom.xml | 4 +-
.../nifi-ambari-reporting-task/pom.xml | 10 +-
nifi-nar-bundles/nifi-ambari-bundle/pom.xml | 2 +-
.../nifi-amqp-bundle/nifi-amqp-nar/pom.xml | 6 +-
.../nifi-amqp-bundle/nifi-amqp-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-amqp-bundle/pom.xml | 6 +-
.../nifi-asn1-bundle/nifi-asn1-nar/pom.xml | 6 +-
.../nifi-asn1-bundle/nifi-asn1-services/pom.xml | 4 +-
nifi-nar-bundles/nifi-asn1-bundle/pom.xml | 2 +-
.../nifi-atlas-bundle/nifi-atlas-nar/pom.xml | 4 +-
.../nifi-atlas-reporting-task/pom.xml | 8 +-
nifi-nar-bundles/nifi-atlas-bundle/pom.xml | 4 +-
.../nifi-avro-bundle/nifi-avro-nar/pom.xml | 6 +-
.../nifi-avro-bundle/nifi-avro-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-avro-bundle/pom.xml | 4 +-
.../nifi-aws-abstract-processors/pom.xml | 6 +-
.../nifi-aws-bundle/nifi-aws-nar/pom.xml | 8 +-
.../nifi-aws-parameter-value-providers/pom.xml | 8 +-
.../nifi-aws-bundle/nifi-aws-processors/pom.xml | 16 +-
.../nifi-aws-service-api-nar/pom.xml | 6 +-
.../nifi-aws-bundle/nifi-aws-service-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
.../nifi-azure-graph-authorizer/pom.xml | 6 +-
.../nifi-azure-bundle/nifi-azure-nar/pom.xml | 10 +-
.../nifi-azure-processors/pom.xml | 22 +-
.../nifi-azure-reporting-task/pom.xml | 12 +-
.../nifi-azure-services-api-nar/pom.xml | 6 +-
.../nifi-azure-services-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +-
.../nifi-beats-bundle/nifi-beats-nar/pom.xml | 8 +-
.../nifi-beats-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-beats-bundle/pom.xml | 4 +-
.../pom.xml | 24 +-
.../nifi-cassandra-nar/pom.xml | 4 +-
.../nifi-cassandra-processors/pom.xml | 6 +-
.../nifi-cassandra-services-api-nar/pom.xml | 8 +-
.../nifi-cassandra-services-api/pom.xml | 2 +-
.../nifi-cassandra-services-nar/pom.xml | 8 +-
.../nifi-cassandra-services/pom.xml | 12 +-
nifi-nar-bundles/nifi-cassandra-bundle/pom.xml | 4 +-
.../nifi-ccda-bundle/nifi-ccda-nar/pom.xml | 2 +-
.../nifi-ccda-bundle/nifi-ccda-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-ccda-bundle/pom.xml | 4 +-
nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml | 2 +-
.../nifi-cdc-mysql-nar/pom.xml | 4 +-
.../nifi-cdc-mysql-processors/pom.xml | 6 +-
.../nifi-cdc/nifi-cdc-mysql-bundle/pom.xml | 4 +-
nifi-nar-bundles/nifi-cdc/pom.xml | 2 +-
.../nifi-confluent-platform-nar/pom.xml | 6 +-
.../nifi-confluent-schema-registry-service/pom.xml | 8 +-
.../nifi-confluent-platform-bundle/pom.xml | 2 +-
.../nifi-couchbase-nar/pom.xml | 8 +-
.../nifi-couchbase-processors/pom.xml | 8 +-
.../nifi-couchbase-services-api-nar/pom.xml | 8 +-
.../nifi-couchbase-services-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-couchbase-bundle/pom.xml | 4 +-
.../nifi-cybersecurity-nar/pom.xml | 6 +-
.../nifi-cybersecurity-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml | 4 +-
.../nifi-datadog-bundle/nifi-datadog-nar/pom.xml | 2 +-
.../nifi-datadog-reporting-task/pom.xml | 8 +-
nifi-nar-bundles/nifi-datadog-bundle/pom.xml | 4 +-
.../nifi-druid-controller-service-api-nar/pom.xml | 6 +-
.../nifi-druid-controller-service-api/pom.xml | 2 +-
.../nifi-druid-controller-service/pom.xml | 10 +-
.../nifi-druid-bundle/nifi-druid-nar/pom.xml | 8 +-
.../nifi-druid-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 4 +-
.../nifi-easyrules-nar/pom.xml | 8 +-
.../nifi-easyrules-service/pom.xml | 8 +-
nifi-nar-bundles/nifi-easyrules-bundle/pom.xml | 4 +-
.../pom.xml | 8 +-
.../nifi-elasticsearch-client-service-api/pom.xml | 10 +-
.../nifi-elasticsearch-client-service-nar/pom.xml | 8 +-
.../nifi-elasticsearch-client-service/pom.xml | 26 +-
.../nifi-elasticsearch-nar/pom.xml | 4 +-
.../nifi-elasticsearch-processors/pom.xml | 16 +-
.../nifi-elasticsearch-restapi-nar/pom.xml | 6 +-
.../nifi-elasticsearch-restapi-processors/pom.xml | 30 +--
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 6 +-
.../nifi-email-bundle/nifi-email-nar/pom.xml | 4 +-
.../nifi-email-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-email-bundle/pom.xml | 4 +-
.../nifi-enrich-bundle/nifi-enrich-nar/pom.xml | 2 +-
.../nifi-enrich-processors/pom.xml | 12 +-
nifi-nar-bundles/nifi-enrich-bundle/pom.xml | 4 +-
.../nifi-evtx-bundle/nifi-evtx-nar/pom.xml | 4 +-
.../nifi-evtx-bundle/nifi-evtx-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-evtx-bundle/pom.xml | 4 +-
.../nifi-extension-utils/nifi-bin-manager/pom.xml | 4 +-
.../nifi-database-test-utils/pom.xml | 2 +-
.../nifi-database-utils/pom.xml | 8 +-
.../nifi-extension-utils/nifi-event-listen/pom.xml | 8 +-
.../nifi-extension-utils/nifi-event-put/pom.xml | 6 +-
.../nifi-event-transport/pom.xml | 6 +-
.../nifi-extension-utils/nifi-hadoop-utils/pom.xml | 8 +-
.../nifi-kerberos-test-utils/pom.xml | 8 +-
.../nifi-listed-entity/pom.xml | 4 +-
.../nifi-prometheus-utils/pom.xml | 8 +-
.../nifi-extension-utils/nifi-put-pattern/pom.xml | 4 +-
.../nifi-avro-record-utils/pom.xml | 6 +-
.../nifi-hadoop-record-utils/pom.xml | 8 +-
.../nifi-mock-record-utils/pom.xml | 6 +-
.../nifi-standard-record-utils/pom.xml | 8 +-
.../nifi-extension-utils/nifi-record-utils/pom.xml | 2 +-
.../nifi-reporting-utils/pom.xml | 8 +-
.../nifi-service-utils/pom.xml | 6 +-
.../nifi-extension-utils/nifi-syslog-utils/pom.xml | 6 +-
nifi-nar-bundles/nifi-extension-utils/pom.xml | 2 +-
.../nifi-flume-bundle/nifi-flume-nar/pom.xml | 6 +-
.../nifi-flume-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-flume-bundle/pom.xml | 6 +-
.../nifi-framework-nar/pom.xml | 8 +-
.../nifi-framework/nifi-administration/pom.xml | 4 +-
.../nifi-framework/nifi-authorizer/pom.xml | 4 +-
.../nifi-framework/nifi-client-dto/pom.xml | 6 +-
.../nifi-framework/nifi-documentation/pom.xml | 2 +-
.../nifi-framework/nifi-file-authorizer/pom.xml | 2 +-
.../nifi-flowfile-repo-serialization/pom.xml | 12 +-
.../nifi-framework-authorization-providers/pom.xml | 8 +-
.../nifi-framework-authorization/pom.xml | 4 +-
.../nifi-framework-cluster-protocol/pom.xml | 6 +-
.../nifi-framework/nifi-framework-cluster/pom.xml | 2 +-
.../nifi-framework-components/pom.xml | 22 +-
.../nifi-framework/nifi-framework-core-api/pom.xml | 12 +-
.../nifi-framework/nifi-framework-core/pom.xml | 40 +--
.../nifi-framework-nar-loading-utils/pom.xml | 2 +-
.../nifi-framework-nar-utils/pom.xml | 4 +-
.../nifi-framework/nifi-headless-server/pom.xml | 2 +-
.../nifi-framework/nifi-mock-authorizer/pom.xml | 2 +-
.../nifi-framework/nifi-nar-utils/pom.xml | 2 +-
.../nifi-framework/nifi-properties-loader/pom.xml | 2 +-
.../nifi-framework/nifi-repository-models/pom.xml | 6 +-
.../nifi-framework/nifi-resources/pom.xml | 2 +-
.../nifi-framework/nifi-runtime/pom.xml | 2 +-
.../nifi-framework/nifi-shell-authorizer/pom.xml | 4 +-
.../nifi-framework/nifi-site-to-site/pom.xml | 4 +-
.../nifi-standard-prioritizers/pom.xml | 2 +-
.../nifi-framework/nifi-user-actions/pom.xml | 2 +-
.../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +-
.../nifi-web/nifi-ui-extension/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 6 +-
.../nifi-web/nifi-web-content-access/pom.xml | 2 +-
.../nifi-web/nifi-web-content-viewer/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-docs/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-error/pom.xml | 2 +-
.../nifi-web/nifi-web-optimistic-locking/pom.xml | 2 +-
.../nifi-web/nifi-web-security/pom.xml | 2 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +-
.../nifi-framework/nifi-web/pom.xml | 12 +-
.../nifi-framework-bundle/nifi-framework/pom.xml | 2 +-
.../nifi-headless-server-nar/pom.xml | 6 +-
.../nifi-framework-bundle/nifi-server-nar/pom.xml | 6 +-
nifi-nar-bundles/nifi-framework-bundle/pom.xml | 74 +++---
.../nifi-gcp-bundle/nifi-gcp-nar/pom.xml | 6 +-
.../nifi-gcp-bundle/nifi-gcp-processors/pom.xml | 10 +-
.../nifi-gcp-services-api-nar/pom.xml | 8 +-
.../nifi-gcp-bundle/nifi-gcp-services-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-gcp-bundle/pom.xml | 4 +-
.../nifi-geohash-bundle/nifi-geohash-nar/pom.xml | 4 +-
.../nifi-geohash-processors/pom.xml | 12 +-
nifi-nar-bundles/nifi-geohash-bundle/pom.xml | 2 +-
.../nifi-graph-client-service-api-nar/pom.xml | 6 +-
.../nifi-graph-client-service-api/pom.xml | 4 +-
.../nifi-graph-bundle/nifi-graph-nar/pom.xml | 4 +-
.../nifi-graph-processors/pom.xml | 22 +-
.../nifi-graph-test-clients/pom.xml | 6 +-
.../nifi-neo4j-3-cypher-service-nar/pom.xml | 6 +-
.../nifi-neo4j-3-cypher-service/pom.xml | 10 +-
.../nifi-neo4j-cypher-service-nar/pom.xml | 6 +-
.../nifi-neo4j-cypher-service/pom.xml | 10 +-
.../nifi-other-graph-services-nar/pom.xml | 6 +-
.../nifi-other-graph-services/pom.xml | 10 +-
nifi-nar-bundles/nifi-graph-bundle/pom.xml | 4 +-
.../nifi-groovyx-bundle/nifi-groovyx-nar/pom.xml | 4 +-
.../nifi-groovyx-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-groovyx-bundle/pom.xml | 4 +-
.../nifi-grpc-bundle/nifi-grpc-nar/pom.xml | 8 +-
.../nifi-grpc-bundle/nifi-grpc-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-grpc-bundle/pom.xml | 6 +-
.../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 4 +-
.../nifi-hdfs-processors/pom.xml | 10 +-
nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +-
.../nifi-hadoop-libraries-nar/pom.xml | 4 +-
.../nifi-hadoop-libraries-bundle/pom.xml | 2 +-
.../nifi-hashicorp-vault-nar/pom.xml | 4 +-
.../pom.xml | 8 +-
.../nifi-hashicorp-vault-bundle/pom.xml | 2 +-
.../nifi-hazelcast-services-api-nar/pom.xml | 8 +-
.../nifi-hazelcast-services-api/pom.xml | 2 +-
.../nifi-hazelcast-services-nar/pom.xml | 8 +-
.../nifi-hazelcast-services/pom.xml | 10 +-
nifi-nar-bundles/nifi-hazelcast-bundle/pom.xml | 4 +-
.../nifi-hbase-bundle/nifi-hbase-nar/pom.xml | 4 +-
.../nifi-hbase-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-hbase-bundle/pom.xml | 4 +-
.../nifi-hive-bundle/nifi-hive-nar/pom.xml | 8 +-
.../nifi-hive-bundle/nifi-hive-processors/pom.xml | 22 +-
.../nifi-hive-services-api-nar/pom.xml | 8 +-
.../nifi-hive-services-api/pom.xml | 6 +-
.../nifi-hive-bundle/nifi-hive3-nar/pom.xml | 8 +-
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 28 +--
.../nifi-hive-bundle/nifi-hive_1_1-nar/pom.xml | 8 +-
.../nifi-hive_1_1-processors/pom.xml | 22 +-
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-nar/pom.xml | 4 +-
.../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-hl7-bundle/pom.xml | 6 +-
.../nifi-html-bundle/nifi-html-nar/pom.xml | 4 +-
.../nifi-html-bundle/nifi-html-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-html-bundle/pom.xml | 4 +-
.../nifi-ignite-bundle/nifi-ignite-nar/pom.xml | 4 +-
.../nifi-ignite-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-ignite-bundle/pom.xml | 4 +-
.../nifi-influxdb-bundle/nifi-influxdb-nar/pom.xml | 4 +-
.../nifi-influxdb-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-influxdb-bundle/pom.xml | 4 +-
nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +-
.../nifi-jms-cf-service-nar/pom.xml | 6 +-
.../nifi-jms-bundle/nifi-jms-cf-service/pom.xml | 2 +-
.../nifi-jms-processors-nar/pom.xml | 6 +-
.../nifi-jms-bundle/nifi-jms-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-jms-bundle/pom.xml | 4 +-
.../nifi-jolt-record-nar/pom.xml | 8 +-
.../nifi-jolt-record-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-jolt-record-bundle/pom.xml | 10 +-
.../nifi-kafka-bundle/nifi-kafka-1-0-nar/pom.xml | 4 +-
.../nifi-kafka-1-0-processors/pom.xml | 12 +-
.../nifi-kafka-bundle/nifi-kafka-2-0-nar/pom.xml | 4 +-
.../nifi-kafka-2-0-processors/pom.xml | 12 +-
.../nifi-kafka-bundle/nifi-kafka-2-6-nar/pom.xml | 4 +-
.../nifi-kafka-2-6-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 8 +-
.../nifi-kerberos-iaa-providers-nar/pom.xml | 2 +-
.../nifi-kerberos-iaa-providers/pom.xml | 4 +-
.../nifi-kerberos-iaa-providers-bundle/pom.xml | 4 +-
.../nifi-kudu-controller-service/pom.xml | 6 +-
.../nifi-kudu-bundle/nifi-kudu-nar/pom.xml | 10 +-
.../nifi-kudu-bundle/nifi-kudu-processors/pom.xml | 16 +-
nifi-nar-bundles/nifi-kudu-bundle/pom.xml | 4 +-
.../nifi-language-translation-nar/pom.xml | 4 +-
.../nifi-yandex-processors/pom.xml | 8 +-
.../nifi-language-translation-bundle/pom.xml | 2 +-
.../nifi-ldap-iaa-providers-nar/pom.xml | 2 +-
.../nifi-ldap-iaa-providers/pom.xml | 8 +-
.../nifi-ldap-iaa-providers-bundle/pom.xml | 4 +-
.../nifi-media-bundle/nifi-image-viewer/pom.xml | 2 +-
.../nifi-media-bundle/nifi-media-nar/pom.xml | 8 +-
.../nifi-media-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-media-bundle/pom.xml | 4 +-
.../nifi-metrics-reporter-service-api-nar/pom.xml | 6 +-
.../nifi-metrics-reporter-service-api/pom.xml | 2 +-
.../nifi-metrics-reporting-nar/pom.xml | 6 +-
.../nifi-metrics-reporting-task/pom.xml | 8 +-
.../nifi-metrics-reporting-bundle/pom.xml | 6 +-
.../nifi-mongodb-client-service-api-nar/pom.xml | 6 +-
.../nifi-mongodb-client-service-api/pom.xml | 6 +-
.../nifi-mongodb-bundle/nifi-mongodb-nar/pom.xml | 4 +-
.../nifi-mongodb-processors/pom.xml | 18 +-
.../nifi-mongodb-services-nar/pom.xml | 6 +-
.../nifi-mongodb-services/pom.xml | 10 +-
nifi-nar-bundles/nifi-mongodb-bundle/pom.xml | 4 +-
.../nifi-mqtt-bundle/nifi-mqtt-nar/pom.xml | 4 +-
.../nifi-mqtt-bundle/nifi-mqtt-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-mqtt-bundle/pom.xml | 4 +-
.../nifi-network-processors-nar/pom.xml | 4 +-
.../nifi-network-processors/pom.xml | 8 +-
.../nifi-network-bundle/nifi-network-utils/pom.xml | 2 +-
nifi-nar-bundles/nifi-network-bundle/pom.xml | 2 +-
.../nifi-parquet-bundle/nifi-parquet-nar/pom.xml | 8 +-
.../nifi-parquet-processors/pom.xml | 10 +-
nifi-nar-bundles/nifi-parquet-bundle/pom.xml | 4 +-
.../nifi-pgp-bundle/nifi-pgp-nar/pom.xml | 8 +-
.../nifi-pgp-bundle/nifi-pgp-processors/pom.xml | 8 +-
.../nifi-pgp-service-api-nar/pom.xml | 8 +-
.../nifi-pgp-bundle/nifi-pgp-service-api/pom.xml | 2 +-
.../nifi-pgp-bundle/nifi-pgp-service-nar/pom.xml | 8 +-
.../nifi-pgp-bundle/nifi-pgp-service/pom.xml | 8 +-
.../nifi-pgp-bundle/nifi-pgp-test-utils/pom.xml | 2 +-
nifi-nar-bundles/nifi-pgp-bundle/pom.xml | 4 +-
.../nifi-poi-bundle/nifi-poi-nar/pom.xml | 6 +-
.../nifi-poi-bundle/nifi-poi-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-poi-bundle/pom.xml | 4 +-
.../nifi-prometheus-nar/pom.xml | 6 +-
.../nifi-prometheus-reporting-task/pom.xml | 16 +-
nifi-nar-bundles/nifi-prometheus-bundle/pom.xml | 4 +-
.../nifi-persistent-provenance-repository/pom.xml | 20 +-
.../nifi-provenance-repository-nar/pom.xml | 2 +-
.../nifi-volatile-provenance-repository/pom.xml | 6 +-
.../nifi-provenance-repository-bundle/pom.xml | 6 +-
.../nifi-ranger-bundle/nifi-ranger-nar/pom.xml | 6 +-
.../nifi-ranger-bundle/nifi-ranger-plugin/pom.xml | 6 +-
.../nifi-ranger-resources/pom.xml | 2 +-
nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 4 +-
.../nifi-redis-extensions/pom.xml | 8 +-
.../nifi-redis-bundle/nifi-redis-nar/pom.xml | 8 +-
.../nifi-redis-service-api-nar/pom.xml | 8 +-
.../nifi-redis-service-api/pom.xml | 2 +-
nifi-nar-bundles/nifi-redis-bundle/pom.xml | 4 +-
.../nifi-registry-bundle/nifi-registry-nar/pom.xml | 6 +-
.../nifi-registry-service/pom.xml | 6 +-
nifi-nar-bundles/nifi-registry-bundle/pom.xml | 2 +-
.../nifi-rethinkdb-nar/pom.xml | 4 +-
.../nifi-rethinkdb-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-rethinkdb-bundle/pom.xml | 4 +-
.../nifi-riemann-bundle/nifi-riemann-nar/pom.xml | 2 +-
.../nifi-riemann-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-riemann-bundle/pom.xml | 4 +-
.../nifi-rules-action-handler-nar/pom.xml | 8 +-
.../nifi-rules-action-handler-service/pom.xml | 12 +-
.../nifi-rules-action-handler-bundle/pom.xml | 4 +-
.../nifi-scripting-nar/pom.xml | 4 +-
.../nifi-scripting-processors/pom.xml | 12 +-
nifi-nar-bundles/nifi-scripting-bundle/pom.xml | 14 +-
.../nifi-single-user-iaa-providers-nar/pom.xml | 2 +-
.../nifi-single-user-iaa-providers/pom.xml | 8 +-
.../nifi-single-user-iaa-providers-bundle/pom.xml | 4 +-
.../nifi-site-to-site-reporting-nar/pom.xml | 4 +-
.../nifi-site-to-site-reporting-task/pom.xml | 20 +-
.../nifi-site-to-site-reporting-bundle/pom.xml | 4 +-
.../nifi-slack-bundle/nifi-slack-nar/pom.xml | 6 +-
.../nifi-slack-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-slack-bundle/pom.xml | 4 +-
.../nifi-smb-bundle/nifi-smb-nar/pom.xml | 6 +-
.../nifi-smb-bundle/nifi-smb-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-smb-bundle/pom.xml | 4 +-
.../nifi-snmp-bundle/nifi-snmp-nar/pom.xml | 2 +-
.../nifi-snmp-bundle/nifi-snmp-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-snmp-bundle/pom.xml | 4 +-
.../nifi-snowflake-services-nar/pom.xml | 8 +-
.../nifi-snowflake-services/pom.xml | 10 +-
nifi-nar-bundles/nifi-snowflake-bundle/pom.xml | 4 +-
.../nifi-social-media-nar/pom.xml | 4 +-
.../nifi-twitter-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-social-media-bundle/pom.xml | 2 +-
.../nifi-solr-bundle/nifi-solr-nar/pom.xml | 6 +-
.../nifi-solr-bundle/nifi-solr-processors/pom.xml | 14 +-
nifi-nar-bundles/nifi-solr-bundle/pom.xml | 2 +-
.../nifi-livy-controller-service-api-nar/pom.xml | 6 +-
.../nifi-livy-controller-service-api/pom.xml | 2 +-
.../nifi-livy-controller-service/pom.xml | 6 +-
.../nifi-spark-bundle/nifi-livy-nar/pom.xml | 8 +-
.../nifi-spark-bundle/nifi-livy-processors/pom.xml | 10 +-
nifi-nar-bundles/nifi-spark-bundle/pom.xml | 4 +-
.../nifi-splunk-bundle/nifi-splunk-nar/pom.xml | 8 +-
.../nifi-splunk-processors/pom.xml | 8 +-
nifi-nar-bundles/nifi-splunk-bundle/pom.xml | 4 +-
.../nifi-spring-bundle/nifi-spring-nar/pom.xml | 2 +-
.../nifi-spring-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-spring-bundle/pom.xml | 4 +-
.../nifi-sql-reporting-nar/pom.xml | 8 +-
.../nifi-sql-reporting-tasks/pom.xml | 18 +-
nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 4 +-
.../nifi-jolt-transform-json-ui/pom.xml | 14 +-
.../nifi-standard-content-viewer/pom.xml | 4 +-
.../nifi-standard-bundle/nifi-standard-nar/pom.xml | 4 +-
.../nifi-standard-processors/pom.xml | 52 ++--
.../nifi-standard-reporting-tasks/pom.xml | 8 +-
.../nifi-standard-utils/pom.xml | 4 +-
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 12 +-
.../nifi-dbcp-service-api/pom.xml | 4 +-
.../nifi-dbcp-service-nar/pom.xml | 8 +-
.../nifi-dbcp-service/pom.xml | 24 +-
.../nifi-hikari-dbcp-service/pom.xml | 12 +-
.../nifi-dbcp-service-bundle/pom.xml | 2 +-
.../pom.xml | 2 +-
.../nifi-distributed-cache-client-service/pom.xml | 10 +-
.../nifi-distributed-cache-protocol/pom.xml | 4 +-
.../nifi-distributed-cache-server/pom.xml | 12 +-
.../nifi-distributed-cache-services-nar/pom.xml | 4 +-
.../nifi-distributed-cache-services-bundle/pom.xml | 2 +-
.../nifi-hadoop-dbcp-service-nar/pom.xml | 6 +-
.../nifi-hadoop-dbcp-service/pom.xml | 16 +-
.../nifi-hadoop-dbcp-service-bundle/pom.xml | 2 +-
.../nifi-hbase-client-service-api/pom.xml | 2 +-
.../nifi-hbase_1_1_2-client-service-nar/pom.xml | 8 +-
.../nifi-hbase_1_1_2-client-service/pom.xml | 12 +-
.../nifi-hbase_1_1_2-client-service-bundle/pom.xml | 4 +-
.../nifi-hbase_2-client-service-nar/pom.xml | 8 +-
.../nifi-hbase_2-client-service/pom.xml | 12 +-
.../nifi-hbase_2-client-service-bundle/pom.xml | 4 +-
.../nifi-http-context-map-api/pom.xml | 2 +-
.../nifi-http-context-map-nar/pom.xml | 4 +-
.../nifi-http-context-map/pom.xml | 4 +-
.../nifi-http-context-map-bundle/pom.xml | 2 +-
.../nifi-hwx-schema-registry-nar/pom.xml | 6 +-
.../nifi-hwx-schema-registry-service/pom.xml | 10 +-
.../nifi-hwx-schema-registry-bundle/pom.xml | 2 +-
.../nifi-kerberos-credentials-service-api/pom.xml | 2 +-
.../nifi-kerberos-credentials-service-nar/pom.xml | 6 +-
.../nifi-kerberos-credentials-service/pom.xml | 4 +-
.../pom.xml | 2 +-
.../nifi-kerberos-user-service-api/pom.xml | 4 +-
.../nifi-kerberos-user-service-nar/pom.xml | 6 +-
.../nifi-kerberos-user-service/pom.xml | 6 +-
.../nifi-kerberos-user-service-bundle/pom.xml | 2 +-
.../nifi-load-distribution-service-api/pom.xml | 2 +-
.../nifi-lookup-service-api/pom.xml | 2 +-
.../nifi-lookup-services-nar/pom.xml | 6 +-
.../nifi-lookup-services/pom.xml | 20 +-
.../nifi-lookup-services-bundle/pom.xml | 2 +-
.../nifi-oauth2-provider-api/pom.xml | 2 +-
.../nifi-oauth2-provider-nar/pom.xml | 8 +-
.../nifi-oauth2-provider-service/pom.xml | 10 +-
.../nifi-oauth2-provider-bundle/pom.xml | 4 +-
.../nifi-proxy-configuration-api/pom.xml | 4 +-
.../nifi-proxy-configuration-nar/pom.xml | 6 +-
.../nifi-proxy-configuration/pom.xml | 4 +-
.../nifi-proxy-configuration-bundle/pom.xml | 2 +-
.../nifi-record-serialization-service-api/pom.xml | 2 +-
.../nifi-record-serialization-services-nar/pom.xml | 6 +-
.../nifi-record-serialization-services/pom.xml | 10 +-
.../pom.xml | 2 +-
.../nifi-record-sink-api/pom.xml | 2 +-
.../nifi-record-sink-service-nar/pom.xml | 6 +-
.../nifi-record-sink-service/pom.xml | 6 +-
.../nifi-record-sink-service-bundle/pom.xml | 2 +-
.../nifi-rules-engine-service-api/pom.xml | 4 +-
.../nifi-schema-registry-service-api/pom.xml | 2 +-
.../nifi-ssl-context-service-nar/pom.xml | 4 +-
.../nifi-ssl-context-service/pom.xml | 6 +-
.../nifi-ssl-context-bundle/pom.xml | 2 +-
.../nifi-ssl-context-service-api/pom.xml | 4 +-
.../nifi-standard-services-api-nar/pom.xml | 14 +-
nifi-nar-bundles/nifi-standard-services/pom.xml | 2 +-
.../nifi-stateful-analysis-nar/pom.xml | 4 +-
.../nifi-stateful-analysis-processors/pom.xml | 6 +-
.../nifi-stateful-analysis-bundle/pom.xml | 4 +-
.../nifi-stateless-processor-nar/pom.xml | 6 +-
.../nifi-stateless-processor-tests/pom.xml | 32 +--
.../nifi-stateless-processor/pom.xml | 16 +-
.../nifi-stateless-processor-bundle/pom.xml | 2 +-
.../nifi-tcp-bundle/nifi-tcp-nar/pom.xml | 6 +-
.../nifi-tcp-bundle/nifi-tcp-processors/pom.xml | 6 +-
nifi-nar-bundles/nifi-tcp-bundle/pom.xml | 2 +-
.../nifi-update-attribute-model/pom.xml | 4 +-
.../nifi-update-attribute-nar/pom.xml | 6 +-
.../nifi-update-attribute-processor/pom.xml | 6 +-
.../nifi-update-attribute-ui/pom.xml | 8 +-
.../nifi-update-attribute-bundle/pom.xml | 8 +-
.../nifi-websocket-processors-nar/pom.xml | 8 +-
.../nifi-websocket-processors/pom.xml | 10 +-
.../nifi-websocket-services-api-nar/pom.xml | 8 +-
.../nifi-websocket-services-api/pom.xml | 4 +-
.../nifi-websocket-services-jetty-nar/pom.xml | 8 +-
.../nifi-websocket-services-jetty/pom.xml | 8 +-
nifi-nar-bundles/nifi-websocket-bundle/pom.xml | 4 +-
.../nifi-windows-event-log-nar/pom.xml | 4 +-
.../nifi-windows-event-log-processors/pom.xml | 6 +-
.../nifi-windows-event-log-bundle/pom.xml | 4 +-
nifi-nar-bundles/pom.xml | 62 ++---
nifi-registry/nifi-registry-assembly/pom.xml | 12 +-
.../nifi-registry-bootstrap/pom.xml | 6 +-
.../nifi-registry-bundle-utils/pom.xml | 6 +-
.../nifi-registry-client/pom.xml | 6 +-
.../nifi-registry-data-model/pom.xml | 8 +-
.../nifi-registry-docker/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-docs/pom.xml | 4 +-
.../nifi-registry-flow-diff/pom.xml | 4 +-
.../nifi-registry-framework/pom.xml | 18 +-
.../nifi-registry-core/nifi-registry-jetty/pom.xml | 4 +-
.../nifi-registry-properties-loader/pom.xml | 2 +-
.../nifi-registry-properties/pom.xml | 2 +-
.../nifi-registry-provider-api/pom.xml | 2 +-
.../nifi-registry-resources/pom.xml | 2 +-
.../nifi-registry-revision-api/pom.xml | 2 +-
.../nifi-registry-revision-common/pom.xml | 4 +-
.../nifi-registry-revision-entity-model/pom.xml | 2 +-
.../nifi-registry-revision-entity-service/pom.xml | 6 +-
.../nifi-registry-revision-spring-jdbc/pom.xml | 6 +-
.../nifi-registry-revision/pom.xml | 2 +-
.../nifi-registry-runtime/pom.xml | 8 +-
.../nifi-registry-security-api/pom.xml | 2 +-
.../nifi-registry-security-utils/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-test/pom.xml | 2 +-
.../nifi-registry-core/nifi-registry-utils/pom.xml | 2 +-
.../nifi-registry-web-api/pom.xml | 22 +-
.../nifi-registry-web-docs/pom.xml | 4 +-
.../nifi-registry-web-ui/pom.xml | 4 +-
nifi-registry/nifi-registry-core/pom.xml | 4 +-
.../nifi-registry-docker-maven/dockermaven/pom.xml | 4 +-
nifi-registry/nifi-registry-docker-maven/pom.xml | 4 +-
.../nifi-registry-aws-assembly/pom.xml | 4 +-
.../nifi-registry-aws-extensions/pom.xml | 2 +-
.../nifi-registry-aws/pom.xml | 2 +-
.../nifi-registry-ranger-assembly/pom.xml | 4 +-
.../nifi-registry-ranger-jersey-bundle/pom.xml | 2 +-
.../nifi-registry-ranger-plugin/pom.xml | 10 +-
.../nifi-registry-ranger/pom.xml | 2 +-
nifi-registry/nifi-registry-extensions/pom.xml | 2 +-
.../nifi-registry-toolkit-assembly/pom.xml | 4 +-
.../nifi-registry-toolkit-persistence/pom.xml | 10 +-
nifi-registry/nifi-registry-toolkit/pom.xml | 2 +-
nifi-registry/pom.xml | 28 +--
nifi-server-api/pom.xml | 8 +-
nifi-stateless/nifi-stateless-api/pom.xml | 4 +-
nifi-stateless/nifi-stateless-assembly/pom.xml | 20 +-
nifi-stateless/nifi-stateless-bootstrap/pom.xml | 14 +-
.../nifi-stateless-engine/pom.xml | 24 +-
.../nifi-stateless-nar/pom.xml | 4 +-
nifi-stateless/nifi-stateless-bundle/pom.xml | 2 +-
nifi-stateless/nifi-stateless-resources/pom.xml | 2 +-
nifi-stateless/pom.xml | 2 +-
.../nifi-stateless-system-test-suite/pom.xml | 28 +--
.../nifi-system-test-extensions-nar/pom.xml | 8 +-
.../nifi-system-test-extensions/pom.xml | 10 +-
.../nifi-system-test-extensions-bundle/pom.xml | 2 +-
.../nifi-system-test-extensions2-nar/pom.xml | 8 +-
.../nifi-system-test-extensions2/pom.xml | 6 +-
.../nifi-system-test-extensions2-bundle/pom.xml | 2 +-
nifi-system-tests/nifi-system-test-suite/pom.xml | 30 +--
nifi-system-tests/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-admin/pom.xml | 14 +-
nifi-toolkit/nifi-toolkit-api/pom.xml | 2 +-
nifi-toolkit/nifi-toolkit-assembly/pom.xml | 16 +-
nifi-toolkit/nifi-toolkit-cli/pom.xml | 6 +-
nifi-toolkit/nifi-toolkit-encrypt-config/pom.xml | 18 +-
nifi-toolkit/nifi-toolkit-flowanalyzer/pom.xml | 4 +-
nifi-toolkit/nifi-toolkit-flowfile-repo/pom.xml | 4 +-
nifi-toolkit/nifi-toolkit-s2s/pom.xml | 4 +-
nifi-toolkit/nifi-toolkit-tls/pom.xml | 8 +-
.../nifi-toolkit-zookeeper-migrator/pom.xml | 2 +-
nifi-toolkit/pom.xml | 2 +-
pom.xml | 4 +-
649 files changed, 2287 insertions(+), 2287 deletions(-)
diff --git a/c2/c2-protocol/c2-protocol-api/pom.xml b/c2/c2-protocol/c2-protocol-api/pom.xml
index aa21e38d78..cae0b88e09 100644
--- a/c2/c2-protocol/c2-protocol-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-api/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2-protocol</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>c2-protocol-api</artifactId>
@@ -31,7 +31,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-component-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
index 5bc0be293a..8aa831236a 100644
--- a/c2/c2-protocol/c2-protocol-component-api/pom.xml
+++ b/c2/c2-protocol/c2-protocol-component-api/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>c2-protocol</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/c2/c2-protocol/pom.xml b/c2/c2-protocol/pom.xml
index a42c74cd8f..4c80b7ea10 100644
--- a/c2/c2-protocol/pom.xml
+++ b/c2/c2-protocol/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>c2</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>c2-protocol</artifactId>
diff --git a/c2/pom.xml b/c2/pom.xml
index 29dad8e24f..43e1261b3c 100644
--- a/c2/pom.xml
+++ b/c2/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>nifi</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>c2</artifactId>
@@ -36,7 +36,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/minifi/minifi-assembly/pom.xml b/minifi/minifi-assembly/pom.xml
index 37699a3e1a..305a8c96ff 100644
--- a/minifi/minifi-assembly/pom.xml
+++ b/minifi/minifi-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-assembly</artifactId>
<packaging>pom</packaging>
@@ -125,13 +125,13 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index 2df155ce10..1bc9ebf059 100644
--- a/minifi/minifi-bootstrap/pom.xml
+++ b/minifi/minifi-bootstrap/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-bootstrap</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-api/pom.xml b/minifi/minifi-c2/minifi-c2-api/pom.xml
index 93471e7540..7eee812f70 100644
--- a/minifi/minifi-c2/minifi-c2-api/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-api/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-api</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-assembly/pom.xml b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
index f8df384232..ab90d5cde0 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-assembly</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
index 2add3583c9..48429fb35f 100644
--- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-filesystem/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-cache</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache-filesystem</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
index a5573eb509..f1d813490e 100644
--- a/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/minifi-c2-cache-s3/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-cache</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache-s3</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-cache/pom.xml b/minifi/minifi-c2/minifi-c2-cache/pom.xml
index e2ae33215a..91d3b3bbd4 100644
--- a/minifi/minifi-c2/minifi-c2-cache/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-cache/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-cache</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-docker/pom.xml b/minifi/minifi-c2/minifi-c2-docker/pom.xml
index 5b393175f3..b6070a1bb4 100644
--- a/minifi/minifi-c2/minifi-c2-docker/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-docker/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-c2</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-c2-docker</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
index 816cbce0b4..19122a79eb 100644
--- a/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-integration-tests/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-integration-tests</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-jetty/pom.xml b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
index 0f18b898c6..d153cd70e7 100644
--- a/minifi/minifi-c2/minifi-c2-jetty/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-jetty/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-jetty</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
index 7cabd7abed..5bb22c0bb9 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-cache/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-provider</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-provider-cache</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
index 5f33e6f4b4..cb7d03032f 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-delegating/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-provider</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-provider-delegating</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
index 7c304c58c2..fe823c38e1 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-nifi-rest/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-provider</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-provider-nifi-rest</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
index 1b7da72b5e..aeb957a063 100644
--- a/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/minifi-c2-provider-util/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2-provider</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-provider-util</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-provider/pom.xml b/minifi/minifi-c2/minifi-c2-provider/pom.xml
index 7ef6c89d15..4bbcb3a9c6 100644
--- a/minifi/minifi-c2/minifi-c2-provider/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-provider/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-provider</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml b/minifi/minifi-c2/minifi-c2-service/pom.xml
index 531f6b8d67..46bc2cc596 100644
--- a/minifi/minifi-c2/minifi-c2-service/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-service/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-c2</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2-service</artifactId>
<packaging>war</packaging>
diff --git a/minifi/minifi-c2/pom.xml b/minifi/minifi-c2/pom.xml
index d235271d73..8541d7ad10 100644
--- a/minifi/minifi-c2/pom.xml
+++ b/minifi/minifi-c2/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-c2</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-commons/minifi-commons-schema/pom.xml b/minifi/minifi-commons/minifi-commons-schema/pom.xml
index 71b7271dc6..7e021ff3e5 100644
--- a/minifi/minifi-commons/minifi-commons-schema/pom.xml
+++ b/minifi/minifi-commons/minifi-commons-schema/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-commons-schema</artifactId>
diff --git a/minifi/minifi-commons/minifi-utils/pom.xml b/minifi/minifi-commons/minifi-utils/pom.xml
index f1b6ed5e8d..6e91dfeb7a 100644
--- a/minifi/minifi-commons/minifi-utils/pom.xml
+++ b/minifi/minifi-commons/minifi-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-utils</artifactId>
diff --git a/minifi/minifi-commons/pom.xml b/minifi/minifi-commons/pom.xml
index 3c02ce19e8..e2a79db7c3 100644
--- a/minifi/minifi-commons/pom.xml
+++ b/minifi/minifi-commons/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-commons</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-docker/pom.xml b/minifi/minifi-docker/pom.xml
index 856c4ca8ec..1a78d1bebb 100644
--- a/minifi/minifi-docker/pom.xml
+++ b/minifi/minifi-docker/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-docker</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/minifi/minifi-docs/pom.xml b/minifi/minifi-docs/pom.xml
index 931a77f554..dd5b69c333 100644
--- a/minifi/minifi-docs/pom.xml
+++ b/minifi/minifi-docs/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>minifi-docs</artifactId>
diff --git a/minifi/minifi-integration-tests/pom.xml b/minifi/minifi-integration-tests/pom.xml
index b49d7bec9e..a0b781d10d 100644
--- a/minifi/minifi-integration-tests/pom.xml
+++ b/minifi/minifi-integration-tests/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-integration-tests</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index 14f525e285..c75e682f2c 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>minifi-framework-bundle</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
@@ -97,7 +97,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
index b5c5305ebb..4302150b3d 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-api/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-framework-api</artifactId>
@@ -29,18 +29,18 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
index f0ee95fcc9..703d4028b7 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-framework-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-framework-core</artifactId>
@@ -29,7 +29,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
index 4561e014af..8206a02279 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-resources</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
index eae9572eb6..e4fa123d1f 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-runtime/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-runtime</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
index a3c23d6053..07afb2ecb7 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-server/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-server</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
index 80f82cd9b5..6c633758f5 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-framework-bundle</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-framework</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
index 27710ef257..5f4117785d 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-server-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-server-nar</artifactId>
<packaging>nar</packaging>
@@ -30,18 +30,18 @@
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-server</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- mark these nifi artifacts as provided since it is included in the lib -->
<dependency>
diff --git a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
index 90ecb404a0..99ca13d5fb 100644
--- a/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-framework-bundle/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>minifi-nar-bundles</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,42 +37,42 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties-loader</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
index 7f4af24b77..a2933e2106 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repositories/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-provenance-repository-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-provenance-repositories</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
index ba343fc1f9..662703db98 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/minifi-provenance-repository-nar/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-provenance-repository-bundle</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-provenance-repository-nar</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
index 2378454338..db6d0a6636 100644
--- a/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-provenance-repository-bundle/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-provenance-repository-bundle</artifactId>
diff --git a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
index d7efc1e294..9fb2d7598e 100644
--- a/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-standard-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>minifi-nar-bundles</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -49,12 +49,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-reporting-tasks</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
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 7254fe531e..ffaf8e7251 100644
--- a/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml
+++ b/minifi/minifi-nar-bundles/minifi-update-attribute-nar/pom.xml
@@ -19,7 +19,7 @@ limitations under the License.
<parent>
<artifactId>minifi-nar-bundles</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,12 +33,12 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-processor</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/minifi/minifi-nar-bundles/pom.xml b/minifi/minifi-nar-bundles/pom.xml
index 45a3c9d294..fe5b9e1319 100644
--- a/minifi/minifi-nar-bundles/pom.xml
+++ b/minifi/minifi-nar-bundles/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-nar-bundles</artifactId>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
index 79180289ca..46c617ddb9 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
+++ b/minifi/minifi-toolkit/minifi-toolkit-assembly/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-toolkit</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-toolkit-assembly</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
index 684d698e78..0b42d6a0a3 100644
--- a/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
+++ b/minifi/minifi-toolkit/minifi-toolkit-configuration/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi-toolkit</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-toolkit-configuration</artifactId>
<packaging>jar</packaging>
diff --git a/minifi/minifi-toolkit/pom.xml b/minifi/minifi-toolkit/pom.xml
index 0759576fde..4a365fabc3 100644
--- a/minifi/minifi-toolkit/pom.xml
+++ b/minifi/minifi-toolkit/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<artifactId>minifi</artifactId>
<groupId>org.apache.nifi.minifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>minifi-toolkit</artifactId>
<packaging>pom</packaging>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 266b7f1ee6..1b53c9c52d 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Apache NiFi - MiNiFi is a child project effort to aid in the collection and transmission of data close to where it is created.</description>
@@ -65,37 +65,37 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-bootstrap</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-resources</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-provenance-repository-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
@@ -103,45 +103,45 @@ limitations under the License.
<artifactId>minifi-resources</artifactId>
<classifier>resources</classifier>
<type>zip</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-standard-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-update-attribute-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-docs</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -149,7 +149,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
<artifactId>minifi-provenance-repositories</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -228,77 +228,77 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-custom-ui-utilities</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ui-extension</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-socket-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-toolkit-tls</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-resources</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -306,7 +306,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docs</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<classifier>resources</classifier>
<scope>runtime</scope>
<type>zip</type>
@@ -314,148 +314,148 @@ limitations under the License.
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-credentials-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-administration</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-persistent-provenance-repository</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-reporting-task</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-reporting-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Test Dependencies -->
diff --git a/nifi-api/pom.xml b/nifi-api/pom.xml
index 5b908eaa48..74b95a448d 100644
--- a/nifi-api/pom.xml
+++ b/nifi-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-api</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 2263da8615..0408e9009b 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-assembly</artifactId>
<packaging>pom</packaging>
@@ -140,38 +140,38 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-resources</artifactId>
<classifier>resources</classifier>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>runtime</scope>
<type>zip</type>
</dependency>
@@ -179,649 +179,649 @@ language governing permissions and limitations under the License. -->
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docs</artifactId>
<classifier>resources</classifier>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>runtime</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-provenance-repository-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-datadog-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-update-attribute-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-bootstrap</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-1-0-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-2-0-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-2-6-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-confluent-platform-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-http-context-map-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-html-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-lookup-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-poi-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kudu-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ldap-iaa-providers-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-iaa-providers-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-single-user-iaa-providers-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-dbcp-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-dbcp-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mongodb-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mongodb-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mongodb-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-solr-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-social-media-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hl7-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ccda-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-language-translation-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-enrich-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geohash-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ambari-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-rethinkdb-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-prometheus-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-network-processors-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hbase-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-riemann-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hbase_1_1_2-client-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hbase_2-client-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-oauth2-provider-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-scripting-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-groovyx-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-restapi-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cybersecurity-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-email-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-amqp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-splunk-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jms-cf-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jms-processors-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-spring-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-registry-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hive-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hive-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-reporting-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mqtt-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-snmp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-evtx-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-slack-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-smb-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-windows-event-log-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-websocket-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-websocket-services-jetty-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-websocket-processors-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-tcp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateful-analysis-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc-mysql-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parquet-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-pgp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-pgp-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-pgp-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hwx-schema-registry-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-redis-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-redis-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hazelcast-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hazelcast-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics-reporter-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics-reporting-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-credentials-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-user-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jolt-record-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-sink-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hashicorp-vault-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-processor-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 -->
@@ -857,25 +857,25 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-graph-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-neo4j-cypher-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-graph-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-other-graph-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -892,7 +892,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-grpc-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -909,7 +909,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-atlas-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -926,7 +926,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hive_1_1-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -943,7 +943,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hive3-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -959,7 +959,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-media-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -974,13 +974,13 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-easyrules-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-rules-action-handler-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -995,19 +995,19 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-sql-reporting-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-easyrules-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-rules-action-handler-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -1022,14 +1022,14 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -1044,19 +1044,19 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -1255,13 +1255,13 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ranger-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ranger-resources</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</profile>
@@ -1274,7 +1274,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-asn1-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
@@ -1288,7 +1288,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-snowflake-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
index 98712164a0..f88f63cd5e 100644
--- a/nifi-bootstrap/pom.xml
+++ b/nifi-bootstrap/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-bootstrap</artifactId>
<packaging>jar</packaging>
@@ -27,34 +27,34 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-bootstrap-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flow-encryptor</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-single-user-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -70,7 +70,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
@@ -86,12 +86,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties-loader</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-bootstrap-utils/pom.xml b/nifi-commons/nifi-bootstrap-utils/pom.xml
index a052a1b6ed..f4786f97e5 100644
--- a/nifi-commons/nifi-bootstrap-utils/pom.xml
+++ b/nifi-commons/nifi-bootstrap-utils/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-bootstrap-utils</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-commons/nifi-data-provenance-utils/pom.xml b/nifi-commons/nifi-data-provenance-utils/pom.xml
index 2819fddf9d..78086e3973 100644
--- a/nifi-commons/nifi-data-provenance-utils/pom.xml
+++ b/nifi-commons/nifi-data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-data-provenance-utils</artifactId>
<packaging>jar</packaging>
@@ -25,17 +25,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-expression-language/pom.xml b/nifi-commons/nifi-expression-language/pom.xml
index 30412f4cc4..d578cdfb4c 100644
--- a/nifi-commons/nifi-expression-language/pom.xml
+++ b/nifi-commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-expression-language</artifactId>
<packaging>jar</packaging>
@@ -61,22 +61,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parameter</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-uuid5</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
diff --git a/nifi-commons/nifi-flow-encryptor/pom.xml b/nifi-commons/nifi-flow-encryptor/pom.xml
index d7b250714b..b455b73b29 100644
--- a/nifi-commons/nifi-flow-encryptor/pom.xml
+++ b/nifi-commons/nifi-flow-encryptor/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flow-encryptor</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-encryptor</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<exclusions>
<!-- Excluded to avoid unnecessary runtime dependencies -->
<exclusion>
diff --git a/nifi-commons/nifi-flowfile-packager/pom.xml b/nifi-commons/nifi-flowfile-packager/pom.xml
index 48f67e9202..bee3d848eb 100644
--- a/nifi-commons/nifi-flowfile-packager/pom.xml
+++ b/nifi-commons/nifi-flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flowfile-packager</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-commons/nifi-hl7-query-language/pom.xml b/nifi-commons/nifi-hl7-query-language/pom.xml
index 801a491a7f..c725ad74ad 100644
--- a/nifi-commons/nifi-hl7-query-language/pom.xml
+++ b/nifi-commons/nifi-hl7-query-language/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-hl7-query-language</artifactId>
diff --git a/nifi-commons/nifi-json-utils/pom.xml b/nifi-commons/nifi-json-utils/pom.xml
index 648a5b7191..871297aeb0 100644
--- a/nifi-commons/nifi-json-utils/pom.xml
+++ b/nifi-commons/nifi-json-utils/pom.xml
@@ -18,16 +18,16 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-json-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-commons/nifi-logging-utils/pom.xml b/nifi-commons/nifi-logging-utils/pom.xml
index 3b65a24bc0..de40ca4dd9 100644
--- a/nifi-commons/nifi-logging-utils/pom.xml
+++ b/nifi-commons/nifi-logging-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-logging-utils</artifactId>
<description>Utilities for logging</description>
diff --git a/nifi-commons/nifi-metrics/pom.xml b/nifi-commons/nifi-metrics/pom.xml
index 92780dae38..c720720abb 100644
--- a/nifi-commons/nifi-metrics/pom.xml
+++ b/nifi-commons/nifi-metrics/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-commons</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
diff --git a/nifi-commons/nifi-parameter/pom.xml b/nifi-commons/nifi-parameter/pom.xml
index bf169c3637..868bad18bb 100644
--- a/nifi-commons/nifi-parameter/pom.xml
+++ b/nifi-commons/nifi-parameter/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>nifi-commons</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-properties/pom.xml b/nifi-commons/nifi-properties/pom.xml
index a755c01409..3d47321c5d 100644
--- a/nifi-commons/nifi-properties/pom.xml
+++ b/nifi-commons/nifi-properties/pom.xml
@@ -19,14 +19,14 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-properties</artifactId>
diff --git a/nifi-commons/nifi-property-encryptor/pom.xml b/nifi-commons/nifi-property-encryptor/pom.xml
index 725c360e59..f1b70c21c7 100644
--- a/nifi-commons/nifi-property-encryptor/pom.xml
+++ b/nifi-commons/nifi-property-encryptor/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-encryptor</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/nifi-commons/nifi-property-protection-api/pom.xml b/nifi-commons/nifi-property-protection-api/pom.xml
index 13556694a4..ee65c61af7 100644
--- a/nifi-commons/nifi-property-protection-api/pom.xml
+++ b/nifi-commons/nifi-property-protection-api/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-api</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-property-protection-aws/pom.xml b/nifi-commons/nifi-property-protection-aws/pom.xml
index b2c46ca6c8..67f46b793b 100644
--- a/nifi-commons/nifi-property-protection-aws/pom.xml
+++ b/nifi-commons/nifi-property-protection-aws/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-aws</artifactId>
<properties>
@@ -28,12 +28,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-shared</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-azure/pom.xml b/nifi-commons/nifi-property-protection-azure/pom.xml
index c66ecea943..c2992487fd 100644
--- a/nifi-commons/nifi-property-protection-azure/pom.xml
+++ b/nifi-commons/nifi-property-protection-azure/pom.xml
@@ -18,19 +18,19 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-azure</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-shared</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
diff --git a/nifi-commons/nifi-property-protection-cipher/pom.xml b/nifi-commons/nifi-property-protection-cipher/pom.xml
index 52f56fe0e9..30fa03cbb4 100644
--- a/nifi-commons/nifi-property-protection-cipher/pom.xml
+++ b/nifi-commons/nifi-property-protection-cipher/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-cipher</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
diff --git a/nifi-commons/nifi-property-protection-factory/pom.xml b/nifi-commons/nifi-property-protection-factory/pom.xml
index 3e4bbe7d04..2c35695d96 100644
--- a/nifi-commons/nifi-property-protection-factory/pom.xml
+++ b/nifi-commons/nifi-property-protection-factory/pom.xml
@@ -18,59 +18,59 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-factory</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-shared</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-aws</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-azure</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-cipher</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-gcp</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-hashicorp</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-commons/nifi-property-protection-gcp/pom.xml b/nifi-commons/nifi-property-protection-gcp/pom.xml
index d9d4bd6b46..019d0b0c51 100644
--- a/nifi-commons/nifi-property-protection-gcp/pom.xml
+++ b/nifi-commons/nifi-property-protection-gcp/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-gcp</artifactId>
<properties>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-shared</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-hashicorp/pom.xml b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
index 78f2801f02..a5152c77e5 100644
--- a/nifi-commons/nifi-property-protection-hashicorp/pom.xml
+++ b/nifi-commons/nifi-property-protection-hashicorp/pom.xml
@@ -18,19 +18,19 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-hashicorp</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-vault-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-property-protection-shared/pom.xml b/nifi-commons/nifi-property-protection-shared/pom.xml
index 8212172c0b..ddee269b9b 100644
--- a/nifi-commons/nifi-property-protection-shared/pom.xml
+++ b/nifi-commons/nifi-property-protection-shared/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-protection-shared</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-property-utils/pom.xml b/nifi-commons/nifi-property-utils/pom.xml
index 3fb409295c..b895182d62 100644
--- a/nifi-commons/nifi-property-utils/pom.xml
+++ b/nifi-commons/nifi-property-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-property-utils</artifactId>
diff --git a/nifi-commons/nifi-record-path/pom.xml b/nifi-commons/nifi-record-path/pom.xml
index 1f0a91897f..ac8c7a2bd2 100644
--- a/nifi-commons/nifi-record-path/pom.xml
+++ b/nifi-commons/nifi-record-path/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-record-path</artifactId>
@@ -59,22 +59,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-uuid5</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
diff --git a/nifi-commons/nifi-record/pom.xml b/nifi-commons/nifi-record/pom.xml
index 5d474b315c..1827a94f8a 100644
--- a/nifi-commons/nifi-record/pom.xml
+++ b/nifi-commons/nifi-record/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-record</artifactId>
diff --git a/nifi-commons/nifi-repository-encryption/pom.xml b/nifi-commons/nifi-repository-encryption/pom.xml
index 988e9ba6dc..4f474ad54a 100644
--- a/nifi-commons/nifi-repository-encryption/pom.xml
+++ b/nifi-commons/nifi-repository-encryption/pom.xml
@@ -18,24 +18,24 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-repository-encryption</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kms</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/nifi-commons/nifi-rocksdb-utils/pom.xml b/nifi-commons/nifi-rocksdb-utils/pom.xml
index 156c922208..8a72b88cf2 100644
--- a/nifi-commons/nifi-rocksdb-utils/pom.xml
+++ b/nifi-commons/nifi-rocksdb-utils/pom.xml
@@ -18,21 +18,21 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-rocksdb-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.rocksdb</groupId>
diff --git a/nifi-commons/nifi-schema-utils/pom.xml b/nifi-commons/nifi-schema-utils/pom.xml
index 1c93594a9b..e9a800e8ae 100644
--- a/nifi-commons/nifi-schema-utils/pom.xml
+++ b/nifi-commons/nifi-schema-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-schema-utils</artifactId>
<dependencies>
diff --git a/nifi-commons/nifi-security-kerberos-api/pom.xml b/nifi-commons/nifi-security-kerberos-api/pom.xml
index b190f47ee9..865b9720b4 100644
--- a/nifi-commons/nifi-security-kerberos-api/pom.xml
+++ b/nifi-commons/nifi-security-kerberos-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-kerberos-api</artifactId>
diff --git a/nifi-commons/nifi-security-kerberos/pom.xml b/nifi-commons/nifi-security-kerberos/pom.xml
index f58df8cf3e..a3bcf083c9 100644
--- a/nifi-commons/nifi-security-kerberos/pom.xml
+++ b/nifi-commons/nifi-security-kerberos/pom.xml
@@ -18,19 +18,19 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-kerberos</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-commons/nifi-security-kms/pom.xml b/nifi-commons/nifi-security-kms/pom.xml
index 57bb8eec55..fdb8fa72a1 100644
--- a/nifi-commons/nifi-security-kms/pom.xml
+++ b/nifi-commons/nifi-security-kms/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-kms</artifactId>
<dependencies>
diff --git a/nifi-commons/nifi-security-socket-ssl/pom.xml b/nifi-commons/nifi-security-socket-ssl/pom.xml
index 25e96e0c59..35ae0fc67f 100644
--- a/nifi-commons/nifi-security-socket-ssl/pom.xml
+++ b/nifi-commons/nifi-security-socket-ssl/pom.xml
@@ -18,14 +18,14 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-socket-ssl</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-commons/nifi-security-utils-api/pom.xml b/nifi-commons/nifi-security-utils-api/pom.xml
index b9b6745194..f5c84622ed 100644
--- a/nifi-commons/nifi-security-utils-api/pom.xml
+++ b/nifi-commons/nifi-security-utils-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-utils-api</artifactId>
<description>
diff --git a/nifi-commons/nifi-security-utils/pom.xml b/nifi-commons/nifi-security-utils/pom.xml
index dbf23452cb..b939fee380 100644
--- a/nifi-commons/nifi-security-utils/pom.xml
+++ b/nifi-commons/nifi-security-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-security-utils</artifactId>
<description>
@@ -30,22 +30,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kms</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>at.favre.lib</groupId>
diff --git a/nifi-commons/nifi-single-user-utils/pom.xml b/nifi-commons/nifi-single-user-utils/pom.xml
index 6b6b05ecb4..64901e3203 100644
--- a/nifi-commons/nifi-single-user-utils/pom.xml
+++ b/nifi-commons/nifi-single-user-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-single-user-utils</artifactId>
<dependencies>
diff --git a/nifi-commons/nifi-site-to-site-client/pom.xml b/nifi-commons/nifi-site-to-site-client/pom.xml
index 7c074e4d48..8209826d23 100644
--- a/nifi-commons/nifi-site-to-site-client/pom.xml
+++ b/nifi-commons/nifi-site-to-site-client/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-site-to-site-client</artifactId>
@@ -34,22 +34,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>${httpclient.group}</groupId>
diff --git a/nifi-commons/nifi-socket-utils/pom.xml b/nifi-commons/nifi-socket-utils/pom.xml
index 1957c51588..de843658da 100644
--- a/nifi-commons/nifi-socket-utils/pom.xml
+++ b/nifi-commons/nifi-socket-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-socket-utils</artifactId>
<description>Utilities for socket communication</description>
@@ -30,12 +30,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-utils/pom.xml b/nifi-commons/nifi-utils/pom.xml
index d18236f91f..b8ee325468 100644
--- a/nifi-commons/nifi-utils/pom.xml
+++ b/nifi-commons/nifi-utils/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<description>
This nifi-utils module should be a general purpose place to store widely
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/nifi-commons/nifi-uuid5/pom.xml b/nifi-commons/nifi-uuid5/pom.xml
index a263bc7feb..9ff6d7e641 100644
--- a/nifi-commons/nifi-uuid5/pom.xml
+++ b/nifi-commons/nifi-uuid5/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-uuid5</artifactId>
diff --git a/nifi-commons/nifi-vault-utils/pom.xml b/nifi-commons/nifi-vault-utils/pom.xml
index 562000cbbb..f5bf61fbd5 100644
--- a/nifi-commons/nifi-vault-utils/pom.xml
+++ b/nifi-commons/nifi-vault-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-vault-utils</artifactId>
<properties>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Runtime dependency to enable TLS client configuration -->
<dependency>
@@ -59,13 +59,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-commons/nifi-web-utils/pom.xml b/nifi-commons/nifi-web-utils/pom.xml
index d42017c508..cc5a9412db 100644
--- a/nifi-commons/nifi-web-utils/pom.xml
+++ b/nifi-commons/nifi-web-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-utils</artifactId>
<dependencies>
diff --git a/nifi-commons/nifi-write-ahead-log/pom.xml b/nifi-commons/nifi-write-ahead-log/pom.xml
index c899ba96b5..a3d1eac8b6 100644
--- a/nifi-commons/nifi-write-ahead-log/pom.xml
+++ b/nifi-commons/nifi-write-ahead-log/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-write-ahead-log</artifactId>
<packaging>jar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-commons/pom.xml b/nifi-commons/pom.xml
index c81b2eae2b..85286c7f0c 100644
--- a/nifi-commons/pom.xml
+++ b/nifi-commons/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-commons</artifactId>
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index 9ebe62bdc4..827fd0af20 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docker</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>dockerhub</artifactId>
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 4d65d49941..411e32f044 100644
--- a/nifi-docker/dockermaven/pom.xml
+++ b/nifi-docker/dockermaven/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-docker</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>dockermaven</artifactId>
diff --git a/nifi-docker/pom.xml b/nifi-docker/pom.xml
index c1a4762152..02a7efa051 100644
--- a/nifi-docker/pom.xml
+++ b/nifi-docker/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-docker</artifactId>
diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml
index f3246a6c56..5ff15159a5 100644
--- a/nifi-docs/pom.xml
+++ b/nifi-docs/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>nifi-docs</artifactId>
diff --git a/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml b/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
index 4c78e00c7d..9223c0e328 100644
--- a/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
+++ b/nifi-external/nifi-example-bundle/nifi-nifi-example-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-example-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-nifi-example-nar</artifactId>
diff --git a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
index 5f52c3eb7b..a211fef781 100644
--- a/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
+++ b/nifi-external/nifi-example-bundle/nifi-nifi-example-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-example-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-nifi-example-processors</artifactId>
@@ -29,12 +29,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-external/nifi-example-bundle/pom.xml b/nifi-external/nifi-example-bundle/pom.xml
index 11c307809c..98ab67c012 100644
--- a/nifi-external/nifi-example-bundle/pom.xml
+++ b/nifi-external/nifi-example-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-example-bundle</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nifi-example-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
index 15c239a8a5..21bcc21f06 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-assembly/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-kafka-connect</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,22 +27,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-connector</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-bootstrap</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
@@ -64,27 +64,27 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- SLF4J bridges to include -->
@@ -108,13 +108,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
index 88e59b3bde..a291ef8d15 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector-tests/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-kafka-connect</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kafka-connector-assembly</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
@@ -42,19 +42,19 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-system-test-extensions-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
diff --git a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
index 316672f904..7cdfc726c5 100644
--- a/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
+++ b/nifi-external/nifi-kafka-connect/nifi-kafka-connector/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-kafka-connect</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,22 +33,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-bootstrap</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
@@ -70,39 +70,39 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-server-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
diff --git a/nifi-external/nifi-kafka-connect/pom.xml b/nifi-external/nifi-kafka-connect/pom.xml
index ae27b20ccf..cced2f799c 100644
--- a/nifi-external/nifi-kafka-connect/pom.xml
+++ b/nifi-external/nifi-kafka-connect/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-external</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-external/nifi-spark-receiver/pom.xml b/nifi-external/nifi-spark-receiver/pom.xml
index c163342b46..e24074b0ee 100644
--- a/nifi-external/nifi-spark-receiver/pom.xml
+++ b/nifi-external/nifi-spark-receiver/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-spark-receiver</artifactId>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
diff --git a/nifi-external/pom.xml b/nifi-external/pom.xml
index 3481dbf72a..e6f3465f17 100644
--- a/nifi-external/pom.xml
+++ b/nifi-external/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-external</artifactId>
diff --git a/nifi-framework-api/pom.xml b/nifi-framework-api/pom.xml
index 515c2d52d5..9ed5326836 100644
--- a/nifi-framework-api/pom.xml
+++ b/nifi-framework-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-api</artifactId>
<packaging>jar</packaging>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-h2/nifi-h2-database-migrator/pom.xml b/nifi-h2/nifi-h2-database-migrator/pom.xml
index 8b98832bda..b12471536c 100644
--- a/nifi-h2/nifi-h2-database-migrator/pom.xml
+++ b/nifi-h2/nifi-h2-database-migrator/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-h2</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-h2-database-migrator</artifactId>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-h2-database</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-h2/nifi-h2-database/pom.xml b/nifi-h2/nifi-h2-database/pom.xml
index bb2002f874..784f0dcbe0 100644
--- a/nifi-h2/nifi-h2-database/pom.xml
+++ b/nifi-h2/nifi-h2-database/pom.xml
@@ -14,11 +14,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-h2</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-h2-database</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
diff --git a/nifi-h2/pom.xml b/nifi-h2/pom.xml
index 8592b9b60e..f45d0b9e04 100644
--- a/nifi-h2/pom.xml
+++ b/nifi-h2/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-h2</artifactId>
diff --git a/nifi-manifest/nifi-extension-manifest-model/pom.xml b/nifi-manifest/nifi-extension-manifest-model/pom.xml
index 828545925f..45abe184af 100644
--- a/nifi-manifest/nifi-extension-manifest-model/pom.xml
+++ b/nifi-manifest/nifi-extension-manifest-model/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-extension-manifest-model</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-manifest/nifi-extension-manifest-parser/pom.xml b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
index 2d5e0d3890..7c8e7d3bfe 100644
--- a/nifi-manifest/nifi-extension-manifest-parser/pom.xml
+++ b/nifi-manifest/nifi-extension-manifest-parser/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-extension-manifest-parser</artifactId>
<packaging>jar</packaging>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-manifest-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-manifest/nifi-runtime-manifest-core/pom.xml b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
index cf2cb78bc5..765a87d3aa 100644
--- a/nifi-manifest/nifi-runtime-manifest-core/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-runtime-manifest-core</artifactId>
<packaging>jar</packaging>
@@ -27,22 +27,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-component-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-manifest-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-manifest-parser</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-manifest/nifi-runtime-manifest-test/pom.xml b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
index 93cf041492..5bad344af0 100644
--- a/nifi-manifest/nifi-runtime-manifest-test/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest-test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-runtime-manifest-test</artifactId>
<packaging>jar</packaging>
@@ -27,12 +27,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime-manifest-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-manifest/nifi-runtime-manifest/pom.xml b/nifi-manifest/nifi-runtime-manifest/pom.xml
index 64877dc1e7..1cc5680b74 100644
--- a/nifi-manifest/nifi-runtime-manifest/pom.xml
+++ b/nifi-manifest/nifi-runtime-manifest/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-manifest</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-runtime-manifest</artifactId>
<packaging>jar</packaging>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-assembly</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<classifier>manifests</classifier>
<type>zip</type>
<optional>true</optional>
@@ -128,7 +128,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime-manifest-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
diff --git a/nifi-manifest/pom.xml b/nifi-manifest/pom.xml
index 48c8daf02f..f2fc8054b9 100644
--- a/nifi-manifest/pom.xml
+++ b/nifi-manifest/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-manifest</artifactId>
<packaging>pom</packaging>
diff --git a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
index da168d5523..9a845a009b 100644
--- a/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-processor-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-processor-bundle-archetype</artifactId>
diff --git a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
index f27e4b963e..a554c210fa 100644
--- a/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
+++ b/nifi-maven-archetypes/nifi-service-bundle-archetype/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-service-bundle-archetype</artifactId>
diff --git a/nifi-maven-archetypes/pom.xml b/nifi-maven-archetypes/pom.xml
index 5ce20cf35e..100c414954 100644
--- a/nifi-maven-archetypes/pom.xml
+++ b/nifi-maven-archetypes/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-maven-archetypes</artifactId>
diff --git a/nifi-mock/pom.xml b/nifi-mock/pom.xml
index 5dda257083..2c68b57c34 100644
--- a/nifi-mock/pom.xml
+++ b/nifi-mock/pom.xml
@@ -18,39 +18,39 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-mock</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parameter</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<!-- Dependency marked as compile, not test, because we have assertion
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
index ce47b44b28..b35dce4fc1 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,17 +34,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
index e537869f5b..29838135d3 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-processors</artifactId>
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -52,34 +52,34 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
@@ -100,13 +100,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-credentials-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
index 70092e650a..484c99c1a5 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
index 0045dcdb12..e680c1ecd3 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-services-api</artifactId>
@@ -45,22 +45,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
index 8c082e614e..8655941178 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-services-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>false</maven.javadoc.skip>
@@ -34,18 +34,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
index 6da6291154..1651eb3a33 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/nifi-accumulo-services/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-accumulo-services</artifactId>
@@ -37,57 +37,57 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-lookup-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-credentials-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-user-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
index 5c280e3f22..b472823742 100644
--- a/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-accumulo-bundle/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<properties>
@@ -23,7 +23,7 @@
</properties>
<artifactId>nifi-accumulo-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-accumulo-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override commons-io:2.6 from accumulo-core -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
index 223801633a..f36d5b6333 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ambari-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ambari-nar</artifactId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ambari-reporting-task</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
index 8696ac1677..d6d00332bc 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ambari-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ambari-reporting-task</artifactId>
@@ -41,23 +41,23 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-reporting-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- test dependencies -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
index 1dfe188891..e5236e11e4 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ambari-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
index b0046d3aab..ac6cede6f1 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-nar/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-amqp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-amqp-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
index a2d01c7262..f564c40456 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/nifi-amqp-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-amqp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-amqp-processors</artifactId>
<packaging>jar</packaging>
@@ -40,7 +40,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -49,7 +49,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
index 8bc8a206dc..f0168fdd8f 100644
--- a/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-amqp-bundle/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-amqp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>A bundle of processors that publish to and consume messages from AMQP.</description>
<modules>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-amqp-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
index 126f5bfb3d..6d41172494 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-asn1-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-asn1-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
index e611210df0..eee7bc5a85 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/nifi-asn1-services/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-asn1-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.beanit</groupId>
diff --git a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
index 351e6ffe98..fc71d7b7a0 100644
--- a/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-asn1-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-nar-bundles</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
index 6d12bb2a4f..3119a4c09f 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-atlas-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-atlas-nar</artifactId>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
index cf082ba58d..2500797b7b 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-atlas-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-atlas-reporting-task</artifactId>
@@ -41,12 +41,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-reporting-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
index 74c69cd229..e515fc224a 100644
--- a/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-atlas-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-atlas-bundle</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-atlas-reporting-task</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
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 1c94d4765c..1340980ac5 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
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-avro-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
index fb5bc5ff7a..a90e76f53b 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/nifi-avro-processors/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-avro-processors</artifactId>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -52,7 +52,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-avro-bundle/pom.xml b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
index 915f5b5c4a..55d587d355 100644
--- a/nifi-nar-bundles/nifi-avro-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-avro-bundle/pom.xml
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
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 3c79417c36..c48a2cdfb8 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
@@ -19,7 +19,7 @@
<parent>
<artifactId>nifi-aws-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-abstract-processors</artifactId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 3b2014d3b1..531b7f9952 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-nar</artifactId>
@@ -33,18 +33,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-parameter-value-providers</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
index 8349fc416a..505d154552 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-parameter-value-providers/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-parameter-value-providers</artifactId>
@@ -32,13 +32,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-stateless-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
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 34e80e71c6..c67748a12a 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-processors</artifactId>
@@ -36,17 +36,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-listed-entity</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-abstract-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -92,7 +92,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -108,13 +108,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-registry-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
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 91d685654c..1d89145f52 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-service-api-nar</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-aws-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
index 56e2a21c49..c45c8f4042 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/nifi-aws-service-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-aws-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 90a95642bc..6e3554a9ea 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-aws-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
index dc02396208..7676ad1c2d 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-graph-authorizer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-azure-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-azure-graph-authorizer</artifactId>
@@ -33,12 +33,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.microsoft.graph</groupId>
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 f738622f69..23a6360b7e 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-azure-nar</artifactId>
@@ -33,17 +33,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-reporting-task</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-graph-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<exclusions>
<!-- Exclude Guava provided in nifi-azure-services-api-nar -->
<exclusion>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
index c691da0ba1..57b0ddb9b3 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-processors/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-azure-processors</artifactId>
<packaging>jar</packaging>
@@ -34,12 +34,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-service-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -178,38 +178,38 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-json-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-registry-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -221,7 +221,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-listed-entity</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
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 1bf0c2a1a6..bd1ec1da17 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
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-azure-reporting-task</artifactId>
<packaging>jar</packaging>
@@ -25,17 +25,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -63,14 +63,14 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-reporting-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
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 553b204f05..aaee4387a2 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
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-azure-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-azure-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
index 46f6fe566a..f8eb776771 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/nifi-azure-services-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-azure-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
index 3dd272970a..a9c57f2b53 100644
--- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-azure-bundle</artifactId>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
index 16aef7cd73..53e6fc75e1 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-nar/pom.xml
@@ -19,23 +19,23 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-beats-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-beats-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-beats-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
index 118eee4909..a3599baff4 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/nifi-beats-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-beats-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-beats-processors</artifactId>
@@ -33,12 +33,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-event-listen</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-socket-ssl</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
@@ -48,17 +48,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-socket-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-beats-bundle/pom.xml b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
index 3a247c9a36..39e21374f9 100644
--- a/nifi-nar-bundles/nifi-beats-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-beats-bundle/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-beats-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
index e63872e37d..2921a43ec5 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-distributedmapcache-service/pom.xml
@@ -19,41 +19,41 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<artifactId>nifi-utils</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<artifactId>nifi-record</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -70,30 +70,30 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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 42d2b23612..636e7efaa9 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cassandra-nar</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
index 2ed45725d1..71776a1f32 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cassandra-processors</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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 2d6b6716ef..4ce6071b7d 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
@@ -17,25 +17,25 @@
<parent>
<artifactId>nifi-cassandra-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-cassandra-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
index 96a770948b..31043a6146 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-cassandra-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
index 4fd2df8769..94af4cd203 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-cassandra-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -39,18 +39,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-distributedmapcache-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
index 8843a85914..ac0fd25060 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/nifi-cassandra-services/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-cassandra-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,13 +29,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
@@ -54,19 +54,19 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
index 173610de26..762fa6f673 100644
--- a/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cassandra-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<properties>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cassandra-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override jackson 2.7.9.3 from cassandra -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
index 976c4abc10..3bde941009 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ccda-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ccda-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
index 72a0f30647..4f52d65ea8 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/nifi-ccda-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ccda-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ccda-processors</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
index 74639b77c6..9ba4a8d022 100644
--- a/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ccda-bundle/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ccda-bundle</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ccda-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
index 75cfa458c3..4ff19d95da 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cdc-api</artifactId>
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 b932459965..735be5c87e 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
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc-mysql-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cdc-mysql-nar</artifactId>
<packaging>nar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
index 18cbe25b04..bee8959ae8 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc-mysql-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cdc-mysql-processors</artifactId>
<packaging>jar</packaging>
@@ -27,12 +27,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
index dbd4250eaa..9f401977b0 100644
--- a/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/nifi-cdc-mysql-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cdc-mysql-bundle</artifactId>
<packaging>pom</packaging>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cdc-mysql-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-cdc/pom.xml b/nifi-nar-bundles/nifi-cdc/pom.xml
index 74ac4212f0..49d3aaf892 100644
--- a/nifi-nar-bundles/nifi-cdc/pom.xml
+++ b/nifi-nar-bundles/nifi-cdc/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cdc</artifactId>
<packaging>pom</packaging>
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 0f4881bf73..c88724289b 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
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-confluent-platform-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-confluent-platform-nar</artifactId>
<packaging>nar</packaging>
@@ -22,13 +22,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-confluent-schema-registry-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
index 66cea332d0..c7091f6550 100644
--- a/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
+++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/nifi-confluent-schema-registry-service/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-confluent-platform-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-confluent-schema-registry-service</artifactId>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
index 0a156f11c3..a45a618c32 100644
--- a/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-confluent-platform-bundle/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-confluent-platform-bundle</artifactId>
<packaging>pom</packaging>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
index bdcf6c5bd3..184df76c85 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-couchbase-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
index bc35e92be9..34f59b4b52 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-couchbase-processors</artifactId>
@@ -33,12 +33,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
index bd975d2fce..8b499d8d94 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-couchbase-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
index ad4ac53209..e0dacfa577 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/nifi-couchbase-services-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-couchbase-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
index 2fa9bb2070..4e1942533b 100644
--- a/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-couchbase-bundle/pom.xml
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-couchbase-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
index 0184008f1d..f8b5aa914d 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-nar/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cybersecurity-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cybersecurity-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cybersecurity-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
index ed074057e8..6907a727c2 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/nifi-cybersecurity-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cybersecurity-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-cybersecurity-processors</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>info.debatty</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
index cc67a8fa60..04b8d6ff4e 100644
--- a/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-cybersecurity-bundle/pom.xml
@@ -19,12 +19,12 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-cybersecurity-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
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 9157eefb87..159b958103 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
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-datadog-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-datadog-nar</artifactId>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
index 025904f374..17cf0b2949 100644
--- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-datadog-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-datadog-reporting-task</artifactId>
@@ -46,12 +46,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.coursera</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
index a0c3cc59fd..f02df1c312 100644
--- a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-datadog-bundle</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-datadog-reporting-task</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
index 9ab8529b27..55e5c07fba 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-controller-service-api-nar</artifactId>
@@ -28,13 +28,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
index bb16ebea35..2e965b559e 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-controller-service-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
index ee410d619c..6034e3e08e 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-controller-service/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-controller-service</artifactId>
@@ -33,18 +33,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
index 67412fd1e0..5dc5b5c2a4 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-nar/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-nar</artifactId>
@@ -28,18 +28,18 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
index b24f2a06be..7640c00c45 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/nifi-druid-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-processors</artifactId>
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -56,25 +56,25 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-druid-controller-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-druid-bundle/pom.xml b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
index eea2cec35b..0bd5a15d51 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-druid-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
index f2b0ce7903..e35d00b199 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-nar/pom.xml
@@ -17,12 +17,12 @@
<parent>
<artifactId>nifi-easyrules-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-easyrules-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -32,12 +32,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-easyrules-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
index dbcc657f87..15336c8026 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-easyrules-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-rules-engine-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jeasy</groupId>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
index f74af37a54..5489e02c84 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-nar-bundles</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-easyrules-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
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 aa9055310c..8267a48515 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
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
index 8a85c2f0f7..c840796de7 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-client-service-api</artifactId>
@@ -29,24 +29,24 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
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 5cd84a8f2a..d439bce493 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
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-client-service-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
index 8424e27f4a..e378675640 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-client-service</artifactId>
@@ -43,54 +43,54 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-lookup-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-distributed-cache-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-proxy-configuration-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -172,13 +172,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
index fb32a4e5f1..249390d9b4 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<artifactId>nifi-elasticsearch-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
index 51ae4c1bca..8dc8cd3aaf 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<artifactId>nifi-elasticsearch-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-processors</artifactId>
@@ -34,12 +34,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -61,25 +61,25 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-registry-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -113,7 +113,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
index 43fd89533f..0de887607d 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<artifactId>nifi-elasticsearch-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
@@ -30,13 +30,13 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-restapi-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
index 82521b772e..33b470f3d1 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<artifactId>nifi-elasticsearch-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-elasticsearch-restapi-processors</artifactId>
@@ -24,35 +24,35 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-registry-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -62,7 +62,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ssl-context-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,13 +73,13 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-json-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -101,25 +101,25 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -131,7 +131,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-client-service</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index 43332533ef..0fe6e06fc2 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
@@ -15,7 +15,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
@@ -44,12 +44,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-restapi-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override commons-compress -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
index f107dd8fcf..6ed2a2d3aa 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-nar/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-email-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-email-nar</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
index 0928253fc7..9f0392302b 100644
--- a/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/nifi-email-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-email-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-email-processors</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-email-bundle/pom.xml b/nifi-nar-bundles/nifi-email-bundle/pom.xml
index e698c281fc..b7b303d0fd 100644
--- a/nifi-nar-bundles/nifi-email-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-email-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-email-bundle</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-email-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
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 1213975fff..e35ea0a3d8 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-enrich-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-enrich-nar</artifactId>
<packaging>nar</packaging>
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 864a189f24..0f396594f8 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
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-enrich-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -87,19 +87,19 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
index 39fe41553e..bd50a3399a 100644
--- a/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-enrich-bundle/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-enrich-bundle</artifactId>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-enrich-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override jackson -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
index d40fa92841..b82fb88a5b 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-nar/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<artifactId>nifi-evtx-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
index e88ad2a96a..a0c79c9f1e 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/nifi-evtx-processors/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>nifi-evtx-bundle</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-evtx-processors</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
index 2257bfba4c..da1a043938 100644
--- a/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-evtx-bundle/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-evtx-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
index e0a317edb4..9a12d18398 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-bin-manager</artifactId>
<packaging>jar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
index fc12a2b763..24ee2052b5 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-test-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-database-test-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
index f0d98b5242..b0f1165aef 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-database-utils</artifactId>
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
index ec14cf6836..7141c52f9a 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-listen/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-event-listen</artifactId>
<packaging>jar</packaging>
@@ -30,17 +30,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-socket-ssl</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-event-transport</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
index cc7d5508fe..eb4991654b 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-put/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-event-put</artifactId>
<packaging>jar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-event-transport</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
index d6ce227402..98f245f5da 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-event-transport/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-event-transport</artifactId>
<packaging>jar</packaging>
@@ -30,12 +30,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
index 9c64d06d18..b1d38fbb6c 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-hadoop-utils/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
@@ -32,12 +32,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kerberos</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
index 8d415b9ea5..8ec9d5040c 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-kerberos-test-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-kerberos-test-utils</artifactId>
@@ -27,17 +27,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-kerberos-credentials-service-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
index 3f4c5c93e0..3d1fa9380c 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-listed-entity</artifactId>
<packaging>jar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
index faa7205855..dc4e3aa749 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-prometheus-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-prometheus-utils</artifactId>
<packaging>jar</packaging>
@@ -41,17 +41,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- The client -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
index efb3a7b6f2..cdd3b40aac 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-put-pattern/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-put-pattern</artifactId>
<packaging>jar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
index e7001586a9..a7f7bb19c3 100755
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-avro-record-utils</artifactId>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
index a71b11b6dc..7df31d699e 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-hadoop-record-utils/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-hadoop-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencyManagement>
<dependencies>
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Other modules using nifi-hadoop-utils are expected to have the below dependencies available, typically through a NAR dependency -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
index d35592e9a0..601526a3e9 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-mock-record-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-mock-record-utils</artifactId>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Other modules using nifi-standard-record-utils are expected to have this API available, typically through a NAR dependency -->
<dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-avro-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
index 6dd1841cf1..ada55d5115 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-standard-record-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-standard-record-utils</artifactId>
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-socket-ssl</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Other modules using nifi-standard-record-utils are expected to have these APIs available, typically through a NAR dependency -->
<dependency>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
index c01287ebeb..6ea4de9f62 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>nifi-record-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
index 35773b1f6f..1d39dccbd3 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/pom.xml
@@ -17,12 +17,12 @@
<parent>
<artifactId>nifi-extension-utils</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-reporting-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencies>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-metrics</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
index 89adfbdf63..4c7525c129 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-service-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-service-utils</artifactId>
<packaging>jar</packaging>
@@ -38,12 +38,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
index 8725bf1747..30de43322f 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-syslog-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-extension-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-syslog-utils</artifactId>
<packaging>jar</packaging>
@@ -31,12 +31,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-extension-utils/pom.xml b/nifi-nar-bundles/nifi-extension-utils/pom.xml
index 9208eb3a9f..5f1fc89b90 100644
--- a/nifi-nar-bundles/nifi-extension-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-extension-utils/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>nifi-extension-utils</artifactId>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
index 4b7e6283c4..29857ddcc0 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-nar/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flume-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flume-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-hadoop-libraries-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
index 43b5489f71..b8f90fe875 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/nifi-flume-processors/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flume-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flume-processors</artifactId>
<packaging>jar</packaging>
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-packager</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
@@ -194,7 +194,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-flume-bundle/pom.xml b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
index 3f4df6b78a..dd2a145a18 100644
--- a/nifi-nar-bundles/nifi-flume-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-flume-bundle/pom.xml
@@ -18,10 +18,10 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flume-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<description>A bundle of processors that run Flume sources/sinks</description>
<modules>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flume-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override Netty 3 -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
index 63820a545a..f470f07d32 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-nar</artifactId>
<packaging>nar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
@@ -56,12 +56,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
index b25b613e3d..6f0003e8e3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-administration/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-administration</artifactId>
<dependencies>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-h2-database-migrator</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml
index 58dfdf911e..5ecfc17469 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-authorizer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-framework</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
index 3fbb61b4f3..c75e62a4e3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-client-dto</artifactId>
<dependencies>
@@ -29,12 +29,12 @@
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-data-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>c2-protocol-component-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
index a8096fa053..ae37bbe7cf 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-documentation/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-documentation</artifactId>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
index 884ed98ff3..ea21311918 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-file-authorizer</artifactId>
<build>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
index dbb42cab09..fe114bc9ab 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-flowfile-repo-serialization/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-flowfile-repo-serialization</artifactId>
@@ -30,17 +30,17 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-repository-models</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -49,12 +49,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kms</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-repository-encryption</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/pom.xml
index 3b3585c903..cdfda0a611 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-framework</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,12 +35,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-authorization</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization/pom.xml
index d971060bbc..ce8dcf941c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-authorization/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-authorization</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
index 58d02b35d4..1194faaf90 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster-protocol/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-cluster-protocol</artifactId>
<packaging>jar</packaging>
@@ -36,12 +36,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-socket-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
index e43c1faf3d..36daf4ef9e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-cluster</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
index 5cd8e20d3f..fe9cde8bdd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-components</artifactId>
<packaging>jar</packaging>
@@ -36,22 +36,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-repository-models</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -64,35 +64,35 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-encryptor</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-data-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-flow-diff</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
index 0b9e44e7fa..935f11a100 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/pom.xml
@@ -14,7 +14,7 @@ language governing permissions and limitations under the License. -->
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-core-api</artifactId>
<dependencies>
@@ -29,7 +29,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -50,7 +50,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -59,7 +59,7 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -68,12 +68,12 @@ language governing permissions and limitations under the License. -->
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-data-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
index 70024bac90..2ce7837247 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-core</artifactId>
<packaging>jar</packaging>
@@ -46,37 +46,37 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-components</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-repository-models</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-kms</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-repository-encryption</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -153,22 +153,22 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-write-ahead-log</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-rocksdb-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-flowfile-repo-serialization</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -195,17 +195,17 @@
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-data-model</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-flow-diff</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.registry</groupId>
<artifactId>nifi-registry-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -224,7 +224,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -249,13 +249,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-persistent-provenance-repository</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/pom.xml
index b7a1a28dfe..a3a897ba3b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-loading-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/pom.xml
index bd9e98a25a..612ae13ee0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-nar-utils</artifactId>
<packaging>jar</packaging>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime-manifest-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
index 1b133f82b8..50699f6517 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-headless-server/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-headless-server</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-mock-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-mock-authorizer/pom.xml
index 97b5bd296c..a283048f30 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-mock-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-mock-authorizer/pom.xml
@@ -13,7 +13,7 @@
<parent>
<artifactId>nifi-framework</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
index 1aa4c5ca11..653b2db7d5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-nar-utils</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/pom.xml
index 8b04f35e1b..c765034f73 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-properties-loader/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-properties-loader</artifactId>
<name>nifi-properties-loader</name>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-repository-models/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-repository-models/pom.xml
index f09794aaf2..d99bac96c2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-repository-models/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-repository-models/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-repository-models</artifactId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-schema-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
index bfb620d3b8..b050abed44 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-resources</artifactId>
<packaging>pom</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
index 040db8838b..b58019648f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-runtime/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-runtime</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-shell-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-shell-authorizer/pom.xml
index 81e943b625..3ccbe6a8cc 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-shell-authorizer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-shell-authorizer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>nifi-framework</artifactId>
<groupId>org.apache.nifi</groupId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>nifi-shell-authorizer</artifactId>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
index 753255557d..1dd6556a22 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-site-to-site/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-site-to-site</artifactId>
<dependencies>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/pom.xml
index 20dadff6a9..52e1d4eb23 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-standard-prioritizers/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-prioritizers</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
index 52844f61c3..590b9615f0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-user-actions/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-user-actions</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
index c4876640ce..98480c70fb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-custom-ui-utilities/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-custom-ui-utilities</artifactId>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
index 5d91b13e5a..fd58ffbdd1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-jetty</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
index f66e67534e..14d05d1479 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-ui-extension/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-ui-extension</artifactId>
<packaging>jar</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index f749f403aa..c4d91bd80d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
@@ -203,7 +203,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -260,7 +260,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-prometheus-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
index 689c5e8e47..de9e3b357f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-access/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
index b201e6de5d..91ff22879d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
index 9620d0ac73..03c57429ac 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
index 3743788f01..6a6c17c68c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
index cc8a3233bb..60a5bd4f22 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-optimistic-locking/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
index 66f7465eb8..6cf7b7e347 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-security</artifactId>
<build>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index 6ccb31fc0f..53fd38e86a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
index e693fb933c..64c627a4fc 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-web</artifactId>
<packaging>pom</packaging>
@@ -40,31 +40,31 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-api</artifactId>
<type>war</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-error</artifactId>
<type>war</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-docs</artifactId>
<type>war</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-viewer</artifactId>
<type>war</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-ui</artifactId>
<type>war</type>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Override commons-beanutils -->
<dependency>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
index eaf9d2793b..44f4c54233 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework</artifactId>
<packaging>pom</packaging>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/pom.xml
index 800798fb13..9ca6b38af8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-headless-server-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-headless-server-nar</artifactId>
<packaging>nar</packaging>
@@ -30,13 +30,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-headless-server</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
index 0b46d2fbed..2e6e9fc5b9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-server-nar/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-server-nar</artifactId>
<packaging>nar</packaging>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<!-- Dependencies provided by nifi-framework-nar -->
diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
index 3cd41ea8b6..1130d7ec57 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-framework-bundle</artifactId>
<packaging>pom</packaging>
@@ -37,183 +37,183 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-custom-ui-utilities</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-ui-extension</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-data-provenance-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-utils-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-expression-language</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site-client</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-logging-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster-protocol</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-cluster</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-runtime</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-client-dto</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-content-access</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-nar-loading-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-site-to-site</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-core</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties-loader</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-factory</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-authorization</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-authorization-providers</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-user-actions</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-administration</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-jetty</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-optimistic-locking</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-web-security</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-documentation</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-file-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-shell-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-authorizer</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-parameter</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
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 61fef92612..2eaf29b9ff 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-gcp-nar</artifactId>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
index c4515f6827..80087627a5 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-processors/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-gcp-processors</artifactId>
@@ -57,12 +57,12 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-listed-entity</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -133,13 +133,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-json-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-serialization-services</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
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 da362986fb..582e9a8b5f 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
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-gcp-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>nar</packaging>
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-standard-services-api-nar</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-services-api</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
index da615e9775..60efbceaba 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/nifi-gcp-services-api/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-gcp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-gcp-services-api</artifactId>
diff --git a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
index 665e78cc89..553094cd10 100644
--- a/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-gcp-bundle/pom.xml
@@ -19,11 +19,11 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-nar-bundles</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-gcp-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
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 f40215c1f1..d55c193c53 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geohash-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-geohash-nar</artifactId>
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geohash-processors</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
</dependencies>
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 8feda3db06..d7316f0696 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
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-geohash-bundle</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</parent>
<artifactId>nifi-geohash-processors</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ch.hsr</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-record-path</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -60,19 +60,19 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-mock-record-utils</artifactId>
- <version>1.16.0</version>
+ <version>1.16.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
... 11288 lines suppressed ...
[nifi] 15/31: NIFI-9702 ListSFTP will set mime.type when Record Writer configured
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit b4ada2271b1b6429282381f6fefa899c9c8e79a9
Author: Nathan Gough <th...@gmail.com>
AuthorDate: Wed Mar 23 12:45:04 2022 -0400
NIFI-9702 ListSFTP will set mime.type when Record Writer configured
This closes #5891
Signed-off-by: David Handermann <ex...@apache.org>
---
.../apache/nifi/processor/util/list/AbstractListProcessor.java | 8 ++++++--
.../main/java/org/apache/nifi/processors/standard/ListSFTP.java | 1 +
.../java/org/apache/nifi/processors/standard/TestListSFTP.java | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
index 17e14a47dc..682450211e 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
@@ -42,6 +42,7 @@ import org.apache.nifi.distributed.cache.client.Serializer;
import org.apache.nifi.distributed.cache.client.exception.DeserializationException;
import org.apache.nifi.distributed.cache.client.exception.SerializationException;
import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.processor.AbstractProcessor;
import org.apache.nifi.processor.ProcessContext;
@@ -907,8 +908,11 @@ public abstract class AbstractListProcessor<T extends ListableEntity> extends Ab
FlowFile flowFile = session.create();
final WriteResult writeResult;
+ final Map<String, String> attributes = new HashMap<>();
+
try (final OutputStream out = session.write(flowFile);
- final RecordSetWriter recordSetWriter = writerFactory.createWriter(getLogger(), getRecordSchema(), out, Collections.emptyMap())) {
+ final RecordSetWriter recordSetWriter = writerFactory.createWriter(getLogger(), getRecordSchema(), out, Collections.emptyMap())) {
+ attributes.put(CoreAttributes.MIME_TYPE.key(), recordSetWriter.getMimeType());
recordSetWriter.beginRecordSet();
for (final Map.Entry<Long, List<T>> timestampEntities : orderedEntries.entrySet()) {
@@ -932,7 +936,7 @@ public abstract class AbstractListProcessor<T extends ListableEntity> extends Ab
return 0;
}
- final Map<String, String> attributes = new HashMap<>(writeResult.getAttributes());
+ attributes.putAll(writeResult.getAttributes());
attributes.put("record.count", String.valueOf(writeResult.getRecordCount()));
flowFile = session.putAllAttributes(flowFile, attributes);
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
index 19e3215419..beafaa64cd 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListSFTP.java
@@ -68,6 +68,7 @@ import java.util.stream.Collectors;
"last modified as 'yyyy-MM-dd'T'HH:mm:ssZ'"),
@WritesAttribute(attribute = "filename", description = "The name of the file on the SFTP Server"),
@WritesAttribute(attribute = "path", description = "The fully qualified name of the directory on the SFTP Server from which the file was pulled"),
+ @WritesAttribute(attribute = "mime.type", description = "The MIME Type that is provided by the configured Record Writer"),
})
@Stateful(scopes = {Scope.CLUSTER}, description = "After performing a listing of files, the timestamp of the newest file is stored. "
+ "This allows the Processor to list only files that have been added or modified after "
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
index 9cae5f905b..6dd969d8cc 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
@@ -30,6 +30,7 @@ import java.util.UUID;
import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.processor.VerifiableProcessor;
import org.apache.nifi.processor.util.list.AbstractListProcessor;
import org.apache.nifi.processor.util.list.ListedEntityTracker;
@@ -109,6 +110,7 @@ public class TestListSFTP {
runner.assertValid(recordWriter);
runner.run(2);
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+ runner.assertAllFlowFilesContainAttribute(CoreAttributes.MIME_TYPE.key());
}
@Test
[nifi] 10/31: NIFI-9701 - Corrected No Tracking strategy to create one flow file when using a Record Writer
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 2cfef542e65a35249cdcd66d4d88392a8e8b1633
Author: Nathan Gough <th...@gmail.com>
AuthorDate: Mon Mar 21 10:32:16 2022 -0400
NIFI-9701 - Corrected No Tracking strategy to create one flow file when using a Record Writer
- Corrected No Tracking strategy Record Writer handling for ListSFTP
- Updated temporary test files to have last modified time of epoch to avoid intermittent issue with Minimum Age filtering
- Refactored MockCacheService to separate reusable class
This closes #5885
Signed-off-by: David Handermann <ex...@apache.org>
---
.../processor/util/list/AbstractListProcessor.java | 20 ++--
.../nifi/processors/standard/MockCacheService.java | 74 +++++++++++++
.../processors/standard/TestDeduplicateRecord.java | 51 ---------
.../nifi/processors/standard/TestListSFTP.java | 118 +++++++++++++++++----
4 files changed, 183 insertions(+), 80 deletions(-)
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
index 094ba8bf24..17e14a47dc 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-listed-entity/src/main/java/org/apache/nifi/processor/util/list/AbstractListProcessor.java
@@ -576,17 +576,17 @@ public abstract class AbstractListProcessor<T extends ListableEntity> extends Ab
entitiesForTimestamp.add(entity);
}
- if (orderedEntries.size() > 0) {
- for (Map.Entry<Long, List<T>> timestampEntities : orderedEntries.entrySet()) {
- List<T> entities = timestampEntities.getValue();
- for (T entity : entities) {
- // Create the FlowFile for this path.
- final Map<String, String> attributes = createAttributes(entity, context);
- FlowFile flowFile = session.create();
- flowFile = session.putAllAttributes(flowFile, attributes);
- session.transfer(flowFile, REL_SUCCESS);
- }
+ final boolean writerSet = context.getProperty(RECORD_WRITER).isSet();
+ if (writerSet) {
+ try {
+ createRecordsForEntities(context, session, orderedEntries);
+ } catch (final IOException | SchemaNotFoundException e) {
+ getLogger().error("Failed to write listing to FlowFile", e);
+ context.yield();
+ return;
}
+ } else {
+ createFlowFilesForEntities(context, session, orderedEntries);
}
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/MockCacheService.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/MockCacheService.java
new file mode 100644
index 0000000000..c2f231efe5
--- /dev/null
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/MockCacheService.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.processors.standard;
+
+import org.apache.nifi.controller.AbstractControllerService;
+import org.apache.nifi.distributed.cache.client.Deserializer;
+import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
+import org.apache.nifi.distributed.cache.client.Serializer;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+final class MockCacheService<K, V> extends AbstractControllerService implements DistributedMapCacheClient {
+ private Map storage;
+
+ public MockCacheService() {
+ storage = new HashMap<>();
+ }
+
+ @Override
+ public <K, V> boolean putIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer) throws IOException {
+ return false;
+ }
+
+ @Override
+ public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer, Deserializer<V> valueDeserializer) throws IOException {
+ return null;
+ }
+
+ @Override
+ public <K> boolean containsKey(K key, Serializer<K> keySerializer) throws IOException {
+ return storage.containsKey(key);
+ }
+
+ @Override
+ public <K, V> void put(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer) throws IOException {
+ storage.put(key, value);
+ }
+
+ @Override
+ public <K, V> V get(K key, Serializer<K> keySerializer, Deserializer<V> valueDeserializer) throws IOException {
+ return null;
+ }
+
+ @Override
+ public void close() throws IOException {
+
+ }
+
+ @Override
+ public <K> boolean remove(K key, Serializer<K> serializer) throws IOException {
+ return false;
+ }
+
+ @Override
+ public long removeByPattern(String regex) throws IOException {
+ return 0;
+ }
+}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeduplicateRecord.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeduplicateRecord.java
index 9de152feeb..9f90c3186c 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeduplicateRecord.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestDeduplicateRecord.java
@@ -17,10 +17,7 @@
package org.apache.nifi.processors.standard;
import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.nifi.controller.AbstractControllerService;
-import org.apache.nifi.distributed.cache.client.Deserializer;
import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
-import org.apache.nifi.distributed.cache.client.Serializer;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.serialization.record.MockRecordParser;
import org.apache.nifi.serialization.record.MockRecordWriter;
@@ -31,7 +28,6 @@ import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -271,51 +267,4 @@ public class TestDeduplicateRecord {
}
}
- private static final class MockCacheService<K, V> extends AbstractControllerService implements DistributedMapCacheClient {
- private Map storage;
-
- public MockCacheService() {
- storage = new HashMap<>();
- }
-
- @Override
- public <K, V> boolean putIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer) throws IOException {
- return false;
- }
-
- @Override
- public <K, V> V getAndPutIfAbsent(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer, Deserializer<V> valueDeserializer) throws IOException {
- return null;
- }
-
- @Override
- public <K> boolean containsKey(K key, Serializer<K> keySerializer) throws IOException {
- return storage.containsKey(key);
- }
-
- @Override
- public <K, V> void put(K key, V value, Serializer<K> keySerializer, Serializer<V> valueSerializer) throws IOException {
- storage.put(key, value);
- }
-
- @Override
- public <K, V> V get(K key, Serializer<K> keySerializer, Deserializer<V> valueDeserializer) throws IOException {
- return null;
- }
-
- @Override
- public void close() throws IOException {
-
- }
-
- @Override
- public <K> boolean remove(K key, Serializer<K> serializer) throws IOException {
- return false;
- }
-
- @Override
- public long removeByPattern(String regex) throws IOException {
- return 0;
- }
- }
}
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
index 18ec6375dd..9cae5f905b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListSFTP.java
@@ -21,17 +21,24 @@ import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.apache.nifi.components.ConfigVerificationResult;
import org.apache.nifi.components.ConfigVerificationResult.Outcome;
-import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.distributed.cache.client.DistributedMapCacheClient;
import org.apache.nifi.processor.VerifiableProcessor;
+import org.apache.nifi.processor.util.list.AbstractListProcessor;
+import org.apache.nifi.processor.util.list.ListedEntityTracker;
import org.apache.nifi.processors.standard.util.FTPTransfer;
import org.apache.nifi.processors.standard.util.SFTPTransfer;
import org.apache.nifi.processors.standard.util.SSHTestServer;
+import org.apache.nifi.reporting.InitializationException;
+import org.apache.nifi.serialization.RecordSetWriterFactory;
+import org.apache.nifi.serialization.record.MockRecordWriter;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
@@ -50,15 +57,14 @@ public class TestListSFTP {
private SSHTestServer sshServer;
- private String tempFileName;
+ private List<File> testFileNames;
@Before
public void setUp() throws Exception {
sshServer = new SSHTestServer();
sshServer.startServer();
-
- writeTempFile();
-
+ testFileNames = new ArrayList<File>();
+ writeTempFile(3);
runner = TestRunners.newTestRunner(ListSFTP.class);
runner.setProperty(ListSFTP.HOSTNAME, sshServer.getHost());
runner.setProperty(ListSFTP.USERNAME, sshServer.getUsername());
@@ -66,7 +72,6 @@ public class TestListSFTP {
runner.setProperty(FTPTransfer.PORT, Integer.toString(sshServer.getSSHPort()));
runner.setProperty(ListSFTP.REMOTE_PATH, REMOTE_DIRECTORY);
runner.setProperty(ListFile.TARGET_SYSTEM_TIMESTAMP_PRECISION, ListFile.PRECISION_MILLIS);
-
runner.assertValid();
assertVerificationSuccess();
}
@@ -74,13 +79,13 @@ public class TestListSFTP {
@After
public void tearDown() throws Exception {
sshServer.stopServer();
+ Files.deleteIfExists(Paths.get(sshServer.getVirtualFileSystemPath()));
}
@Test
- public void testRunFileFound() {
- runner.run();
-
- runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+ public void testRunFileFound() throws InterruptedException {
+ runner.run(1);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 3);
runner.assertAllFlowFilesContainAttribute("sftp.remote.host");
runner.assertAllFlowFilesContainAttribute("sftp.remote.port");
runner.assertAllFlowFilesContainAttribute("sftp.listing.user");
@@ -93,14 +98,81 @@ public class TestListSFTP {
final MockFlowFile retrievedFile = runner.getFlowFilesForRelationship(ListSFTP.REL_SUCCESS).get(0);
retrievedFile.assertAttributeEquals("sftp.listing.user", sshServer.getUsername());
- retrievedFile.assertAttributeEquals(CoreAttributes.FILENAME.key(), tempFileName);
+ }
+
+ @Test
+ public void testRunWithRecordWriter() throws InitializationException, InterruptedException {
+ RecordSetWriterFactory recordWriter = getCsvRecordWriter();
+ runner.addControllerService("csv-record-writer", recordWriter);
+ runner.setProperty(AbstractListProcessor.RECORD_WRITER, "csv-record-writer");
+ runner.enableControllerService(recordWriter);
+ runner.assertValid(recordWriter);
+ runner.run(2);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+ }
+
+ @Test
+ public void testRunWithRecordWriterNoTracking() throws InitializationException, InterruptedException {
+ RecordSetWriterFactory recordWriter = getCsvRecordWriter();
+ runner.addControllerService("csv-record-writer", recordWriter);
+ runner.setProperty(AbstractListProcessor.RECORD_WRITER, "csv-record-writer");
+ runner.setProperty(AbstractListProcessor.LISTING_STRATEGY, AbstractListProcessor.NO_TRACKING);
+ runner.enableControllerService(recordWriter);
+ runner.assertValid(recordWriter);
+ runner.run(2);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 2);
+ }
+
+ @Test
+ public void testRunWithRecordWriterByTimestamps() throws InitializationException, InterruptedException {
+ RecordSetWriterFactory recordWriter = getCsvRecordWriter();
+ runner.addControllerService("csv-record-writer", recordWriter);
+ runner.setProperty(AbstractListProcessor.RECORD_WRITER, "csv-record-writer");
+ runner.setProperty(AbstractListProcessor.LISTING_STRATEGY, AbstractListProcessor.BY_TIMESTAMPS);
+ runner.enableControllerService(recordWriter);
+ runner.assertValid(recordWriter);
+ runner.run(2);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+ }
+
+ @Test
+ public void testRunWithRecordWriterByEntities() throws InitializationException, InterruptedException {
+ RecordSetWriterFactory recordWriter = getCsvRecordWriter();
+ runner.addControllerService("csv-record-writer", recordWriter);
+ runner.setProperty(AbstractListProcessor.RECORD_WRITER, "csv-record-writer");
+ runner.setProperty(AbstractListProcessor.LISTING_STRATEGY, AbstractListProcessor.BY_ENTITIES);
+ runner.enableControllerService(recordWriter);
+ DistributedMapCacheClient dmc = new MockCacheService<>();
+ runner.addControllerService("dmc", dmc);
+ runner.setProperty(ListedEntityTracker.TRACKING_STATE_CACHE, "dmc");
+ runner.enableControllerService(dmc);
+ runner.assertValid(dmc);
+ runner.assertValid(recordWriter);
+ runner.run(2);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
+ }
+
+ @Test
+ public void testFilesWithRestart() throws InitializationException, InterruptedException {
+ RecordSetWriterFactory recordWriter = getCsvRecordWriter();
+ runner.addControllerService("csv-record-writer", recordWriter);
+ runner.setProperty(AbstractListProcessor.RECORD_WRITER, "csv-record-writer");
+ runner.setProperty(AbstractListProcessor.LISTING_STRATEGY, AbstractListProcessor.BY_ENTITIES);
+ runner.enableControllerService(recordWriter);
+ DistributedMapCacheClient dmc = new MockCacheService<>();
+ runner.addControllerService("dmc", dmc);
+ runner.setProperty(ListedEntityTracker.TRACKING_STATE_CACHE, "dmc");
+ runner.enableControllerService(dmc);
+ runner.assertValid();
+ runner.run(2);
+ runner.assertTransferCount(ListSFTP.REL_SUCCESS, 1);
}
@Test
public void testRunFileNotFoundMinSizeFiltered() {
runner.setProperty(ListFile.MIN_SIZE, "1KB");
- runner.run();
+ runner.run(2);
runner.assertTransferCount(ListSFTP.REL_SUCCESS, 0);
}
@@ -113,13 +185,21 @@ public class TestListSFTP {
assertEquals(Outcome.SUCCESSFUL, result.getOutcome());
}
- private void writeTempFile() {
- final File file = new File(sshServer.getVirtualFileSystemPath(), String.format("%s-%s", getClass().getSimpleName(), UUID.randomUUID()));
- try {
- Files.write(file.toPath(), FILE_CONTENTS);
- tempFileName = file.getName();
- } catch (final IOException e) {
- throw new UncheckedIOException(e);
+ private void writeTempFile(final int count) {
+ for (int i = 0; i < count; i++) {
+ final File file = new File(sshServer.getVirtualFileSystemPath(), String.format("%s-%s", getClass().getSimpleName(), UUID.randomUUID()));
+ try {
+ Files.write(file.toPath(), FILE_CONTENTS);
+ file.setLastModified(0);
+ testFileNames.add(file);
+ } catch (final IOException e) {
+ throw new UncheckedIOException(e);
+ }
}
+ assert(new File(sshServer.getVirtualFileSystemPath()).listFiles().length == count);
+ }
+
+ private RecordSetWriterFactory getCsvRecordWriter() {
+ return new MockRecordWriter("name, age");
}
}
[nifi] 21/31: NIFI-9824 - Address WARN log message in ProcessorAuditor on action RunOnce
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit e430349be5643096c2140721e6ecda676b0e4960
Author: Paul Grey <gr...@yahoo.com>
AuthorDate: Wed Mar 23 11:13:31 2022 -0400
NIFI-9824 - Address WARN log message in ProcessorAuditor on action RunOnce
This closes #5890
Signed-off-by: David Handermann <ex...@apache.org>
---
nifi-api/src/main/java/org/apache/nifi/action/Operation.java | 3 ++-
.../src/main/java/org/apache/nifi/audit/ProcessorAuditor.java | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/nifi-api/src/main/java/org/apache/nifi/action/Operation.java b/nifi-api/src/main/java/org/apache/nifi/action/Operation.java
index 99b9495573..1a199c5249 100644
--- a/nifi-api/src/main/java/org/apache/nifi/action/Operation.java
+++ b/nifi-api/src/main/java/org/apache/nifi/action/Operation.java
@@ -39,7 +39,8 @@ public enum Operation {
StopVersionControl("Stop Version Control"),
CommitLocalChanges("Commit Local Changes"),
RevertLocalChanges("Revert Local Changes"),
- ChangeVersion("Change Version");
+ ChangeVersion("Change Version"),
+ RunOnce("RunOnce");
private final String label;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
index 4345b64c4c..50b132f0cd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/ProcessorAuditor.java
@@ -263,6 +263,8 @@ public class ProcessorAuditor extends NiFiAuditor {
processorAction.setOperation(Operation.Stop);
} else if (ScheduledState.DISABLED.equals(scheduledState)) {
processorAction.setOperation(Operation.Enable);
+ } else if (ScheduledState.STOPPED.equals(scheduledState)) {
+ processorAction.setOperation(Operation.RunOnce);
}
}
actions.add(processorAction);
[nifi] 08/31: NIFI-9834: When calling ByteArrayContentRepository.read() on a null Content Claim, return an empty ByteArrayInputStream instead of throwing NullPointerException
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit ca585899d96b765bd4281e70c468354166e680a0
Author: Mark Payne <ma...@hotmail.com>
AuthorDate: Fri Mar 25 14:10:21 2022 -0400
NIFI-9834: When calling ByteArrayContentRepository.read() on a null Content Claim, return an empty ByteArrayInputStream instead of throwing NullPointerException
This closes #5903.
Signed-off-by: Peter Turcsanyi <tu...@apache.org>
---
.../nifi/stateless/repository/ByteArrayContentRepository.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java
index 39baaea2ed..e32aa738b3 100644
--- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java
+++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/repository/ByteArrayContentRepository.java
@@ -215,12 +215,16 @@ public class ByteArrayContentRepository implements ContentRepository {
@Override
public InputStream read(final ContentClaim claim) {
+ if (claim == null) {
+ return new ByteArrayInputStream(new byte[0]);
+ }
+
final ByteArrayContentClaim byteArrayContentClaim = verifyClaim(claim);
return byteArrayContentClaim.read();
}
@Override
- public InputStream read(final ResourceClaim claim) throws IOException {
+ public InputStream read(final ResourceClaim claim) {
if (claim == null) {
return new ByteArrayInputStream(new byte[0]);
}
[nifi] 17/31: NIFI-9787: Increasing visibility of selected slickgrid row with 1px b… (#5857)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit fb299b3f8776265f10e55936c0b0f6baf58b9c0f
Author: Jon Conti-Vock <10...@users.noreply.github.com>
AuthorDate: Tue Mar 29 14:18:53 2022 -0400
NIFI-9787: Increasing visibility of selected slickgrid row with 1px b… (#5857)
* NIFI-9787: Increasing visibility of selected slickgrid row with 1px borders on the top and bottom plus a slightly darker yellow background-color value.
* NIFI-9787: Added missing units to the padding values.
Merged #5857 into main.
---
.../nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css
index 45c44a3a8f..a9c67c8ab4 100755
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css
@@ -50,7 +50,10 @@
}
.slick-cell.selected {
- background-color: #fffbe6;
+ background-color: #ffef85;
+ border-top: 1px solid #000000;
+ border-bottom: 1px solid #000000;
+ padding-top: 0px;
}
.slick-row.odd {
@@ -126,7 +129,7 @@
border-top: 0;
border-left: 1px solid #c7d2d7;
border-bottom: 1px solid #c7d2d7;
- padding: 0 2px 6px 10px;
+ padding: 1px 2px 5px 10px;
}
div.status-text {
[nifi] 14/31: NIFI-9839: Fixed bug in which Process Group would return true for isEmpty even if it has a Controller Service (#5910)
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.16
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit beb20ddc4ad5c0f8d50f9a232848f60f5484f2f0
Author: markap14 <ma...@hotmail.com>
AuthorDate: Mon Mar 28 16:58:45 2022 -0400
NIFI-9839: Fixed bug in which Process Group would return true for isEmpty even if it has a Controller Service (#5910)
---
.../src/main/java/org/apache/nifi/groups/StandardProcessGroup.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 041d2cc0cf..58505f9cd5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -1446,7 +1446,7 @@ public final class StandardProcessGroup implements ProcessGroup {
readLock.lock();
try {
return inputPorts.isEmpty() && outputPorts.isEmpty() && connections.isEmpty()
- && processGroups.isEmpty() && labels.isEmpty() && processors.isEmpty() && remoteGroups.isEmpty();
+ && processGroups.isEmpty() && labels.isEmpty() && processors.isEmpty() && remoteGroups.isEmpty() && controllerServices.isEmpty();
} finally {
readLock.unlock();
}