Skip to content

Commit

Permalink
[NIFI-12419] - Only include the new UI module when building if the 'i…
Browse files Browse the repository at this point in the history
…nclude-new-ui' profile is active. (apache#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 apache#8069
  • Loading branch information
rfellows authored Nov 28, 2023
1 parent 1268acb commit 4bba7e6
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 4bba7e6

Please sign in to comment.