This is an automated email from the ASF dual-hosted git repository. krisztiankasa pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new 2301885 AMBARI-25319 - Logsearch: Upgrade dependency on org.springframework.boot:spring-boot-starter-jetty:jar:2.0.6.RELEASE (#3029) 2301885 is described below commit 230188512eee49a04011e3772a313188c3802ff3 Author: kasakrisz <33458261+kasakr...@users.noreply.github.com> AuthorDate: Fri Jun 21 10:45:47 2019 +0200 AMBARI-25319 - Logsearch: Upgrade dependency on org.springframework.boot:spring-boot-starter-jetty:jar:2.0.6.RELEASE (#3029) --- ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 4 ++-- ambari-logsearch/ambari-logsearch-server/pom.xml | 6 +++--- .../logsearch/conf/LogSearchConfigApiConfig.java | 11 ++--------- .../apache/ambari/logsearch/conf/SecurityConfig.java | 10 ++++------ .../org/apache/ambari/logsearch/conf/SolrConfig.java | 19 ------------------- 5 files changed, 11 insertions(+), 39 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index 924f8d2..73d91d2 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -32,8 +32,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <spring.version>5.1.1.RELEASE</spring.version> - <spring-boot.version>2.0.6.RELEASE</spring-boot.version> + <spring.version>5.1.8.RELEASE</spring.version> + <spring-boot.version>2.1.5.RELEASE</spring-boot.version> </properties> <dependencies> diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index e4dbfd1..c92bd46 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -26,11 +26,11 @@ <packaging>jar</packaging> <name>Ambari Logsearch Server</name> <properties> - <spring.version>5.1.1.RELEASE</spring.version> - <spring.security.version>5.1.1.RELEASE</spring.security.version> + <spring.version>5.1.8.RELEASE</spring.version> + <spring.security.version>5.1.5.RELEASE</spring.security.version> <spring-data-solr.version>3.0.10.RELEASE</spring-data-solr.version> <spring-data.version>2.0.10.RELEASE</spring-data.version> - <spring-boot.version>2.0.6.RELEASE</spring-boot.version> + <spring-boot.version>2.1.5.RELEASE</spring-boot.version> <jersey.version>2.27</jersey.version> <jetty.version>9.4.12.v20180830</jetty.version> <swagger.version>1.5.16</swagger.version> diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java index 2765ebd..14abaa0 100644 --- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java @@ -18,14 +18,12 @@ */ package org.apache.ambari.logsearch.conf; -import org.apache.ambari.logsearch.conf.global.LogLevelFilterManagerState; +import static org.apache.ambari.logsearch.common.LogSearchConstants.LOGSEARCH_PROPERTIES_FILE; + import org.apache.ambari.logsearch.config.api.LogSearchPropertyDescription; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static org.apache.ambari.logsearch.common.LogSearchConstants.LOGSEARCH_PROPERTIES_FILE; - @Configuration public class LogSearchConfigApiConfig { @@ -59,11 +57,6 @@ public class LogSearchConfigApiConfig { @Value("${logsearch.config.api.filter.zk.enabled:false}") public boolean zkFilterStorage; - @Bean(name = "logLevelFilterManagerState") - public LogLevelFilterManagerState logLevelFilterManagerState() { - return new LogLevelFilterManagerState(); - } - public boolean isConfigApiEnabled() { return configApiEnabled; } diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java index f465129..e18a964 100644 --- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java @@ -100,6 +100,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Inject private LogSearchConfigApiConfig logSearchConfigApiConfig; + @Inject + private LogsearchAuthenticationProvider logsearchAuthenticationProvider; + @Override protected void configure(HttpSecurity http) throws Exception { http @@ -108,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .requestMatchers(requestMatcher()).permitAll() .antMatchers("/**").authenticated() .and() - .authenticationProvider(logsearchAuthenticationProvider()) + .authenticationProvider(logsearchAuthenticationProvider) .httpBasic() .authenticationEntryPoint(logsearchAuthenticationEntryPoint()) .and() @@ -144,11 +147,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { } @Bean - public LogsearchAuthenticationProvider logsearchAuthenticationProvider() { - return new LogsearchAuthenticationProvider(); - } - - @Bean public LogsearchJWTFilter logsearchJwtFilter() throws Exception { LogsearchJWTFilter filter = new LogsearchJWTFilter(requestMatcher(), authPropsConfig); filter.setAuthenticationManager(authenticationManagerBean()); diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java index 338c987..cd3d580 100644 --- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java @@ -18,10 +18,6 @@ */ package org.apache.ambari.logsearch.conf; -import org.apache.ambari.logsearch.conf.global.SolrAuditLogsState; -import org.apache.ambari.logsearch.conf.global.SolrCollectionState; -import org.apache.ambari.logsearch.conf.global.SolrEventHistoryState; -import org.apache.ambari.logsearch.conf.global.SolrServiceLogsState; import org.apache.ambari.logsearch.dao.SolrSchemaFieldDao; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,21 +32,6 @@ public class SolrConfig { return new SolrSchemaFieldDao(); } - @Bean(name = "solrServiceLogsState") - public SolrCollectionState solrServiceLogsState() { - return new SolrServiceLogsState(); - } - - @Bean(name = "solrAuditLogsState") - public SolrCollectionState solrAuditLogsState() { - return new SolrAuditLogsState(); - } - - @Bean(name = "solrEventHistoryState") - public SolrCollectionState solrEventHistoryState() { - return new SolrEventHistoryState(); - } - @Bean public SolrClientsHolder solrClientsHolder() { return new SolrClientsHolder();