diff --git a/pom.xml b/pom.xml
index 3006300..d3666ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,14 +65,6 @@
org.springframework.security
spring-security-web
-
- org.springframework.boot
- spring-boot-starter-oauth2-client
-
-
- org.springframework.boot
- spring-boot-starter-oauth2-resource-server
-
org.keycloak
keycloak-spring-boot-starter
@@ -139,6 +131,7 @@
jakarta.xml.bind
jakarta.xml.bind-api
+ 2.3.2
org.bouncycastle
diff --git a/src/main/java/dev/vality/wachter/config/SecurityConfig.java b/src/main/java/dev/vality/wachter/config/SecurityConfig.java
index 8556026..d3e4a91 100644
--- a/src/main/java/dev/vality/wachter/config/SecurityConfig.java
+++ b/src/main/java/dev/vality/wachter/config/SecurityConfig.java
@@ -17,9 +17,6 @@
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import static org.springframework.security.config.Customizer.withDefaults;
-
-
@Configuration
@ComponentScan(
basePackageClasses = KeycloakSecurityComponents.class,
@@ -43,10 +40,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
.requestMatchers(HttpMethod.GET, "/**/health/liveness").permitAll()
.requestMatchers(HttpMethod.GET, "/**/health/readiness").permitAll()
.requestMatchers(HttpMethod.GET, "/**/actuator/prometheus").permitAll()
- .anyRequest().authenticated())
- .oauth2Login(withDefaults())
- .oauth2Client(withDefaults())
- .oauth2ResourceServer(withDefaults());
+ .anyRequest().authenticated());
return http.build();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 32e0cab..e3ce2f7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,10 @@
server:
- port: '@server.port@'
+ port: '${server.port}'
management:
security:
flag: false
server:
- port: '@management.port@'
+ port: '${management.port}'
metrics:
tags:
application: '@project.name@'
diff --git a/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java b/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
index 9b25f5d..bfce61b 100644
--- a/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
+++ b/src/test/java/dev/vality/wachter/controller/ErrorControllerTest.java
@@ -5,7 +5,6 @@
import dev.vality.wachter.exeptions.WachterException;
import dev.vality.wachter.testutil.TMessageUtil;
import lombok.SneakyThrows;
-import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.thrift.protocol.TProtocolFactory;
import org.junit.jupiter.api.AfterEach;