springBoot 2.7.3

build.gradle

@@ -382,6 +382,9 @@ subprojects {
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"

config/build_docker.gradle

@@ -342,6 +342,9 @@ subprojects {
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"

config/build_jar.gradle

@@ -341,6 +341,9 @@ subprojects {
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"

config/build_standard.gradle

@@ -378,6 +378,9 @@ subprojects {
          implementation group: 'org.latencyutils', name: 'LatencyUtils', version: "${LatencyUtilsVersion}"
          implementation group: 'org.codehaus.woodstox', name: 'stax2-api', version: "${stax2apiVersion}"
          implementation group: 'org.reflections', name: 'reflections', version: "${reflectionsVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_common', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel', version: "${prometheusVersion}"
+         implementation group: 'io.prometheus', name: 'simpleclient_tracer_otel_agent', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient', version: "${prometheusVersion}"
          implementation group: 'io.prometheus', name: 'simpleclient_common', version: "${prometheusVersion}"
          implementation group: 'com.belerweb', name: 'pinyin4j', version: "${pinyin4jVersion}"

gradle.properties

@@ -15,7 +15,7 @@
 # */
 #maxkey properties 
 group                           =maxkey.top
-version                         =3.5.6
+version                         =3.5.7
 vendor                          =https://www.maxkey.top
 author                          =MaxKeyTop
 
@@ -62,15 +62,15 @@ poiVersion                      =5.2.2
 tomcatVersion                   =9.0.65
 tomcatembedloggingjuliVersion   =8.5.2
 #spring 
-springVersion                   =5.3.22
-springBootVersion               =2.6.11
+springVersion                   =5.3.23
+springBootVersion               =2.7.3
 springSecurityVersion           =5.6.7
 springDataVersion               =2.6.6
 springkafkaVersion              =2.9.0
 springretryVersion              =1.3.3
 springplugincoreVersion         =2.0.0.RELEASE
 springpluginmetadataVersion     =2.0.0.RELEASE
-springcloudVersion              =3.1.3
+springcloudVersion              =3.1.4
 springcloudalibabaVersion       =2021.1
 springcloudalibabaspringVersion =1.0.11
 springcloudalibabacsplVersion   =1.8.5
@@ -171,8 +171,8 @@ xmlsecVersion                   =1.5.8
 xpp3Version                     =1.1.6
 xstreamVersion                  =1.4.10
 passayVersion                   =1.6.1
-micrometercoreVersion           =1.8.1
-prometheusVersion               =0.14.1
+micrometercoreVersion           =1.9.4
+prometheusVersion               =0.16.0
 LatencyUtilsVersion             =2.0.3
 stax2apiVersion                 =4.2.1
 mapstructVersion                =1.4.1.Final

maxkey-authentications/maxkey-authentication-captcha/src/main/java/org/maxkey/autoconfigure/KaptchaAutoConfiguration.java

@@ -25,13 +25,13 @@ import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
 
-@Configuration
+@AutoConfiguration
 public class KaptchaAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(KaptchaAutoConfiguration.class);
     

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/SessionAutoConfiguration.java

@@ -26,12 +26,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 
-@Configuration
+@AutoConfiguration
 public class SessionAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = 
             LoggerFactory.getLogger(SessionAutoConfiguration.class);

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/autoconfigure/TokenAutoConfiguration.java

@@ -30,12 +30,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import com.nimbusds.jose.JOSEException;
 
 
-@Configuration
+@AutoConfiguration
 public class TokenAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = 
             LoggerFactory.getLogger(TokenAutoConfiguration.class);
@@ -48,6 +48,7 @@ public class TokenAutoConfiguration  implements InitializingBean {
     		AuthRefreshTokenService refreshTokenService,
     		@Value("${maxkey.server.persistence}") int persistence) throws JOSEException {
     	CongressService congressService;
+    	_logger.debug("cache persistence {}" , persistence);
     	if (persistence == ConstsPersistence.REDIS) {
     		congressService = new RedisCongressService(redisConnFactory);
     	}else {

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/autoconfigure/OneTimePasswordAutoConfiguration.java

@@ -27,11 +27,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 
-@Configuration
+@AutoConfiguration
 public class OneTimePasswordAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = 
             LoggerFactory.getLogger(OneTimePasswordAutoConfiguration.class);

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/AuthnProviderAutoConfiguration.java

@@ -41,13 +41,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 
-@Configuration
+@AutoConfiguration
 public class AuthnProviderAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = 
             LoggerFactory.getLogger(AuthnProviderAutoConfiguration.class);

maxkey-authentications/maxkey-authentication-provider/src/main/java/org/maxkey/autoconfigure/JwtAuthnAutoConfiguration.java

@@ -28,12 +28,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
 
-@Configuration
+@AutoConfiguration
 public class JwtAuthnAutoConfiguration implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(JwtAuthnAutoConfiguration.class);
 

maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/autoconfigure/SocialSignOnAutoConfiguration.java

@@ -24,13 +24,13 @@ import org.maxkey.entity.SocialsProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-@Configuration
+@AutoConfiguration
 @ComponentScan(basePackages = {
         "org.maxkey.authn.support.socialsignon"
 })

maxkey-core/src/main/java/org/maxkey/autoconfigure/ApplicationAutoConfiguration.java

@@ -43,8 +43,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -57,7 +57,7 @@ import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
 
 import com.nimbusds.jose.JOSEException;
 
-@Configuration
+@AutoConfiguration
 public class ApplicationAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = 
             LoggerFactory.getLogger(ApplicationAutoConfiguration.class);

maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java

@@ -33,12 +33,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.endpoint.ApiVersion;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.WebServerFactoryCustomizer;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -62,7 +62,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 
-@Configuration
+@AutoConfiguration
 public class MvcAutoConfiguration implements InitializingBean , WebMvcConfigurer {
     private static final  Logger _logger = LoggerFactory.getLogger(MvcAutoConfiguration.class);
     

maxkey-core/src/main/java/org/maxkey/autoconfigure/RedisAutoConfiguration.java

@@ -22,11 +22,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.JedisPoolConfig;
 
-@Configuration
+@AutoConfiguration
 public class RedisAutoConfiguration implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(RedisAutoConfiguration.class);
     

maxkey-core/src/main/java/org/maxkey/autoconfigure/SwaggerConfig.java

@@ -4,15 +4,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springdoc.core.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.info.License;
 
-@Configuration
+@AutoConfiguration
 public class SwaggerConfig {
 	final static Logger _logger = LoggerFactory.getLogger(SwaggerConfig.class);
 	

maxkey-protocols/maxkey-protocol-cas/src/main/java/org/maxkey/autoconfigure/CasAutoConfiguration.java

@@ -26,12 +26,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-@Configuration
+@AutoConfiguration
 @ComponentScan(basePackages = {
         "org.maxkey.authz.cas.endpoint"
 })

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/maxkey/autoconfigure/Oauth20AutoConfiguration.java

@@ -49,10 +49,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.authentication.ProviderManager;
@@ -62,7 +62,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWEAlgorithm;
 
-@Configuration
+@AutoConfiguration
 @ComponentScan(basePackages = {
         "org.maxkey.authz.oauth2.provider.endpoint",
         "org.maxkey.authz.oauth2.provider.userinfo.endpoint",

maxkey-protocols/maxkey-protocol-saml-2.0/src/main/java/org/maxkey/autoconfigure/Saml20AutoConfiguration.java

@@ -47,12 +47,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.ui.velocity.VelocityEngineFactoryBean;
 
-@Configuration
+@AutoConfiguration
 @ComponentScan(basePackages = {
         "org.maxkey.authz.saml20.provider.endpoint",
         "org.maxkey.authz.saml20.metadata.endpoint",

maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/synchronizer/autoconfigure/SynchronizerAutoConfiguration.java → maxkey-synchronizers/maxkey-synchronizer/src/main/java/org/maxkey/autoconfigure/SynchronizerAutoConfiguration.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.synchronizer.autoconfigure;
+package org.maxkey.autoconfigure;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -37,13 +37,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
-@Configuration
+@AutoConfiguration
 public class SynchronizerAutoConfiguration   implements InitializingBean {
 	private static final  Logger _logger = 
             LoggerFactory.getLogger(SynchronizerAutoConfiguration.class);

maxkey-webs/maxkey-gataway/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 #端口号
 application:
   name: maxkey-gateway-server
-  formatted-version: v3.5.6 GA
+  formatted-version: v3.5.7 GA
 server:
   port: 9000
 spring:

maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyConfig.java → maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyConfig.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -46,15 +46,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-@Configuration
+@AutoConfiguration
 @ComponentScan(basePackages = {
 		"org.maxkey.authn",
         "org.maxkey.configuration",

maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/MaxKeyMvcConfig.java → maxkey-webs/maxkey-web-maxkey/src/main/java/org/maxkey/autoconfigure/MaxKeyMvcConfig.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import java.util.List;
 
@@ -34,16 +34,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-@Configuration
 @EnableWebMvc
+@AutoConfiguration
 public class MaxKeyMvcConfig implements WebMvcConfigurer {
     private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMvcConfig.class);
    

maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring.factories

@@ -1,18 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.maxkey.autoconfigure.ApplicationAutoConfiguration,\
-org.maxkey.autoconfigure.MvcAutoConfiguration,\
-org.maxkey.autoconfigure.KaptchaAutoConfiguration,\
-org.maxkey.autoconfigure.RedisAutoConfiguration,\
-org.maxkey.autoconfigure.AuthnProviderAutoConfiguration,\
-org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration,\
-org.maxkey.autoconfigure.SessionAutoConfiguration,\
-org.maxkey.autoconfigure.TokenAutoConfiguration,\
-org.maxkey.autoconfigure.CasAutoConfiguration,\
-org.maxkey.autoconfigure.Oauth20AutoConfiguration,\
-org.maxkey.autoconfigure.Saml20AutoConfiguration,\
-org.maxkey.autoconfigure.SocialSignOnAutoConfiguration,\
-org.maxkey.autoconfigure.SwaggerConfig,\
-org.maxkey.MaxKeyMvcConfig
-
-

maxkey-webs/maxkey-web-maxkey/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,16 @@
+org.maxkey.autoconfigure.ApplicationAutoConfiguration
+org.maxkey.autoconfigure.MvcAutoConfiguration
+org.maxkey.autoconfigure.KaptchaAutoConfiguration
+org.maxkey.autoconfigure.RedisAutoConfiguration
+org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
+org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
+org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
+org.maxkey.autoconfigure.SessionAutoConfiguration
+org.maxkey.autoconfigure.TokenAutoConfiguration
+org.maxkey.autoconfigure.CasAutoConfiguration
+org.maxkey.autoconfigure.Oauth20AutoConfiguration
+org.maxkey.autoconfigure.Saml20AutoConfiguration
+org.maxkey.autoconfigure.SocialSignOnAutoConfiguration
+org.maxkey.autoconfigure.SwaggerConfig
+org.maxkey.autoconfigure.MaxKeyMvcConfig
+org.maxkey.autoconfigure.MaxKeyConfig

maxkey-webs/maxkey-web-maxkey/src/main/resources/application.properties

@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                           =MaxKey
-application.formatted-version               =v3.5.6 GA
+application.formatted-version               =v3.5.7 GA
 #for dynamic service discovery
 spring.application.name                     =maxkey
 ############################################################################

maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtConfig.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtConfig.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.password.onetimepwd.impl.TimeBasedOtpAuthn;
@@ -27,12 +27,12 @@ import org.maxkey.authn.realm.jdbc.JdbcAuthenticationRealm;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-@Configuration
+@AutoConfiguration
 public class MaxKeyMgtConfig  implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtConfig.class);
     

maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtListenerConfig.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtListenerConfig.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import org.maxkey.authn.session.SessionManager;
 import org.maxkey.configuration.ApplicationConfig;
@@ -33,11 +33,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-@Configuration
+@AutoConfiguration
 public class MaxKeyMgtListenerConfig  implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtListenerConfig.class);
  

maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtMvcConfig.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/MaxKeyMgtMvcConfig.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import java.util.List;
 
@@ -28,16 +28,16 @@ import org.maxkey.web.interceptor.RestApiPermissionAdapter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 
-@Configuration
 @EnableWebMvc
+@AutoConfiguration
 public class MaxKeyMgtMvcConfig implements WebMvcConfigurer {
     private static final  Logger _logger = LoggerFactory.getLogger(MaxKeyMgtMvcConfig.class);
     

maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/Oauth20ClientAutoConfiguration.java → maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/autoconfigure/Oauth20ClientAutoConfiguration.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey;
+package org.maxkey.autoconfigure;
 
 import javax.sql.DataSource;
 
@@ -30,8 +30,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.security.authentication.ProviderManager;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
@@ -42,7 +42,7 @@ import org.springframework.security.crypto.password.PasswordEncoder;
  * @author Crystal.Sea
  *
  */
-@Configuration
+@AutoConfiguration
 public class Oauth20ClientAutoConfiguration  implements InitializingBean {
     private static final  Logger _logger = LoggerFactory.getLogger(Oauth20ClientAutoConfiguration.class);
     

maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring.factories

@@ -1,17 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.maxkey.autoconfigure.ApplicationAutoConfiguration,\
-org.maxkey.autoconfigure.KaptchaAutoConfiguration,\
-org.maxkey.autoconfigure.MvcAutoConfiguration,\
-org.maxkey.autoconfigure.JwtAuthnAutoConfiguration,\
-org.maxkey.autoconfigure.RedisAutoConfiguration,\
-org.maxkey.autoconfigure.AuthnProviderAutoConfiguration,\
-org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration,\
-org.maxkey.autoconfigure.SessionAutoConfiguration,\
-org.maxkey.autoconfigure.TokenAutoConfiguration,\
-org.maxkey.synchronizer.autoconfigure.SynchronizerAutoConfiguration,\
-org.maxkey.autoconfigure.SwaggerConfig,\
-org.maxkey.Oauth20ClientAutoConfiguration,\
-org.maxkey.MaxKeyMgtConfig,\
-org.maxkey.MaxKeyMgtMvcConfig,\
-org.maxkey.MaxKeyMgtListenerConfig

maxkey-webs/maxkey-web-mgt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,15 @@
+org.maxkey.autoconfigure.ApplicationAutoConfiguration
+org.maxkey.autoconfigure.KaptchaAutoConfiguration
+org.maxkey.autoconfigure.MvcAutoConfiguration
+org.maxkey.autoconfigure.JwtAuthnAutoConfiguration
+org.maxkey.autoconfigure.RedisAutoConfiguration
+org.maxkey.autoconfigure.AuthnProviderAutoConfiguration
+org.maxkey.autoconfigure.OneTimePasswordAutoConfiguration
+org.maxkey.autoconfigure.SessionAutoConfiguration
+org.maxkey.autoconfigure.TokenAutoConfiguration
+org.maxkey.autoconfigure.SynchronizerAutoConfiguration
+org.maxkey.autoconfigure.SwaggerConfig
+org.maxkey.autoconfigure.Oauth20ClientAutoConfiguration
+org.maxkey.autoconfigure.MaxKeyMgtConfig
+org.maxkey.autoconfigure.MaxKeyMgtMvcConfig
+org.maxkey.autoconfigure.MaxKeyMgtListenerConfig

maxkey-webs/maxkey-web-mgt/src/main/resources/application.properties

@@ -16,7 +16,7 @@
 #MaxKey Title and Version                                                  #
 ############################################################################
 application.title                               =MaxKey-Mgt
-application.formatted-version                   =v3.5.6 GA
+application.formatted-version                   =v3.5.7 GA
 #for dynamic service discovery
 spring.application.name                         =maxkey-mgt
 ############################################################################