NIFI-9780 Merge branch 'NIFI-9780-RC3'

shubhluck · Apr 4, 2022 · 873d255 · 873d255
2 parents 4a90334 + 0419dc2
commit 873d255
Show file tree

Hide file tree

Showing 649 changed files with 2,291 additions and 2,489 deletions.
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol-api</artifactId>
@@ -31,8 +31,7 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>c2-protocol-component-api</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.17.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/c2/c2-protocol/c2-protocol-component-api/pom.xml b/c2/c2-protocol/c2-protocol-component-api/pom.xml
@@ -15,13 +15,11 @@ 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.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>c2-protocol</artifactId>
         <groupId>org.apache.nifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -39,5 +37,4 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>c2-protocol</artifactId>

diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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-SNAPSHOT</version>
+                <version>1.17.0-SNAPSHOT</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>

diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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-SNAPSHOT</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.nifi.minifi</groupId>
             <artifactId>minifi-server-nar</artifactId>
-            <version>1.16.0-SNAPSHOT</version>
+            <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
         <dependency>
@@ -388,5 +388,4 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-bootstrap</artifactId>
     <packaging>jar</packaging>
@@ -108,5 +108,4 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-cache</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-cache</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -21,12 +21,12 @@ limitations under the License.
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-c2</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-c2-docker</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -75,5 +75,5 @@ limitations under the License.
                 </plugins>
             </build>
         </profile>
-    </profiles>      
+    </profiles>
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2-provider</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-c2</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-c2</artifactId>
     <packaging>pom</packaging>
@@ -47,5 +47,4 @@ limitations under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
-
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.apache.nifi.minifi</groupId>
         <artifactId>minifi-commons</artifactId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>minifi-utils</artifactId>
@@ -29,5 +29,4 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
     </dependencies>
-
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
     <artifactId>minifi-commons</artifactId>
     <packaging>pom</packaging>

diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.nifi.minifi</groupId>
     <artifactId>minifi-docker</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
+    <version>1.17.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -75,5 +75,5 @@ limitations under the License.
                 </plugins>
             </build>
         </profile>
-    </profiles>      
+    </profiles>
 </project>
diff --git 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-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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
@@ -19,7 +19,7 @@ limitations under the License.
     <parent>
         <artifactId>minifi-framework-bundle</artifactId>
         <groupId>org.apache.nifi.minifi</groupId>
-        <version>1.16.0-SNAPSHOT</version>
+        <version>1.17.0-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-SNAPSHOT</version>
+            <version>1.17.0-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-SNAPSHOT</version>
+            <version>1.17.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -111,5 +111,4 @@ limitations under the License.
             <scope>compile</scope>
         </dependency>
     </dependencies>
-
 </project>