<schema.uri.base.path>/aai</schema.uri.base.path>
<!-- versions -->
- <spring.boot.version>2.2.0.RELEASE</spring.boot.version>
- <spring.version>5.2.0.RELEASE</spring.version>
+ <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
+ <spring.version>5.2.15.RELEASE</spring.version>
<spring.test.version>${spring.version}</spring.test.version>
<spring.jms.version>${spring.version}</spring.jms.version>
<keycloak.version>11.0.2</keycloak.version>
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
@Configuration
public class JerseyConfiguration {
private boolean isEnabledByActiveProfiles(AnnotatedElement annotatedElement) {
boolean result = !annotatedElement.isAnnotationPresent(Profile.class)
- || environment.acceptsProfiles(annotatedElement.getAnnotation(Profile.class).value());
+ || environment.acceptsProfiles(Profiles.of(annotatedElement.getAnnotation(Profile.class).value()));
logger.debug("isEnabledByActiveProfiles: annotatedElement: " + annotatedElement.toString()
+ " result=" + result);
return result;
management.endpoints.enabled-by-default=true
#To Enable Actuator Endpoint, you can override this in OOM Charts
management.endpoints.web.exposure.include=info, health, prometheus
-management.metrics.web.server.auto-time-requests=false
+management.metrics.web.server.request.autotime.enabled=false
management.metrics.tags.group_id=aai
# management.metrics.tags.app_id=${info.build.artifact}
#Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.core.env.Environment;
+import org.springframework.core.env.Profiles;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
RestTemplate restTemplate = null;
- if (env.acceptsProfiles("one-way-ssl", "two-way-ssl")) {
+ if (env.acceptsProfiles(Profiles.of("one-way-ssl", "two-way-ssl"))) {
char[] trustStorePassword =
env.getProperty("server.ssl.trust-store-password").toCharArray();
char[] keyStorePassword =
String trustStore = env.getProperty("server.ssl.trust-store");
SSLContextBuilder sslContextBuilder = SSLContextBuilder.create();
- if (env.acceptsProfiles("two-way-ssl")) {
+ if (env.acceptsProfiles(Profiles.of("two-way-ssl"))) {
sslContextBuilder = sslContextBuilder
.loadKeyMaterial(loadPfx(keyStore, keyStorePassword), keyStorePassword);
}
spring.profiles.active=production,two-way-ssl
#The max number of active threads in this pool
-server.tomcat.max-threads=200
+server.tomcat.threads.max=200
#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
+server.tomcat.threads.min-spare=25
#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
server.tomcat.max-idle-time=60000
spring.profiles.active=production
#The max number of active threads in this pool
-server.tomcat.max-threads=200
+server.tomcat.threads.max=200
#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
+server.tomcat.threads.min-spare=25
#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
server.tomcat.max-idle-time=60000
management.server.port=0
management.endpoints.enabled-by-default=true
management.endpoints.web.exposure.include=info, health, prometheus
-management.metrics.web.server.auto-time-requests=false
+management.metrics.web.server.request.autotime.enabled=false
scrape.uri.metrics=true
\ No newline at end of file