You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by wu...@apache.org on 2022/11/10 08:41:07 UTC
[ambari-logsearch] branch master updated: AMBARI-25319: Upgrade dependency on org.springframework.boot:spring-boot-starter-jetty:jar:2.0.6.RELEASE (#88)
This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/master by this push:
new e863cd63 AMBARI-25319: Upgrade dependency on org.springframework.boot:spring-boot-starter-jetty:jar:2.0.6.RELEASE (#88)
e863cd63 is described below
commit e863cd639067cb8cbb204b59e70f30bbfafa1e98
Author: Zhiguo Wu <wu...@apache.org>
AuthorDate: Thu Nov 10 16:41:01 2022 +0800
AMBARI-25319: Upgrade dependency on org.springframework.boot:spring-boot-starter-jetty:jar:2.0.6.RELEASE (#88)
---
ambari-logsearch-logfeeder/pom.xml | 4 ++--
ambari-logsearch-server/pom.xml | 6 +++---
.../logsearch/conf/LogSearchConfigApiConfig.java | 10 +---------
.../apache/ambari/logsearch/conf/SecurityConfig.java | 10 ++++------
.../org/apache/ambari/logsearch/conf/SolrConfig.java | 19 -------------------
5 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch-logfeeder/pom.xml
index 87322518..791cb67a 100644
--- a/ambari-logsearch-logfeeder/pom.xml
+++ b/ambari-logsearch-logfeeder/pom.xml
@@ -33,8 +33,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.version>5.1.2.RELEASE</spring.version>
- <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+ <spring.version>5.1.8.RELEASE</spring.version>
+ <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
<aws-sdk.version>1.11.445</aws-sdk.version>
<gcs-connector.version>hadoop3-1.9.10</gcs-connector.version>
</properties>
diff --git a/ambari-logsearch-server/pom.xml b/ambari-logsearch-server/pom.xml
index 5dfb7cff..0680c0d6 100755
--- a/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch-server/pom.xml
@@ -27,11 +27,11 @@
<url>http://maven.apache.org</url>
<name>Ambari Logsearch Server</name>
<properties>
- <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
+ <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
<!-- <spring-boot.version>2.1.0.M2</spring-boot.version> -->
- <spring.version>5.1.1.RELEASE</spring.version>
+ <spring.version>5.1.8.RELEASE</spring.version>
+ <spring.security.version>5.1.5.RELEASE</spring.security.version>
<spring-session.version>1.3.3.RELEASE</spring-session.version>
- <spring.security.version>5.1.1.RELEASE</spring.security.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-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java
index 3eb92919..692bb759 100644
--- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java
+++ b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/LogSearchConfigApiConfig.java
@@ -18,14 +18,11 @@
*/
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 +56,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-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
index 22754f72..98b0ab77 100644
--- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
+++ b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
@@ -132,6 +132,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Inject
private LogSearchConfigApiConfig logSearchConfigApiConfig;
+ @Inject
+ private LogsearchAuthenticationProvider logsearchAuthenticationProvider;
+
@Inject
private RoleDao roleDao;
@@ -154,7 +157,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/**")
.hasRole("USER")
.and()
- .authenticationProvider(logsearchAuthenticationProvider())
+ .authenticationProvider(logsearchAuthenticationProvider)
.httpBasic()
.authenticationEntryPoint(logsearchAuthenticationEntryPoint())
.and()
@@ -257,11 +260,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
return new LogsearchKRBAuthenticationFilter(requestMatcher());
}
- @Bean
- public LogsearchAuthenticationProvider logsearchAuthenticationProvider() {
- return new LogsearchAuthenticationProvider();
- }
-
@Bean
public LogsearchTrustedProxyFilter logsearchTrustedProxyFilter() throws Exception {
LogsearchTrustedProxyFilter filter = new LogsearchTrustedProxyFilter(requestMatcher(), authPropsConfig);
diff --git a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
index 2a454e98..cd3d5804 100644
--- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SolrConfig.java
+++ b/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.SolrServiceLogsState;
-import org.apache.ambari.logsearch.conf.global.SolrMetadataState;
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 = "solrMetadataState")
- public SolrCollectionState solrEventHistoryState() {
- return new SolrMetadataState();
- }
-
@Bean
public SolrClientsHolder solrClientsHolder() {
return new SolrClientsHolder();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ambari.apache.org
For additional commands, e-mail: commits-help@ambari.apache.org