From fc4750868b6dca913762d2fc42a64b7ecfa7bac8 Mon Sep 17 00:00:00 2001
From: adibmbrk <adibmbrk@gmail.com>
Date: Wed, 13 Nov 2024 04:32:54 +0530
Subject: [PATCH] Fix dependency issues

---
 .../org.wso2.carbon.identity.xacml.server.feature/pom.xml | 8 ++++----
 pom.xml                                                   | 8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml b/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml
index cdbb915b1..a37056571 100644
--- a/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml
+++ b/features/xacml/org.wso2.carbon.identity.xacml.server.feature/pom.xml
@@ -117,7 +117,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.wso2.carbon.identity.framework</groupId>
+                                    <groupId>org.wso2.carbon.identity.application.authz.xacml</groupId>
                                     <artifactId>org.wso2.carbon.identity.entitlement.endpoint</artifactId>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
@@ -166,9 +166,9 @@
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.identity.saml.common.util:${saml.common.util.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.core:compatible:${carbon.kernel.feature.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.identity.core.server:compatible:${identity.framework.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${identity.framework.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.identity.notification.mgt.server:compatible:${identity.framework.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.identity.core.server:compatible:${carbon.identity.framework.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${carbon.identity.framework.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.identity.notification.mgt.server:compatible:${carbon.identity.framework.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index 12cd3f84c..ef976c1b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -268,7 +268,7 @@
             <dependency>
                 <groupId>org.wso2.carbon.identity.application.authz.xacml</groupId>
                 <artifactId>org.wso2.carbon.identity.entitlement.ui</artifactId>
-                <version>${project.version}}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -398,6 +398,11 @@
                 <artifactId>org.wso2.carbon.identity.entitlement.stub</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.orbit.jsr105</groupId>
+                <artifactId>jsr105</artifactId>
+                <version>${jsr105.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.axis2.wso2</groupId>
                 <artifactId>axis2-client</artifactId>
@@ -519,6 +524,7 @@
         <log4j.core.version>2.17.1</log4j.core.version>
         <commons-collections.version>3.2.2.wso2v1</commons-collections.version>
         <commons-lang.wso2.version>2.6.0.wso2v1</commons-lang.wso2.version>
+        <jsr105.version>1.0.1.wso2v1</jsr105.version>
 
         <com.fasterxml.jackson.version>2.16.1</com.fasterxml.jackson.version>
         <com.fasterxml.jackson.annotation.version>2.16.1</com.fasterxml.jackson.annotation.version>