This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 7e848f9a64 NIFI-11834 Moved Riemann and HBase 1.1.2 to optional 
profiles
7e848f9a64 is described below

commit 7e848f9a646fadde445d51e45b3f51d988e702be
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Jul 19 15:55:41 2023 -0500

    NIFI-11834 Moved Riemann and HBase 1.1.2 to optional profiles
    
    Signed-off-by: Pierre Villard <[email protected]>
    
    This closes #7504.
---
 nifi-assembly/pom.xml                            | 46 +++++++++++++++++-------
 nifi-docs/src/main/asciidoc/developer-guide.adoc | 32 +++++++++--------
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
index 871a3c7d2b..7bb7fa4647 100644
--- a/nifi-assembly/pom.xml
+++ b/nifi-assembly/pom.xml
@@ -504,18 +504,6 @@ language governing permissions and limitations under the 
License. -->
             <version>1.23.0-SNAPSHOT</version>
             <type>nar</type>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-riemann-nar</artifactId>
-            <version>1.23.0-SNAPSHOT</version>
-            <type>nar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-hbase_1_1_2-client-service-nar</artifactId>
-            <version>1.23.0-SNAPSHOT</version>
-            <type>nar</type>
-        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-hbase_2-client-service-nar</artifactId>
@@ -1089,6 +1077,23 @@ language governing permissions and limitations under the 
License. -->
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>include-hbase1_1_2</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>allProfiles</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    
<artifactId>nifi-hbase_1_1_2-client-service-nar</artifactId>
+                    <version>1.23.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>include-hive</id>
             <activation>
@@ -1568,6 +1573,23 @@ language governing permissions and limitations under the 
License. -->
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>include-riemann</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>allProfiles</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.nifi</groupId>
+                    <artifactId>nifi-riemann-nar</artifactId>
+                    <version>1.23.0-SNAPSHOT</version>
+                    <type>nar</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <profile>
             <id>include-snowflake</id>
             <activation>
diff --git a/nifi-docs/src/main/asciidoc/developer-guide.adoc 
b/nifi-docs/src/main/asciidoc/developer-guide.adoc
index 148d05c0ee..840ae6098d 100644
--- a/nifi-docs/src/main/asciidoc/developer-guide.adoc
+++ b/nifi-docs/src/main/asciidoc/developer-guide.adoc
@@ -2721,21 +2721,23 @@ deprecationLogger.warn(
 
 [options="header,footer"]
 
|==================================================================================================================================================
-| Package                | Maven Profile         | Description
-| Apache Accumulo Bundle | include-accumulo      | Adds support for 
https://accumulo.apache.org[Apache Accumulo].
-| Apache Atlas Bundle    | include-atlas         | Adds support for the Apache 
Atlas data governance tool. The functionality from this bundle is based around 
reporting tasks that integrate with https://atlas.apache.org[Apache Atlas].
-| Apache Hive 1.1 Bundle | include-hive1_1       | Adds support for Apache 
Hive 1.1.X
-| Apache Hive 3 Bundle   | include-hive3         | Adds support for Apache 
Hive 3.X
-| Apache IoTDB Bundle    | include-iotdb         | Adds support for Apache 
IoTDB
-| Apache Ranger Bundle   | include-ranger        | Adds support for 
https://ranger.apache.org[Apache Ranger].
-| ASN.1 Support          | include-asn1          | Adds support for ASN.1
-| Contribution Check     | contrib-check         | Runs various quality checks 
that are required to be accepted before a contribution can be accepted into the 
core NiFi code base.
-| Graph Database Bundle  | include-graph         | Adds support for various 
common graph database scenarios. Support is currently for 
https://neo4j.com/developer/cypher[Cypher] and 
https://tinkerpop.apache.org/gremlin.html[Gremlin]-compatible databases such as 
Neo4J and JanusGraph. Includes controller services that provide driver 
functionality and a suite of processors for ingestion and querying.
-| GRPC Bundle            | include-grpc          | **This profile is active in 
official builds and should be active** Provides support for the GRPC protocol.
-| Media Bundle           | include-media         | The media bundle provides 
functionality based on https://tika.apache.org[Apache Tika] for extracting 
content and metadata from various types of binary formats supported by Apache 
Tika (ex. PDF, Microsoft Office).
-| Rules Engine Bundle    | include-rules         | Adds support for creating 
scripted rules engines that can be integrated into existing flows. These rules 
engines can provide flexibility to people who need more complex flow logic or 
are more comfortable with flow decision-making using custom code.
-| Snowflake Bundle       | include-snowflake     | Adds support for 
integration with the https://www.snowflake.com[Snowflake platform].
-| SQL Reporting Bundle   | include-sql-reporting | Adds reporting tasks that 
are designed to use SQL to update a RDBMS with metrics and other related data 
from Apache NiFi.
+| Package                   | Maven Profile         | Description
+| Apache Accumulo Bundle    | include-accumulo      | Adds support for 
https://accumulo.apache.org[Apache Accumulo].
+| Apache Atlas Bundle       | include-atlas         | Adds support for the 
Apache Atlas data governance tool. The functionality from this bundle is based 
around reporting tasks that integrate with https://atlas.apache.org[Apache 
Atlas].
+| Apache HBase 1.1.2 Bundle | include-hbase1_1_2    | Adds support for Apache 
HBase 1.1.2
+| Apache Hive 1.1 Bundle    | include-hive1_1       | Adds support for Apache 
Hive 1.1.X
+| Apache Hive 3 Bundle      | include-hive3         | Adds support for Apache 
Hive 3.X
+| Apache IoTDB Bundle       | include-iotdb         | Adds support for Apache 
IoTDB
+| Apache Ranger Bundle      | include-ranger        | Adds support for 
https://ranger.apache.org[Apache Ranger].
+| ASN.1 Support             | include-asn1          | Adds support for ASN.1
+| Contribution Check        | contrib-check         | Runs various quality 
checks that are required to be accepted before a contribution can be accepted 
into the core NiFi code base.
+| Graph Database Bundle     | include-graph         | Adds support for various 
common graph database scenarios. Support is currently for 
https://neo4j.com/developer/cypher[Cypher] and 
https://tinkerpop.apache.org/gremlin.html[Gremlin]-compatible databases such as 
Neo4J and JanusGraph. Includes controller services that provide driver 
functionality and a suite of processors for ingestion and querying.
+| GRPC Bundle               | include-grpc          | **This profile is active 
in official builds and should be active** Provides support for the GRPC 
protocol.
+| Media Bundle              | include-media         | The media bundle 
provides functionality based on https://tika.apache.org[Apache Tika] for 
extracting content and metadata from various types of binary formats supported 
by Apache Tika (ex. PDF, Microsoft Office).
+| Riemann Bundle            | include-riemann       | Adds support for Riemann 
database components
+| Rules Engine Bundle       | include-rules         | Adds support for 
creating scripted rules engines that can be integrated into existing flows. 
These rules engines can provide flexibility to people who need more complex 
flow logic or are more comfortable with flow decision-making using custom code.
+| Snowflake Bundle          | include-snowflake     | Adds support for 
integration with the https://www.snowflake.com[Snowflake platform].
+| SQL Reporting Bundle      | include-sql-reporting | Adds reporting tasks 
that are designed to use SQL to update a RDBMS with metrics and other related 
data from Apache NiFi.
 
|==================================================================================================================================================
 
 === Standard Build Instructions

Reply via email to