Fix broken OSGi wiring (flowable#3844)

pavelhoral · Feb 8, 2024 · a287d2a · a287d2a
1 parent f0864bc
commit a287d2a
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 3 deletions.
diff --git a/modules/flowable-batch-service/pom.xml b/modules/flowable-batch-service/pom.xml
@@ -89,6 +89,9 @@
 		<flowable.osgi.export.additional>
 			org.flowable.batch.service.db.mapping.entity
 		</flowable.osgi.export.additional>
+		<flowable.osgi.import.additional>
+			org.springframework*;resolution:=optional
+		</flowable.osgi.import.additional>
 	</properties>
 
 	<build>

diff --git a/modules/flowable-engine-common/pom.xml b/modules/flowable-engine-common/pom.xml
@@ -37,6 +37,7 @@
             org.flowable.common.db.properties,
         </flowable.osgi.export.additional>
         <flowable.osgi.import.additional>
+            org.apache.ibatis.javassist*;resolution:=optional,
             org.junit.jupiter.api*;resolution:=optional,
             org.springframework*;resolution:=optional,
             jakarta.transaction;resolution:=optional,

diff --git a/modules/flowable-entitylink-service/pom.xml b/modules/flowable-entitylink-service/pom.xml
@@ -94,6 +94,9 @@
 		<flowable.osgi.export.additional>
 			org.flowable.entitylink.service.db.mapping.entity
 		</flowable.osgi.export.additional>
+		<flowable.osgi.import.additional>
+			org.springframework*;resolution:=optional
+		</flowable.osgi.import.additional>
 	</properties>
 
 	<build>

diff --git a/modules/flowable-eventsubscription-service/pom.xml b/modules/flowable-eventsubscription-service/pom.xml
@@ -98,6 +98,9 @@
 		<flowable.osgi.export.additional>
 			org.flowable.eventsubscription.service.db.mapping.entity
 		</flowable.osgi.export.additional>
+		<flowable.osgi.import.additional>
+			org.springframework*;resolution:=optional
+		</flowable.osgi.import.additional>
 	</properties>
 
 	<build>

diff --git a/modules/flowable-identitylink-service/pom.xml b/modules/flowable-identitylink-service/pom.xml
@@ -94,6 +94,9 @@
 		<flowable.osgi.export.additional>
 			org.flowable.identitylink.service.db.mapping.entity
 		</flowable.osgi.export.additional>
+		<flowable.osgi.import.additional>
+			org.springframework*;resolution:=optional
+		</flowable.osgi.import.additional>
 	</properties>
 
 	<build>

diff --git a/modules/flowable-job-service/pom.xml b/modules/flowable-job-service/pom.xml
@@ -104,9 +104,10 @@
 		<flowable.osgi.export.additional>
 			org.flowable.job.service.db.mapping.entity
 		</flowable.osgi.export.additional>
-        <flowable.osgi.import.additional>
-            jakarta.enterprise.concurrent;resolution:=optional,
-        </flowable.osgi.import.additional>
+		<flowable.osgi.import.additional>
+			jakarta.enterprise.concurrent;resolution:=optional,
+			org.springframework*;resolution:=optional
+		</flowable.osgi.import.additional>
 	</properties>
 
 	<build>

diff --git a/modules/flowable-task-service/pom.xml b/modules/flowable-task-service/pom.xml
@@ -98,6 +98,9 @@
         <flowable.osgi.export.additional>
             org.flowable.task.service.db.mapping.entity
         </flowable.osgi.export.additional>
+        <flowable.osgi.import.additional>
+            org.springframework*;resolution:=optional
+        </flowable.osgi.import.additional>
     </properties>
 
     <build>

diff --git a/modules/flowable-variable-service/pom.xml b/modules/flowable-variable-service/pom.xml
@@ -96,6 +96,7 @@
         </flowable.osgi.export.additional>
         <flowable.osgi.import.additional>
             jakarta.persistence*;resolution:=optional,
+            org.springframework*;resolution:=optional
         </flowable.osgi.import.additional>
     </properties>