Merge branch 'develop-java21' of https://github.com/mosip/registration …

…into MOSIP-32461
mosip · May 27, 2024 · 1b88d96 · 1b88d96
2 parents 8e6e649 + 6c65f8f
commit 1b88d96
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/registration-processor/init/registration-processor-registration-status-service/pom.xml b/registration-processor/init/registration-processor-registration-status-service/pom.xml
@@ -42,6 +42,12 @@
 					<groupId>io.springfox</groupId>
 					<artifactId>springfox-swagger2</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>
+						spring-boot-starter-activemq
+					</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

diff --git a/...ain/java/io/mosip/registration/processor/status/api/RegistrationStatusApiApplication.java b/...ain/java/io/mosip/registration/processor/status/api/RegistrationStatusApiApplication.java
@@ -35,7 +35,7 @@
 		excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = { RegistrationStatusServiceBeanConfig.class,
 				RestConfigBean.class, KafkaMosipEventBus.class, VertxMosipEventBus.class, StageHealthCheckHandler.class,
 				MosipVerticleManager.class, MosipVerticleAPIManager.class, MosipEventBus.class,
-				PropertyLoaderConfig.class }))
+				PropertyLoaderConfig.class, ActivemqConfigBean.class }))
 public class RegistrationStatusApiApplication
 {
     public static void main( String[] args )

diff --git a/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml b/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml
@@ -50,6 +50,12 @@
 					<groupId>io.springfox</groupId>
 					<artifactId>springfox-swagger2</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>
+						spring-boot-starter-activemq
+					</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>

diff --git a/...sip/registration/processor/transaction/api/RegistrationTransactionServiceApplication.java b/...sip/registration/processor/transaction/api/RegistrationTransactionServiceApplication.java
@@ -19,7 +19,7 @@
 		"io.mosip.registration.processor.transaction.*", "${mosip.auth.adapter.impl.basepackage}",
 		"io.mosip.registration.processor.core.kernel.beans" },
 		excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = { RestConfigBean.class,
-				PropertyLoaderConfig.class }))
+				PropertyLoaderConfig.class, ActivemqConfigBean.class }))
 public class RegistrationTransactionServiceApplication {
 
 	public static void main(String[] args) {