From eda288f6ca5e99f3f316ab00fc864777574db70c Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 19 Mar 2024 09:50:42 -0400
Subject: [PATCH] fully-qualified bean names to prevent conflicts with other
 extensions

---
 pom.xml                                                     | 5 +++++
 .../activiti/extension/conf/ModelShareComponentScanner.java | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f78edb5..6688f7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,11 @@
 					<groupId>org.alfresco.officeservices</groupId>
 					<artifactId>aoservices</artifactId>
 				</exclusion>
+				<!-- includes an old version of spring which just causes problems and we dont' need it for the build' -->
+				<exclusion>
+					<groupId>org.springframework.security.oauth</groupId>
+					<artifactId>spring-security-oauth2</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 	</dependencies>
diff --git a/src/main/java/com/activiti/extension/conf/ModelShareComponentScanner.java b/src/main/java/com/activiti/extension/conf/ModelShareComponentScanner.java
index 502bb51..9c7a040 100644
--- a/src/main/java/com/activiti/extension/conf/ModelShareComponentScanner.java
+++ b/src/main/java/com/activiti/extension/conf/ModelShareComponentScanner.java
@@ -16,6 +16,7 @@ package com.activiti.extension.conf;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FullyQualifiedAnnotationBeanNameGenerator;
 
 /**
  * A means for injecting packages to scan for the Spring context.
@@ -23,7 +24,10 @@ import org.springframework.context.annotation.Configuration;
  * @author brian@inteligr8.com
  */
 @Configuration
-@ComponentScan(basePackages = "com.inteligr8.alfresco.activiti.share")
+@ComponentScan(
+    basePackages = "com.inteligr8.alfresco.activiti.share",
+    nameGenerator = FullyQualifiedAnnotationBeanNameGenerator.class
+)
 public class ModelShareComponentScanner {
 
 }