[ambari] branch trunk updated: AMBARI-22959. ADDENDUM: Upgrade Log Search Solr client version to 7.2.1

[oleewere]

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

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2b73719  AMBARI-22959. ADDENDUM: Upgrade Log Search Solr client 
version to 7.2.1
2b73719 is described below

commit 2b7371963ce943140ec36b5f5ad87b04a9d18fbc
Author: Oliver Szabo <oleew...@gmail.com>
AuthorDate: Tue Feb 13 02:58:26 2018 +0100

    AMBARI-22959. ADDENDUM: Upgrade Log Search Solr client version to 7.2.1
---
 .../src/main/java/org/apache/ambari/infra/InfraManager.java         | 4 +++-
 .../src/main/java/org/apache/ambari/logfeeder/LogFeeder.java        | 6 +++++-
 .../src/main/java/org/apache/ambari/logsearch/LogSearch.java        | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/InfraManager.java
 
b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/InfraManager.java
index a212164..938cfd0 100644
--- 
a/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/InfraManager.java
+++ 
b/ambari-infra/ambari-infra-manager/src/main/java/org/apache/ambari/infra/InfraManager.java
@@ -24,6 +24,7 @@ import 
org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
 import 
org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import 
org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
+import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.system.ApplicationPidFileWriter;
@@ -35,7 +36,8 @@ import 
org.springframework.boot.system.ApplicationPidFileWriter;
     WebMvcAutoConfiguration.class,
     BatchAutoConfiguration.class,
     SecurityAutoConfiguration.class,
-    DataSourceAutoConfiguration.class
+    DataSourceAutoConfiguration.class,
+    SolrAutoConfiguration.class
   }
 )
 public class InfraManager {
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
index 235109c..4025d3d 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/LogFeeder.java
@@ -20,11 +20,15 @@ package org.apache.ambari.logfeeder;
 
 import org.springframework.boot.Banner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.system.ApplicationPidFileWriter;
 
 @SpringBootApplication(
-  scanBasePackages = {"org.apache.ambari.logfeeder"}
+  scanBasePackages = {"org.apache.ambari.logfeeder"},
+  exclude = {
+    SolrAutoConfiguration.class
+  }
 )
 public class LogFeeder {
 
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/LogSearch.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/LogSearch.java
index 45cda0a..7d42a92 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/LogSearch.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/LogSearch.java
@@ -21,6 +21,7 @@ package org.apache.ambari.logsearch;
 import org.springframework.boot.Banner;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import 
org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
+import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.system.ApplicationPidFileWriter;
@@ -29,7 +30,8 @@ import 
org.springframework.boot.system.ApplicationPidFileWriter;
   scanBasePackages = {"org.apache.ambari.logsearch"},
   exclude = {
     RepositoryRestMvcAutoConfiguration.class,
-    WebMvcAutoConfiguration.class
+    WebMvcAutoConfiguration.class,
+    SolrAutoConfiguration.class
   }
 )
 public class LogSearch {

-- 
To stop receiving notification emails like this one, please contact
oleew...@apache.org.