Disable JMS Autoconfiguration

Signed-off-by: Gerben Kroes <[email protected]>
OSGP · Mar 11, 2024 · 42b187f · 42b187f
1 parent 20af2db
commit 42b187f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/...ent/src/main/java/org/opensmartgridplatform/secretmanagement/application/Application.java b/...ent/src/main/java/org/opensmartgridplatform/secretmanagement/application/Application.java
@@ -15,6 +15,8 @@
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -26,7 +28,9 @@
     exclude = {
       SecurityAutoConfiguration.class,
       ManagementWebSecurityAutoConfiguration.class,
-      DataSourceAutoConfiguration.class
+      DataSourceAutoConfiguration.class,
+      ActiveMQAutoConfiguration.class,
+      ArtemisAutoConfiguration.class
     })
 @PropertySource("classpath:osgp-secret-management.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)

diff --git a/...vice/src/main/java/org/opensmartgridplatform/throttling/ThrottlingServiceApplication.java b/...vice/src/main/java/org/opensmartgridplatform/throttling/ThrottlingServiceApplication.java
@@ -13,13 +13,20 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration;
+import org.springframework.boot.autoconfigure.jms.artemis.ArtemisAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.PropertySource;
 
 @SpringBootApplication(
-    exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
+    exclude = {
+      SecurityAutoConfiguration.class,
+      ManagementWebSecurityAutoConfiguration.class,
+      ActiveMQAutoConfiguration.class,
+      ArtemisAutoConfiguration.class
+    })
 @PropertySource("classpath:osgp-throttling-service.properties")
 @PropertySource(value = "file:${osgp/Global/config}", ignoreResourceNotFound = true)
 @PropertySource(value = "file:${osgp/ThrottlingService/config}", ignoreResourceNotFound = true)

diff --git a/osgp/platform/osgp-throttling-service/src/main/resources/osgp-throttling-service.properties b/osgp/platform/osgp-throttling-service/src/main/resources/osgp-throttling-service.properties
@@ -13,8 +13,19 @@ spring.jpa.hibernate.naming.physical-strategy=org.opensmartgridplatform.shared.a
 spring.jpa.hibernate.naming.implicit-strategy=org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy
 spring.jpa.open-in-view=false
 
-# Spring Actuator setting to show health check details
-#management.endpoint.health.show-details=always
+##############################################################
+# Properties for Spring Boot Actuator                        #
+##############################################################
+management.endpoints.enabled-by-default=false
+management.endpoints.jmx.exposure.exclude=*
+management.endpoint.health.enabled=true
+management.endpoint.prometheus.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=health,prometheus
+management.security.enabled=false
+management.endpoint.beans.cache.time-to-live=10s
+management.endpoints.web.cors.allowed-origins=*
+management.endpoints.web.cors.allowed-methods=GET
 
 # Flyway Configuration
 spring.flyway.table=schema_version