Resolve merge conflicts

Author: NipuniBhagya

pom.xml

@@ -896,14 +896,6 @@
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.identity.server.api</groupId>
-                <artifactId>org.wso2.carbon.identity.api.credential.action.management.v1</artifactId>
-                <artifactId>org.wso2.carbon.identity.api.server.user.credential.management.common</artifactId>
-                <artifactId>org.wso2.carbon.identity.api.server.credential.management.common</artifactId>
-                <version>${project.version}</version>
-                <scope>provided</scope>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.notification.push</groupId>
                 <artifactId>org.wso2.carbon.identity.notification.push.device.handler</artifactId>
@@ -1022,12 +1014,12 @@
         <maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
         <org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
         <identity.governance.version>1.11.103</identity.governance.version>
-        <carbon.identity.framework.version>7.8.610</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.8.650</carbon.identity.framework.version>
         <maven.findbugsplugin.version>3.0.5</maven.findbugsplugin.version>
         <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
         <maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>
-        <identity.event.handler.version>1.9.48</identity.event.handler.version>
-        <identity.inbound.oauth2.version>7.0.350</identity.inbound.oauth2.version>
+        <identity.event.handler.version>1.9.75</identity.event.handler.version>
+        <identity.inbound.oauth2.version>7.0.409</identity.inbound.oauth2.version>
         <identity.inbound.saml2.version>5.11.51</identity.inbound.saml2.version>
         <identity.x509Certificate.validation.version>1.1.19</identity.x509Certificate.validation.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
@@ -1063,6 +1055,9 @@
         <org.wso2.carbon.identity.inbound.provisioning.scim2.version>3.4.146
         </org.wso2.carbon.identity.inbound.provisioning.scim2.version>
 
+        <!-- VC related versions -->
+        <carbon.identity.openid4vc.version>1.0.0</carbon.identity.openid4vc.version>
+
         <!-- Unit test versions -->
         <testng.version>6.9.10</testng.version>
         <mockito-core.version>4.6.1</mockito-core.version>
@@ -1115,8 +1110,6 @@
         <module>components/org.wso2.carbon.identity.api.server.asynchronous.operation.status.management</module>
         <module>components/org.wso2.carbon.identity.api.server.vc.template.management</module>
         <module>components/org.wso2.carbon.identity.api.server.credential.management</module>
-        <module>components/org.wso2.carbon.identity.api.server.user.credential.management</module>
-        <module>components/org.wso2.carbon.identity.api.server.credential.management</module>
     </modules>
 
 </project>