This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 4bba7e6188 [NIFI-12419] - Only include the new UI module when building
if the 'include-new-ui' profile is active. (#8069)
4bba7e6188 is described below
commit 4bba7e6188d7cdff122ef851a46ce44e533e940b
Author: Rob Fellows <[email protected]>
AuthorDate: Mon Nov 27 20:18:31 2023 -0500
[NIFI-12419] - Only include the new UI module when building if the
'include-new-ui' profile is active. (#8069)
* [NIFI-12419] - Only include the new UI module when building if the
'include-new-ui' profile is active. Also update the ci-workflow.yaml to
activate that profile.
* add the profile activation to the Maven Build command
This closes #8069
---
.github/workflows/ci-workflow.yml | 3 +++
.../nifi-framework/nifi-web/pom.xml | 18 +++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci-workflow.yml
b/.github/workflows/ci-workflow.yml
index 28742b6e69..1c3b97fef0 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -56,6 +56,7 @@ env:
-pl -:nifi-nar-provider-assembly
-pl -:nifi-py4j-integration-tests
-pl -:nifi-python-extensions-bundle
+ -P include-new-ui
MAVEN_VERIFY_COMMAND: >-
verify
--show-version
@@ -65,6 +66,7 @@ env:
-D dir-only
MAVEN_BUILD_PROFILES: >-
-P skip-nifi-bin-assembly
+ -P include-new-ui
MAVEN_PROJECTS: >-
-pl -minifi/minifi-assembly
-pl -minifi/minifi-c2/minifi-c2-assembly
@@ -110,6 +112,7 @@ jobs:
--no-transfer-progress
--fail-fast
-P contrib-check
+ -P include-new-ui
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
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 33401fb490..c808bf66ad 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
@@ -33,8 +33,24 @@
<module>nifi-jetty</module>
<module>nifi-web-content-access</module>
<module>nifi-ui-extension</module>
- <module>nifi-web-frontend</module>
</modules>
+
+ <!-- Only include the new UI if the profile is active -->
+ <profiles>
+ <profile>
+ <id>include-new-ui</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ <property>
+ <name>include-new-ui</name>
+ </property>
+ </activation>
+ <modules>
+ <module>nifi-web-frontend</module>
+ </modules>
+ </profile>
+ </profiles>
+
<dependencyManagement>
<dependencies>
<dependency>
