[nifi] branch main updated: NIFI-10560 This closes #6459. Excluded Elasticsearch and Solr Auto Configuration from Registry

[joewitt]

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

joewitt 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 0dec6bfbe1 NIFI-10560 This closes #6459. Excluded Elasticsearch and 
Solr Auto Configuration from Registry
0dec6bfbe1 is described below

commit 0dec6bfbe13cabca1bdfc8fddec06d0a264dc29b
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Wed Sep 28 17:59:19 2022 -0500

    NIFI-10560 This closes #6459. Excluded Elasticsearch and Solr Auto 
Configuration from Registry
    
    - Excluding these configurations avoids unexpected runtime behavior when 
running Registry with the Apache Ranger plugin
    
    Signed-off-by: Joe Witt <joew...@apache.org>
---
 .../org/apache/nifi/registry/NiFiRegistryApiApplication.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/NiFiRegistryApiApplication.java
 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/NiFiRegistryApiApplication.java
index 2ffefbb5a9..14ca1672bb 100644
--- 
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/NiFiRegistryApiApplication.java
+++ 
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/NiFiRegistryApiApplication.java
@@ -22,7 +22,10 @@ import org.apache.nifi.registry.hook.Event;
 import org.apache.nifi.registry.hook.EventType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import 
org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import 
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -41,6 +44,12 @@ import java.util.Properties;
  *
  * WebMvcAutoConfiguration is excluded because our web app is using Jersey in 
place of SpringMVC
  */
+@EnableAutoConfiguration(
+        exclude = {
+                ElasticsearchRestClientAutoConfiguration.class,
+                SolrAutoConfiguration.class
+        }
+)
 @SpringBootApplication
 public class NiFiRegistryApiApplication extends SpringBootServletInitializer {