Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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
This commit is contained in:
Rob Fellows 2023-11-27 20:18:31 -05:00 committed by GitHub
parent 1268acb864
commit 4bba7e6188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci-workflow.yml vendored
View File

@ -56,6 +56,7 @@ env:
-pl -:nifi-nar-provider-assembly -pl -:nifi-nar-provider-assembly
-pl -:nifi-py4j-integration-tests -pl -:nifi-py4j-integration-tests
-pl -:nifi-python-extensions-bundle -pl -:nifi-python-extensions-bundle
-P include-new-ui
MAVEN_VERIFY_COMMAND: >- MAVEN_VERIFY_COMMAND: >-
verify verify
--show-version --show-version
@ -65,6 +66,7 @@ env:
-D dir-only -D dir-only
MAVEN_BUILD_PROFILES: >- MAVEN_BUILD_PROFILES: >-
-P skip-nifi-bin-assembly -P skip-nifi-bin-assembly
-P include-new-ui
MAVEN_PROJECTS: >- MAVEN_PROJECTS: >-
-pl -minifi/minifi-assembly -pl -minifi/minifi-assembly
-pl -minifi/minifi-c2/minifi-c2-assembly -pl -minifi/minifi-c2/minifi-c2-assembly
@ -110,6 +112,7 @@ jobs:
--no-transfer-progress --no-transfer-progress
--fail-fast --fail-fast
-P contrib-check -P contrib-check
-P include-new-ui
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v2 uses: github/codeql-action/init@v2
with: with:

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml
View File

@ -33,8 +33,24 @@
<module>nifi-jetty</module> <module>nifi-jetty</module>
<module>nifi-web-content-access</module> <module>nifi-web-content-access</module>
<module>nifi-ui-extension</module> <module>nifi-ui-extension</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> <module>nifi-web-frontend</module>
</modules> </modules>
</profile>
</profiles>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>