Merge remote-tracking branch 'upstream/main'

.github/PULL_REQUEST_TEMPLATE.md

@@ -42,10 +42,6 @@ Please indicate the verification steps performed prior to pull request creation.
 - [ ] Build completed using `mvn clean install -P contrib-check`
   - [ ] JDK 21
 
-### UI Contributions
-
-- [ ] NiFi is modernizing its UI. Any contributions that update the [current UI](https://github.com/apache/nifi/tree/main/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui) also need to be implemented in the [new UI](https://github.com/apache/nifi/tree/main/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi).  
-
 ### Licensing
 
 - [ ] New dependencies are compatible with the [Apache License 2.0](https://apache.org/licenses/LICENSE-2.0) according to the [License Policy](https://www.apache.org/legal/resolved.html)

LICENSE

@@ -253,28 +253,6 @@ This product bundles 'CodeMirror' which is available under an MIT style license.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
-This product bundles 'jquery.base64.js' which is available under an MIT style license.
-
-    Copyright (c) 2013 Yannick Albert (http://yckart.com/)
-
-    Permission is hereby granted, free of charge, to any person obtaining 
-    a copy of this software and associated documentation files (the "Software"), 
-    to deal in the Software without restriction, including without limitation 
-    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or 
-    sell copies of the Software, and to permit persons to whom the Software is 
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be 
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, 
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE 
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 This product bundles HexViewJS available under an MIT License
 
    Copyright (c) 2010 Nick McVeity <nmcveity@gmail.com>

minifi/minifi-bootstrap/src/main/java/org/apache/nifi/minifi/bootstrap/service/MiNiFiPropertiesGenerator.java

@@ -92,8 +92,6 @@ public class MiNiFiPropertiesGenerator {
         Triple.of(NiFiProperties.BORED_YIELD_DURATION, "10 millis",
             "# If a component has no work to do (is \"bored\"), how long should we wait before checking again for work"),
         Triple.of(NiFiProperties.LOGIN_IDENTITY_PROVIDER_CONFIGURATION_FILE, "./conf/login-identity-providers.xml", EMPTY),
-        Triple.of(NiFiProperties.UI_BANNER_TEXT, EMPTY, EMPTY),
-        Triple.of(NiFiProperties.UI_AUTO_REFRESH_INTERVAL, "30 sec", EMPTY),
         Triple.of(NiFiProperties.NAR_LIBRARY_DIRECTORY, "./lib", EMPTY),
         Triple.of(NiFiProperties.NAR_WORKING_DIRECTORY, "./work/nar/", EMPTY),
         Triple.of(NiFiProperties.NAR_LIBRARY_AUTOLOAD_DIRECTORY, "./extensions", EMPTY),

minifi/minifi-bootstrap/src/test/resources/MINIFI-216/nifi.properties.before

@@ -28,8 +28,6 @@ nifi.bored.yield.duration=10 millis
 nifi.authority.provider.configuration.file=./conf/authority-providers.xml
 nifi.login.identity.provider.configuration.file=./conf/login-identity-providers.xml
 nifi.templates.directory=./conf/templates
-nifi.ui.banner.text= 
-nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./lib
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components

minifi/minifi-bootstrap/src/test/resources/MINIFI-245/nifi.properties.before

@@ -28,8 +28,6 @@ nifi.bored.yield.duration=10 millis
 nifi.authority.provider.configuration.file=./conf/authority-providers.xml
 nifi.login.identity.provider.configuration.file=./conf/login-identity-providers.xml
 nifi.templates.directory=./conf/templates
-nifi.ui.banner.text= 
-nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./lib
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components

minifi/minifi-bootstrap/src/test/resources/MINIFI-277/nifi.properties

@@ -28,8 +28,6 @@ nifi.bored.yield.duration=10 millis
 nifi.authority.provider.configuration.file=./conf/authority-providers.xml
 nifi.login.identity.provider.configuration.file=./conf/login-identity-providers.xml
 nifi.templates.directory=./conf/templates
-nifi.ui.banner.text= 
-nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./lib
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components

minifi/minifi-bootstrap/src/test/resources/NIFI-8753/nifi.properties.before

@@ -28,8 +28,6 @@ nifi.bored.yield.duration=10 millis
 nifi.authority.provider.configuration.file=./conf/authority-providers.xml
 nifi.login.identity.provider.configuration.file=./conf/login-identity-providers.xml
 nifi.templates.directory=./conf/templates
-nifi.ui.banner.text= 
-nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./lib
 nifi.nar.working.directory=./work/nar/
 nifi.documentation.working.directory=./work/docs/components

minifi/minifi-integration-tests/src/test/resources/conf/nifi.properties

@@ -24,8 +24,6 @@ nifi.administrative.yield.duration=30 sec
 nifi.reporting.task.configuration.file=./target/reporting-tasks.xml
 nifi.controller.service.configuration.file=./target/controller-services.xml
 nifi.templates.directory=./target/templates
-nifi.ui.banner.text=UI Banner Text
-nifi.ui.autorefresh.interval=30 sec
 nifi.nar.library.directory=./target/resources/NiFiProperties/lib/
 nifi.nar.library.directory.alt=./target/resources/NiFiProperties/lib2/
 nifi.nar.working.directory=./target/work/nar/