From 459daf6600bf3e1de112bba67ce42a4b0bad8737 Mon Sep 17 00:00:00 2001
From: exceptionfactory <exceptionfactory@apache.org>
Date: Thu, 9 Jun 2022 12:58:18 -0500
Subject: [PATCH] NIFI-10101 Moved nifi-hive-nar to optional include-hive
 profile

- Added nifi-hive-services-api-nar to include-hive3 and include-hive1_1 profiles

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #6113.
---
 nifi-assembly/pom.xml | 44 +++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 0501212288..c3a814511b 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -623,18 +623,6 @@ language governing permissions and limitations under the License. -->
             <version>1.17.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-hive-services-api-nar</artifactId>
-            <version>1.17.0-SNAPSHOT</version>
-            <type>nar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-hive-nar</artifactId>
-            <version>1.17.0-SNAPSHOT</version>
-            <type>nar</type>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-site-to-site-reporting-nar</artifactId>
@@ -935,6 +923,26 @@ language governing permissions and limitations under the License. -->
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>include-hive</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    <artifactId>nifi-hive-nar</artifactId>
+                    <version>1.17.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    <artifactId>nifi-hive-services-api-nar</artifactId>
+                    <version>1.17.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>include-hive1_1</id>
             <!-- This profile handles the inclusion of Hive 1.1.x artifacts. The NAR
@@ -950,6 +958,12 @@ language governing permissions and limitations under the License. -->
                     <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    <artifactId>nifi-hive-services-api-nar</artifactId>
+                    <version>1.17.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
             </dependencies>
         </profile>
         <profile>
@@ -967,6 +981,12 @@ language governing permissions and limitations under the License. -->
                     <version>1.17.0-SNAPSHOT</version>
                     <type>nar</type>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    <artifactId>nifi-hive-services-api-nar</artifactId>
+                    <version>1.17.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
             </dependencies>
         </profile>
         <profile>