From 7613039239060a2b17373fb1a325448267b67777 Mon Sep 17 00:00:00 2001
From: sahandilshan <sahandilshan222@gmail.com>
Date: Fri, 24 Jan 2025 17:38:36 +0530
Subject: [PATCH 01/15] Use default API contract for AI features

---
 .../management/v1/ApplicationsApi.java        |  8 +++----
 .../v1/LoginFlowGenerateRequest.java          |  8 +++----
 .../v1/LoginFlowGenerateResponse.java         |  2 +-
 .../v1/LoginFlowStatusResponse.java           |  2 +-
 .../src/main/resources/applications.yaml      | 24 +++++++++----------
 ...BrandingPreferenceManagementConstants.java |  4 ++++
 .../management/v1/BrandingPreferenceApi.java  | 18 +++++++-------
 .../model/BrandingGenerationRequestModel.java |  2 +-
 .../BrandingGenerationResponseModel.java      |  2 +-
 ...BrandingAIPreferenceManagementService.java | 13 +++++++---
 .../main/resources/branding-preference.yaml   |  5 ++--
 11 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
index d2d8d004ac..4d3cbcdeaf 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
@@ -754,7 +754,7 @@ public Response getInboundSAMLConfiguration(@ApiParam(value = "ID of the applica
 
     @Valid
     @GET
-    @Path("/loginflow/result/{operationId}")
+    @Path("/loginflow/result/{operation_id}")
     
     @Produces({ "application/json" })
     @ApiOperation(value = "Get the final login flow result", notes = "This API provides the capability to retrieve the final login flow result. <br> <b>Scope required:</b> * internal_application_mgt_update ", response = LoginFlowResultResponse.class, authorizations = {
@@ -770,14 +770,14 @@ public Response getInboundSAMLConfiguration(@ApiParam(value = "ID of the applica
         @ApiResponse(code = 403, message = "Forbidden", response = Error.class),
         @ApiResponse(code = 404, message = "Not Found", response = Error.class)
     })
-    public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true) @PathParam("operationId") String operationId) {
+    public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true) @PathParam("operation_id") String operationId) {
 
         return delegate.getLoginFlowGenerationResult(operationId );
     }
 
     @Valid
     @GET
-    @Path("/loginflow/status/{operationId}")
+    @Path("/loginflow/status/{operation_id}")
     
     @Produces({ "application/json" })
     @ApiOperation(value = "Get the status of the login flow generation process", notes = "This API provides the capability to retrieve the status of the login flow generation process. <br> <b>Scope required:</b> * internal_application_mgt_update ", response = LoginFlowStatusResponse.class, authorizations = {
@@ -793,7 +793,7 @@ public Response getLoginFlowGenerationResult(@ApiParam(value = "",required=true)
         @ApiResponse(code = 403, message = "Forbidden", response = Error.class),
         @ApiResponse(code = 404, message = "Not Found", response = Error.class)
     })
-    public Response getLoginFlowGenerationStatus(@ApiParam(value = "",required=true) @PathParam("operationId") String operationId) {
+    public Response getLoginFlowGenerationStatus(@ApiParam(value = "",required=true) @PathParam("operation_id") String operationId) {
 
         return delegate.getLoginFlowGenerationStatus(operationId );
     }
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java
index 3ceb355b72..fbae53083b 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateRequest.java
@@ -43,7 +43,7 @@ public class LoginFlowGenerateRequest  {
     private String userQuery;
 
     /**
-    * Available authenticators of the organization. It&#39;s expected to provide the authenticator name, description, and the IDP.
+    * Available authenticators of the organization. It&#39;s expected to provide the authenticator name, description, and the IDP. 
     **/
     public LoginFlowGenerateRequest availableAuthenticators(Map<String, Object> availableAuthenticators) {
 
@@ -52,7 +52,7 @@ public LoginFlowGenerateRequest availableAuthenticators(Map<String, Object> avai
     }
     
     @ApiModelProperty(value = "Available authenticators of the organization. It's expected to provide the authenticator name, description, and the IDP. ")
-    @JsonProperty("availableAuthenticators")
+    @JsonProperty("available_authenticators")
     @Valid
     public Map<String, Object> getAvailableAuthenticators() {
         return availableAuthenticators;
@@ -80,7 +80,7 @@ public LoginFlowGenerateRequest userClaims(List<Map<String, Object>> userClaims)
     }
     
     @ApiModelProperty(value = "Metadata of the available user claims for the organization.  Provide the claim URI and a human-readable description of the claim. ")
-    @JsonProperty("userClaims")
+    @JsonProperty("user_claims")
     @Valid
     public List<Map<String, Object>> getUserClaims() {
         return userClaims;
@@ -106,7 +106,7 @@ public LoginFlowGenerateRequest userQuery(String userQuery) {
     }
     
     @ApiModelProperty(value = "")
-    @JsonProperty("userQuery")
+    @JsonProperty("user_query")
     @Valid
     public String getUserQuery() {
         return userQuery;
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java
index e472181d05..248de2db52 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowGenerateResponse.java
@@ -43,7 +43,7 @@ public LoginFlowGenerateResponse operationId(String operationId) {
     }
     
     @ApiModelProperty(value = "")
-    @JsonProperty("operationId")
+    @JsonProperty("operation_id")
     @Valid
     public String getOperationId() {
         return operationId;
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java
index d91e53026b..fe48fbad6a 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/LoginFlowStatusResponse.java
@@ -44,7 +44,7 @@ public LoginFlowStatusResponse operationId(String operationId) {
     }
     
     @ApiModelProperty(value = "")
-    @JsonProperty("operationId")
+    @JsonProperty("operation_id")
     @Valid
     public String getOperationId() {
         return operationId;
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
index 57478ba6b2..88845186f9 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/applications.yaml
@@ -2671,7 +2671,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /applications/loginflow/status/{operationId}:
+  /applications/loginflow/status/{operation_id}:
     get:
       tags:
         - LoginFlow
@@ -2683,7 +2683,7 @@ paths:
         * internal_application_mgt_update
       operationId: getLoginFlowGenerationStatus
       parameters:
-        - name: operationId
+        - name: operation_id
           in: path
           required: true
           schema:
@@ -2720,7 +2720,7 @@ paths:
               schema:
                 $ref: '#/components/schemas/Error'
 
-  /applications/loginflow/result/{operationId}:
+  /applications/loginflow/result/{operation_id}:
     get:
       tags:
         - LoginFlow
@@ -2732,7 +2732,7 @@ paths:
         * internal_application_mgt_update
       operationId: getLoginFlowGenerationResult
       parameters:
-        - name: operationId
+        - name: operation_id
           in: path
           required: true
           schema:
@@ -4503,13 +4503,13 @@ components:
     LoginFlowGenerateRequest:
       type: object
       properties:
-        availableAuthenticators:
+        available_authenticators:
           type: object
           additionalProperties: true
           description: |
             Available authenticators of the organization.
             It's expected to provide the authenticator name, description, and the IDP.
-        userClaims:
+        user_claims:
           type: array
           items:
             type: object
@@ -4517,10 +4517,10 @@ components:
           description: |
             Metadata of the available user claims for the organization. 
             Provide the claim URI and a human-readable description of the claim.
-        userQuery:
+        user_query:
           type: string
       example: {
-        "availableAuthenticators": {
+        "available_authenticators": {
           "local": [
             {
               "description": "Login users with username and password credentials.",
@@ -4541,7 +4541,7 @@ components:
             }
           ]
         },
-        "userClaims": [
+        "user_claims": [
           {
             "claimURI": "http://example.com/claims/email",
             "description": "Email address of the user."
@@ -4551,12 +4551,12 @@ components:
             "description": "Role of the user in the application."
           }
         ],
-        "userQuery": "GoogleOIDCAuthenticator followed by SMS-OTP if user has admin role."
+        "user_query": "GoogleOIDCAuthenticator followed by SMS-OTP if user has admin role."
       }
     LoginFlowGenerateResponse:
       type: object
       properties:
-        operationId:
+        operation_id:
           type: string
     StatusEnum:
       type: string
@@ -4567,7 +4567,7 @@ components:
     LoginFlowStatusResponse:
       type: object
       properties:
-        operationId:
+        operation_id:
           type: string
         status:
           type: object
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java
index 332aa679ea..2f48750ac5 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/common/BrandingPreferenceManagementConstants.java
@@ -41,6 +41,10 @@ public class BrandingPreferenceManagementConstants {
     public static final String CUSTOM_TEXT_PREFERENCE_NOT_EXISTS_ERROR_CODE = "BRANDINGM_00023";
     public static final String CUSTOM_TEXT_PREFERENCE_ALREADY_EXISTS_ERROR_CODE = "BRANDINGM_00024";
 
+    // AI Constants.
+    public static final String AI_RESPONSE_DATA_KEY = "data";
+    public static final String AI_RESPONSE_STATUS_KEY = "status";
+
     /**
      * Enums for error messages.
      */
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/BrandingPreferenceApi.java b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/BrandingPreferenceApi.java
index fa887090d5..e0e327734b 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/BrandingPreferenceApi.java
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/BrandingPreferenceApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -156,10 +156,10 @@ public Response deleteCustomText(    @Valid@ApiParam(value = "Type to filter the
     @ApiOperation(value = "Generate branding preferences using AI based on the organization's website.", notes = "This API endpoint initiates the generation of a new set of branding preferences by leveraging AI to analyze the organization's website. This is typically used when an organization wants to create branding preferences using AI. The endpoint requires a website URL and generates matching branding details based on the website's properties.<br> <b>Scope(Permission) required:</b> `internal_branding_preference_update` ", response = BrandingGenerationResponseModel.class, authorizations = {
         @Authorization(value = "BasicAuth"),
         @Authorization(value = "OAuth2", scopes = {
-
+            
         })
     }, tags={ "Branding Preference", })
-    @ApiResponses(value = {
+    @ApiResponses(value = { 
         @ApiResponse(code = 202, message = "Branding generation process started", response = BrandingGenerationResponseModel.class),
         @ApiResponse(code = 400, message = "Invalid input in the request.", response = Error.class),
         @ApiResponse(code = 401, message = "Unauthorized", response = Error.class),
@@ -174,15 +174,15 @@ public Response generateBrandingPreference(@ApiParam(value = "This represents th
     @Valid
     @GET
     @Path("/result/{operationId}")
-
+    
     @Produces({ "application/json" })
     @ApiOperation(value = "Return the result of a branding generation operation.", notes = "This API endpoint returns the result of an AI branding generation operation for a given operation ID. Depending on the operation status, the response may include an error message or the generated branding preferences.<br/> ", response = BrandingGenerationResultModel.class, authorizations = {
         @Authorization(value = "BasicAuth"),
         @Authorization(value = "OAuth2", scopes = {
-
+            
         })
     }, tags={ "Branding Preference", })
-    @ApiResponses(value = {
+    @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "OK", response = BrandingGenerationResultModel.class),
         @ApiResponse(code = 400, message = "Invalid input in the request.", response = Error.class),
         @ApiResponse(code = 401, message = "Unauthorized", response = Error.class),
@@ -198,15 +198,15 @@ public Response getBrandingGenerationResult(@ApiParam(value = "The unique identi
     @Valid
     @GET
     @Path("/status/{operationId}")
-
+    
     @Produces({ "application/json" })
     @ApiOperation(value = "Get the status of a branding generation operation.", notes = "This API endpoint returns the status of the AI branding generation process that initiated using the `/generate` endpoint.<br/> ", response = BrandingGenerationStatusModel.class, authorizations = {
         @Authorization(value = "BasicAuth"),
         @Authorization(value = "OAuth2", scopes = {
-
+            
         })
     }, tags={ "Branding Preference", })
-    @ApiResponses(value = {
+    @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "OK", response = BrandingGenerationStatusModel.class),
         @ApiResponse(code = 400, message = "Invalid input in the request.", response = Error.class),
         @ApiResponse(code = 401, message = "Unauthorized", response = Error.class),
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationRequestModel.java b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationRequestModel.java
index 3de1b48f08..f9a2f07221 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationRequestModel.java
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationRequestModel.java
@@ -44,7 +44,7 @@ public BrandingGenerationRequestModel websiteUrl(String websiteUrl) {
     }
     
     @ApiModelProperty(example = "https://wso2.com/", value = "URL of the organization's website.")
-    @JsonProperty("websiteUrl")
+    @JsonProperty("website_url")
     @Valid
     public String getWebsiteUrl() {
         return websiteUrl;
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationResponseModel.java b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationResponseModel.java
index 53a9cdabd5..2d74659d04 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationResponseModel.java
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/model/BrandingGenerationResponseModel.java
@@ -44,7 +44,7 @@ public BrandingGenerationResponseModel operationId(String operationId) {
     }
     
     @ApiModelProperty(value = "Operation id of the initiated branding generation process.")
-    @JsonProperty("operationId")
+    @JsonProperty("operation_id")
     @Valid
     public String getOperationId() {
         return operationId;
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/core/BrandingAIPreferenceManagementService.java b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/core/BrandingAIPreferenceManagementService.java
index 920556c372..0ec8e08155 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/core/BrandingAIPreferenceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/java/org/wso2/carbon/identity/api/server/branding/preference/management/v1/core/BrandingAIPreferenceManagementService.java
@@ -36,6 +36,8 @@
 
 import javax.ws.rs.core.Response;
 
+import static org.wso2.carbon.identity.api.server.branding.preference.management.common.BrandingPreferenceManagementConstants.AI_RESPONSE_DATA_KEY;
+import static org.wso2.carbon.identity.api.server.branding.preference.management.common.BrandingPreferenceManagementConstants.AI_RESPONSE_STATUS_KEY;
 import static org.wso2.carbon.identity.api.server.branding.preference.management.common.BrandingPreferenceManagementConstants.ErrorMessage.ERROR_CODE_ERROR_GETTING_BRANDING_RESULT;
 import static org.wso2.carbon.identity.api.server.branding.preference.management.common.BrandingPreferenceManagementConstants.ErrorMessage.ERROR_CODE_ERROR_GETTING_BRANDING_RESULT_STATUS;
 import static org.wso2.carbon.identity.api.server.branding.preference.management.common.BrandingPreferenceManagementConstants.ErrorMessage.ERROR_WHILE_CONVERTING_BRANDING_AI_SERVER_RESPONSE;
@@ -81,7 +83,12 @@ public BrandingGenerationStatusModel getBrandingPreferenceGenerationStatus(Strin
             Object generationStatus = BrandingPreferenceServiceHolder.getBrandingPreferenceAiManager()
                     .getBrandingPreferenceGenerationStatus(operationId);
             BrandingGenerationStatusModel response = new BrandingGenerationStatusModel();
-            response.setStatus(convertObjectToMap(generationStatus));
+            Map<String, Object> generationStatusMap = convertObjectToMap(generationStatus);
+            if (!generationStatusMap.containsKey(AI_RESPONSE_STATUS_KEY)) {
+                throw new AIServerException(ERROR_CODE_ERROR_GETTING_BRANDING_RESULT_STATUS.getMessage(),
+                        ERROR_CODE_ERROR_GETTING_BRANDING_RESULT_STATUS.getCode());
+            }
+            response.setStatus(generationStatusMap.get(AI_RESPONSE_STATUS_KEY));
             return response;
         } catch (AIServerException e) {
             throw handleServerException(e);
@@ -106,12 +113,12 @@ public BrandingGenerationResultModel getBrandingPreferenceGenerationResult(Strin
             Map<String, Object> resultMap = convertObjectToMap(generationResult);
             response.setStatus(getStatusFromResult(resultMap));
 
-            if (!resultMap.containsKey("data")) {
+            if (!resultMap.containsKey(AI_RESPONSE_DATA_KEY)) {
                 throw new AIServerException(ERROR_CODE_ERROR_GETTING_BRANDING_RESULT_STATUS.getMessage(),
                         ERROR_CODE_ERROR_GETTING_BRANDING_RESULT_STATUS.getCode());
             }
 
-            Map<String, Object> dataMap = (Map<String, Object>) resultMap.get("data");
+            Map<String, Object> dataMap = (Map<String, Object>) resultMap.get(AI_RESPONSE_DATA_KEY);
             response.setData(dataMap);
             return response;
         } catch (AIServerException e) {
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/resources/branding-preference.yaml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/resources/branding-preference.yaml
index 651cfa6529..67bdd935ea 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/resources/branding-preference.yaml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/src/main/resources/branding-preference.yaml
@@ -535,7 +535,6 @@ components:
         type: string
       example: "945fa326-bf78-45f6-bfda-c9644650b821"
 
-
   schemas:
     BrandingPreferenceModel:
       required:
@@ -594,14 +593,14 @@ components:
     BrandingGenerationRequestModel:
       type: object
       properties:
-        websiteUrl:
+        website_url:
           type: string
           description: URL of the organization's website.
           example: "https://wso2.com/"
     BrandingGenerationResponseModel:
       type: object
       properties:
-        operationId:
+        operation_id:
           type: string
           description: Operation id of the initiated branding generation process.
     BrandingGenerationStatusModel:

From 00a50f8e909741508901827bc5fc1b4c950445fd Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 10:40:09 +0530
Subject: [PATCH 02/15] [Spring Cleanup] Remove Spring dependencies in the
 tenant management API (#809)

* [Spring Cleanup] Remove Spring dependencies in the tenant management API
---
 .../pom.xml                                   | 23 ++++----
 .../common/TenantManagementServiceHolder.java | 43 +++++++-------
 .../RealmServiceOSGIServiceFactory.java       | 53 ------------------
 .../factory/TenantMgtOSGIServiceFactory.java  | 52 -----------------
 .../pom.xml                                   | 23 ++++----
 .../v1/ChannelVerifiedTenantsApi.java         | 10 +++-
 .../tenant/management/v1/TenantsApi.java      | 25 ++++++---
 ...annelVerifiedTenantsApiServiceFactory.java | 12 +++-
 .../factories/TenantsApiServiceFactory.java   | 12 +++-
 .../core/ServerTenantManagementService.java   | 55 +++++++++---------
 .../ServerTenantManagementServiceFactory.java | 56 +++++++++++++++++++
 .../ChannelVerifiedTenantsApiServiceImpl.java | 44 +++++++++------
 .../v1/impl/TenantsApiServiceImpl.java        | 13 ++++-
 .../cxf/tenant-management-server-v1-cxf.xml   | 37 ------------
 14 files changed, 206 insertions(+), 252 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/RealmServiceOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/TenantMgtOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ServerTenantManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/resources/META-INF/cxf/tenant-management-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index aaec293848..39282065ac 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -44,11 +46,6 @@
             <artifactId>org.wso2.carbon.user.api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.user.core</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/TenantManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/TenantManagementServiceHolder.java
index 336f822078..440069ec97 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/TenantManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/TenantManagementServiceHolder.java
@@ -15,8 +15,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.wso2.carbon.identity.api.server.tenant.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.tenant.mgt.services.TenantMgtService;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -25,46 +27,39 @@
  */
 public class TenantManagementServiceHolder {
 
-    private static TenantMgtService tenantMgtService;
-    private static RealmService realmService;
+    private TenantManagementServiceHolder() {
 
-    /**
-     * Get TenantMgtService osgi service.
-     *
-     * @return TenantMgtService
-     */
-    public static TenantMgtService getTenantMgtService() {
+    }
 
-        return tenantMgtService;
+    private static class TenantMgtServiceHolder {
+
+        static final TenantMgtService SERVICE = (TenantMgtService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(TenantMgtService.class, null);
     }
 
-    /**
-     * Set TenantMgtService osgi service.
-     *
-     * @param tenantMgtService TenantMgtService.
-     */
-    public static void setTenantMgtService(TenantMgtService tenantMgtService) {
+    private static class RealmServiceHolder {
 
-        TenantManagementServiceHolder.tenantMgtService = tenantMgtService;
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
     }
 
     /**
-     * Get RealmService osgi service.
+     * Get TenantMgtService osgi service.
      *
-     * @return RealmService
+     * @return TenantMgtService.
      */
-    public static RealmService getRealmService() {
+    public static TenantMgtService getTenantMgtService() {
 
-        return realmService;
+        return TenantMgtServiceHolder.SERVICE;
     }
 
     /**
-     * Set RealmService osgi service.
+     * Get RealmService osgi service.
      *
-     * @param realmService RealmService.
+     * @return RealmService.
      */
-    public static void setRealmService(RealmService realmService) {
+    public static RealmService getRealmService() {
 
-        TenantManagementServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index e321492313..0000000000
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.identity.api.server.tenant.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService = (RealmService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService service.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/TenantMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/TenantMgtOSGIServiceFactory.java
deleted file mode 100644
index 73ff922708..0000000000
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/common/factory/TenantMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wso2.carbon.identity.api.server.tenant.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.tenant.mgt.services.TenantMgtService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the TenantMgtService type of object inside the container.
- */
-public class TenantMgtOSGIServiceFactory extends AbstractFactoryBean<TenantMgtService> {
-
-    private TenantMgtService tenantMgtService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected TenantMgtService createInstance() throws Exception {
-
-        TenantMgtService tenantMgtService = null;
-        if (this.tenantMgtService == null) {
-            tenantMgtService = (TenantMgtService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext().getOSGiService(TenantMgtService.class,
-                            null);
-            if (tenantMgtService != null) {
-                this.tenantMgtService = tenantMgtService;
-            } else {
-                throw new Exception("Unable to get the TenantMgtService");
-            }
-        }
-        return this.tenantMgtService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index cb512fde08..f833fdac42 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -104,11 +106,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/ChannelVerifiedTenantsApi.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/ChannelVerifiedTenantsApi.java
index b468d2adaa..fc0ccc7d7a 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/ChannelVerifiedTenantsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/ChannelVerifiedTenantsApi.java
@@ -24,7 +24,7 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.api.server.tenant.management.v1.factories.ChannelVerifiedTenantsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.ChannelVerifiedTenantModel;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.Error;
 
@@ -40,8 +40,12 @@
 
 public class ChannelVerifiedTenantsApi  {
 
-    @Autowired
-    private ChannelVerifiedTenantsApiService delegate;
+    private final ChannelVerifiedTenantsApiService delegate;
+
+    public ChannelVerifiedTenantsApi() {
+
+        this.delegate = ChannelVerifiedTenantsApiServiceFactory.getChannelVerifiedTenantsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/TenantsApi.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/TenantsApi.java
index bf77e72cd4..4053439ab9 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/TenantsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/TenantsApi.java
@@ -24,7 +24,12 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import java.io.InputStream;
+import java.util.List;
+
+import org.wso2.carbon.identity.api.server.tenant.management.v1.factories.TenantsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.OwnerInfoResponse;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.OwnerPutModel;
@@ -53,8 +58,12 @@
 
 public class TenantsApi  {
 
-    @Autowired
-    private TenantsApiService delegate;
+    private final TenantsApiService delegate;
+
+    public TenantsApi() {
+
+        this.delegate = TenantsApiServiceFactory.getTenantsApi();
+    }
 
     @Valid
     @POST
@@ -108,15 +117,15 @@ public Response deleteTenantMetadata(@ApiParam(value = "tenant id",required=true
     @Valid
     @GET
     @Path("/{tenant-id}/owners/{owner-id}")
-    
+
     @Produces({ "application/json" })
     @ApiOperation(value = "Retrieve tenant owner.", notes = "Retrieve the tenant owner identified by the provided tenant id and owner id.  <b>Permission required:</b> * /permission/protected/manage/monitor/tenants/list  <b>scope required:</b> * internal_list_tenants ", response = OwnerInfoResponse.class, authorizations = {
         @Authorization(value = "BasicAuth"),
         @Authorization(value = "OAuth2", scopes = {
-            
+
         })
     }, tags={ "Tenants", })
-    @ApiResponses(value = { 
+    @ApiResponses(value = {
         @ApiResponse(code = 200, message = "OK", response = OwnerInfoResponse.class),
         @ApiResponse(code = 400, message = "Invalid Input Request", response = Error.class),
         @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
@@ -257,10 +266,10 @@ public Response retrieveTenants(    @Valid @Min(0)@ApiParam(value = "Maximum num
     @ApiOperation(value = "Update tenant owner.", notes = "This API provides the capability to update the tenant owner.  <b>Permission required:</b> * /permission/protected/manage/modify/tenants  <b>scope required:</b> * internal_modify_tenants ", response = Void.class, authorizations = {
         @Authorization(value = "BasicAuth"),
         @Authorization(value = "OAuth2", scopes = {
-            
+
         })
     }, tags={ "Tenants", })
-    @ApiResponses(value = { 
+    @ApiResponses(value = {
         @ApiResponse(code = 200, message = "Successful", response = Void.class),
         @ApiResponse(code = 206, message = "Partial Content", response = Error.class),
         @ApiResponse(code = 400, message = "Invalid Input Request", response = Error.class),
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ChannelVerifiedTenantsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ChannelVerifiedTenantsApiServiceFactory.java
index 7dec970f02..d88a1fca3c 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ChannelVerifiedTenantsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ChannelVerifiedTenantsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.tenant.management.v1.ChannelVerifiedTenantsApiService;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.impl.ChannelVerifiedTenantsApiServiceImpl;
 
+/**
+ * Factory class for ChannelVerifiedTenantsApiService.
+ */
 public class ChannelVerifiedTenantsApiServiceFactory {
 
-   private final static ChannelVerifiedTenantsApiService service = new ChannelVerifiedTenantsApiServiceImpl();
+   private final static ChannelVerifiedTenantsApiService SERVICE = new ChannelVerifiedTenantsApiServiceImpl();
 
+   /**
+    * Get ChannelVerifiedTenantsApiService.
+    *
+    * @return ChannelVerifiedTenantsApiService.
+    */
    public static ChannelVerifiedTenantsApiService getChannelVerifiedTenantsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/TenantsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/TenantsApiServiceFactory.java
index 1f8c29dcdf..dcb0f65e14 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/TenantsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/TenantsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.tenant.management.v1.TenantsApiService;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.impl.TenantsApiServiceImpl;
 
+/**
+ * Factory class for TenantsApiService.
+ */
 public class TenantsApiServiceFactory {
 
-   private final static TenantsApiService service = new TenantsApiServiceImpl();
+   private final static TenantsApiService SERVICE = new TenantsApiServiceImpl();
 
+   /**
+    * Get TenantsApiService.
+    *
+    * @return TenantsApiService.
+    */
    public static TenantsApiService getTenantsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/core/ServerTenantManagementService.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/core/ServerTenantManagementService.java
index 37c5ebcb44..30a0259473 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/core/ServerTenantManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/core/ServerTenantManagementService.java
@@ -1,18 +1,21 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.wso2.carbon.identity.api.server.tenant.management.v1.core;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -23,7 +26,6 @@
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementConstants;
-import org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.AdditionalClaims;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.ChannelVerifiedTenantModel;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.LifeCycleStatus;
@@ -72,7 +74,6 @@
 import static org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementConstants.TENANT_MANAGEMENT_PATH_COMPONENT;
 import static org.wso2.carbon.stratos.common.constants.TenantConstants.ErrorMessage.ERROR_CODE_INVALID_EMAIL;
 import static org.wso2.carbon.stratos.common.constants.TenantConstants.ErrorMessage.ERROR_CODE_MISSING_REQUIRED_PARAMETER;
-
 import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 
 /**
@@ -80,12 +81,21 @@
  */
 public class ServerTenantManagementService {
 
+    private final TenantMgtService tenantMgtService;
+    private final RealmService realmService;
+
     private static final Log log = LogFactory.getLog(ServerTenantManagementService.class);
     private static final String VERIFIED_LITE_USER = "verified-lite-user";
     private static final String INLINE_PASSWORD = "inline-password";
     private static final String CODE = "code";
     private static final String PURPOSE = "purpose";
 
+    public ServerTenantManagementService(TenantMgtService tenantMgtService, RealmService realmService) {
+
+        this.tenantMgtService = tenantMgtService;
+        this.realmService = realmService;
+    }
+
     /**
      * Add a tenant.
      *
@@ -95,7 +105,6 @@ public class ServerTenantManagementService {
     public String addTenant(TenantModel tenantModel) {
 
         String resourceId;
-        TenantMgtService tenantMgtService = TenantManagementServiceHolder.getTenantMgtService();
         try {
             Tenant tenant = createTenantInfoBean(tenantModel);
             resourceId = tenantMgtService.addTenant(tenant);
@@ -119,8 +128,6 @@ public String addTenant(TenantModel tenantModel) {
     public TenantsListResponse listTenants(Integer limit, Integer offset, String sortOrder, String sortBy,
                                            String filter) {
 
-        TenantMgtService tenantMgtService = TenantManagementServiceHolder.getTenantMgtService();
-
         try {
             TenantSearchResult tenantSearchResult = tenantMgtService.listTenants(limit, offset, sortOrder, sortBy,
                     filter);
@@ -140,7 +147,7 @@ public TenantsListResponse listTenants(Integer limit, Integer offset, String sor
     public TenantResponseModel getTenant(String tenantUniqueID) {
 
         try {
-            Tenant tenant = TenantManagementServiceHolder.getTenantMgtService().getTenant(tenantUniqueID);
+            Tenant tenant = tenantMgtService.getTenant(tenantUniqueID);
             return createTenantResponse(tenant);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
@@ -157,7 +164,7 @@ public TenantResponseModel getTenant(String tenantUniqueID) {
     public TenantResponseModel getTenantByDomain(String domain) {
 
         try {
-            Tenant tenant = TenantManagementServiceHolder.getTenantMgtService().getTenantByDomain(domain);
+            Tenant tenant = tenantMgtService.getTenantByDomain(domain);
             return createTenantResponse(tenant);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
@@ -174,7 +181,7 @@ public TenantResponseModel getTenantByDomain(String domain) {
     public boolean isDomainAvailable(String tenantDomain) {
 
         try {
-            return TenantManagementServiceHolder.getTenantMgtService().isDomainAvailable(tenantDomain);
+            return tenantMgtService.isDomainAvailable(tenantDomain);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
                     ERROR_CODE_ERROR_RETRIEVING_TENANT, tenantDomain);
@@ -190,7 +197,7 @@ public boolean isDomainAvailable(String tenantDomain) {
     public List<OwnerResponse> getOwners(String tenantUniqueID) {
 
         try {
-            User user = TenantManagementServiceHolder.getTenantMgtService().getOwner(tenantUniqueID);
+            User user = tenantMgtService.getOwner(tenantUniqueID);
             return createOwnerResponse(user);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
@@ -201,7 +208,7 @@ public List<OwnerResponse> getOwners(String tenantUniqueID) {
     public OwnerInfoResponse getOwner(String tenantUniqueID, String ownerID, String additionalClaims) {
 
         try {
-            Tenant tenant = TenantManagementServiceHolder.getTenantMgtService().getTenant(tenantUniqueID);
+            Tenant tenant = tenantMgtService.getTenant(tenantUniqueID);
             validateTenantOwnerId(tenant, ownerID);
 
             String[] claimsList = StringUtils.split(additionalClaims, ",");
@@ -215,12 +222,12 @@ public OwnerInfoResponse getOwner(String tenantUniqueID, String ownerID, String
     public void updateOwner(String tenantUniqueID, String ownerID, OwnerPutModel ownerPutModel) {
 
         try {
-            Tenant tenant = TenantManagementServiceHolder.getTenantMgtService().getTenant(tenantUniqueID);
+            Tenant tenant = tenantMgtService.getTenant(tenantUniqueID);
             validateTenantOwnerId(tenant, ownerID);
 
             createTenantInfoBean(tenant, ownerPutModel);
 
-            TenantManagementServiceHolder.getTenantMgtService().updateOwner(tenant);
+            tenantMgtService.updateOwner(tenant);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
                     ERROR_CODE_ERROR_UPDATING_OWNER, tenantUniqueID);
@@ -235,7 +242,7 @@ public void updateOwner(String tenantUniqueID, String ownerID, OwnerPutModel own
     public void deleteTenantMetadata(String tenantUniqueID) {
 
         try {
-            TenantManagementServiceHolder.getTenantMgtService().deleteTenantMetaData(tenantUniqueID);
+            tenantMgtService.deleteTenantMetaData(tenantUniqueID);
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
                     ERROR_CODE_DELETE_TENANT_METADATA, tenantUniqueID);
@@ -254,9 +261,9 @@ public String updateTenantStatus(String tenantUniqueID, TenantPutModel tenantPut
         boolean activated = tenantPutModel.getActivated();
         try {
             if (activated) {
-                TenantManagementServiceHolder.getTenantMgtService().activateTenant(tenantUniqueID);
+                tenantMgtService.activateTenant(tenantUniqueID);
             } else {
-                TenantManagementServiceHolder.getTenantMgtService().deactivateTenant(tenantUniqueID);
+                tenantMgtService.deactivateTenant(tenantUniqueID);
             }
         } catch (TenantMgtException e) {
             throw handleTenantManagementException(e, TenantManagementConstants.ErrorMessage.
@@ -306,7 +313,6 @@ private void validateTenantOwnerId(Tenant tenant, String ownerID) {
 
     private OwnerInfoResponse createOwnerInfoResponse(Tenant tenant, String[] claimsList) throws TenantMgtException {
 
-        RealmService realmService = TenantManagementServiceHolder.getRealmService();
         OwnerInfoResponse ownerInfoResponse = new OwnerInfoResponse();
         ownerInfoResponse.setId(tenant.getAdminUserId());
         ownerInfoResponse.setUsername(tenant.getAdminName());
@@ -606,7 +612,6 @@ private static String includeData(TenantManagementConstants.ErrorMessage error,
 
     public String addTenant(ChannelVerifiedTenantModel channelVerifiedTenantModel) {
         String resourceId;
-        TenantMgtService tenantMgtService = TenantManagementServiceHolder.getTenantMgtService();
         try {
             validateInputAgainstCode(channelVerifiedTenantModel);
             Tenant tenant = createTenantInfoBean(channelVerifiedTenantModel);
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ServerTenantManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ServerTenantManagementServiceFactory.java
new file mode 100644
index 0000000000..e470aed24a
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/factories/ServerTenantManagementServiceFactory.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.tenant.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.tenant.management.v1.core.ServerTenantManagementService;
+import org.wso2.carbon.tenant.mgt.services.TenantMgtService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for ServerTenantManagementService.
+ */
+public class ServerTenantManagementServiceFactory {
+
+    private static final ServerTenantManagementService SERVICE;
+
+    static {
+        TenantMgtService tenantMgtService = TenantManagementServiceHolder.getTenantMgtService();
+        RealmService realmService = TenantManagementServiceHolder.getRealmService();
+
+        if (tenantMgtService == null) {
+            throw new IllegalStateException("TenantMgtService is not available from OSGi context.");
+        }
+        if (realmService == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        SERVICE = new ServerTenantManagementService(tenantMgtService, realmService);
+    }
+
+    /**
+     * Get ServerTenantManagementService.
+     *
+     * @return ServerTenantManagementService.
+     */
+    public static ServerTenantManagementService getServerTenantManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/ChannelVerifiedTenantsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/ChannelVerifiedTenantsApiServiceImpl.java
index 369de7ef39..162abb1c21 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/ChannelVerifiedTenantsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/ChannelVerifiedTenantsApiServiceImpl.java
@@ -1,30 +1,33 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.tenant.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.common.Constants;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementConstants;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.ChannelVerifiedTenantsApiService;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.core.ServerTenantManagementService;
+import org.wso2.carbon.identity.api.server.tenant.management.v1.factories.ServerTenantManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.ChannelVerifiedTenantModel;
 
 import java.net.URI;
+
 import javax.ws.rs.core.Response;
 
 /**
@@ -32,8 +35,15 @@
  */
 public class ChannelVerifiedTenantsApiServiceImpl implements ChannelVerifiedTenantsApiService {
 
-    @Autowired
-    private ServerTenantManagementService tenantManagementService;
+    private final ServerTenantManagementService tenantManagementService;
+
+    public ChannelVerifiedTenantsApiServiceImpl() {
+        try {
+            this.tenantManagementService = ServerTenantManagementServiceFactory.getServerTenantManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerTenantManagementService.", e);
+        }
+    }
 
     @Override
     public Response addChannelVerifiedTenant(ChannelVerifiedTenantModel channelVerifiedTenantModel) {
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/TenantsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/TenantsApiServiceImpl.java
index 542bd0140f..fb55b2a6fe 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/TenantsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/java/org/wso2/carbon/identity/api/server/tenant/management/v1/impl/TenantsApiServiceImpl.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.api.server.tenant.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.common.Constants;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementConstants;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.TenantsApiService;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.core.ServerTenantManagementService;
+import org.wso2.carbon.identity.api.server.tenant.management.v1.factories.ServerTenantManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.OwnerPutModel;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.TenantModel;
 import org.wso2.carbon.identity.api.server.tenant.management.v1.model.TenantPutModel;
@@ -37,8 +37,15 @@
  */
 public class TenantsApiServiceImpl implements TenantsApiService {
 
-    @Autowired
-    private ServerTenantManagementService tenantManagementService;
+    private final ServerTenantManagementService tenantManagementService;
+
+    public TenantsApiServiceImpl() {
+        try {
+            this.tenantManagementService = ServerTenantManagementServiceFactory.getServerTenantManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerTenantManagementService.", e);
+        }
+    }
 
     @Override
     public Response addTenant(TenantModel tenantModel) {
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/resources/META-INF/cxf/tenant-management-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/resources/META-INF/cxf/tenant-management-server-v1-cxf.xml
deleted file mode 100644
index 23eabc8c31..0000000000
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/src/main/resources/META-INF/cxf/tenant-management-server-v1-cxf.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.tenant.management.v1.core.ServerTenantManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.tenant.management.v1.impl.TenantsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.tenant.management.v1.impl.ChannelVerifiedTenantsApiServiceImpl"/>
-    <bean id="tenantManagerHolderBean"
-          class="org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementServiceHolder">
-        <property name="tenantMgtService" ref="tenantManagerFactoryBean"/>
-    </bean>
-    <bean id="realmServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.tenant.management.common.TenantManagementServiceHolder">
-        <property name="realmService" ref="realmServiceFactoryBean"/>
-    </bean>
-
-    <bean id="realmServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.tenant.management.common.factory.RealmServiceOSGIServiceFactory"/>
-    <bean id="tenantManagerFactoryBean"
-          class="org.wso2.carbon.identity.api.server.tenant.management.common.factory.TenantMgtOSGIServiceFactory"/>
-</beans>

From 15fd1c11722a76af8e989a87b43abb671ef1397b Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 05:20:47 +0000
Subject: [PATCH 03/15] [WSO2 Release] [Jenkins #1266] [Release 1.3.46] prepare
 release v1.3.46

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 2bedc4369f..2b043dc3a5 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 38e0d93136..032dbce55d 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index bd96776fa8..ce3b39249b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 169d001239..20cc55e870 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 72447ef999..2e5931ae34 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index ab2ebd09bf..aa660cd53a 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index cf68eaf5d1..43a6859254 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index af69f7ca2d..00a56aa8fa 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index f23fb2b6b4..67d2fa3c2d 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index e643306737..00da03f509 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 71facbd4c3..26cc654f89 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 749734f9b7..4396c5d3ef 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 816f68ded9..e406b70c5b 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index eecbe65945..d4291ab2b9 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 01b533ea21..41640461d0 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 7ace138d46..df4a2f00ed 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.46</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index a639442964..aff9a835bc 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.46</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index fedc5185c9..3241c8a0c9 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.46</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 1d920b94d4..0f80dc46c2 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 000ffdb4fd..4593e9c4e7 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index d10e032946..e0af13c252 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 02df3193bd..eff56ddc4b 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index cad671aaa9..b27edff2c1 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index f0ff70bdcf..c373bdeedc 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 7cd277a0b8..12526cad0e 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index c774c755ef..8eb54c3ecd 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 0f9a8ee98b..f4891f1061 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index c0369b7e83..da50e431a0 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index d82427bf9a..77a692cf31 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index a236ad6c88..b3220484d0 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 9acc1b27c2..9d9d205157 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index edec7bbd83..e50f0d355a 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 9d5ed3fdb1..2a6764df80 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index d4d2d51e18..a19bb5c3b4 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 64db205c08..15486db873 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index de42781797..12253ecdc5 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 9297bdbdcc..c98a29e227 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index cecca029bf..9e6b30ba57 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index c731356770..c9cd888a91 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 080c5b9d1c..815a342eec 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 9d3bff880b..87d93c2822 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 69a55ec09c..242f466a9d 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 9ff34d05e7..77324b2a5f 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 1513935068..66105e804f 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index c18a52340f..a259abb9cb 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 97f2077ccc..7ef373db26 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 587ec2d737..ca7e8b3acb 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 6757242525..7bdc0b0d7e 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index d0ef3c1484..dffd4b4bae 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 01bcbc9f5e..ecaedd5345 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 07eb27a0fd..9db08212e7 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 8a89816f5b..c325a5aba1 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.46</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 0c6b89daec..558b673511 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 1eee52852e..6599616ea5 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 4c52a37d2c..f371f4b9d3 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index ba58fcfbb5..bb563e6ea6 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index f4bc706716..90abacf036 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index b16f2aea77..5e9b98aecf 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 4921bf65a2..a9a4d40e4e 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 81284b5f26..958bc48b51 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index a560ec08ca..b0785b49b5 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index 538d1ab3d2..b8c76bdac8 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index fa56ba220f..90c6e6184b 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 483aebdc9b..eeb24737ee 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 1013330c36..92f57de668 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index 22bb7e6a09..7d678854ed 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index 4c4c00bc4f..de263bd707 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 55d2c5eebf..dbbdcef8af 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 9bd94e3bcb..149ddbbf49 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index fe295df801..5b088dbdd6 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index cc71ea09c0..37314e9574 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 5916abb2f4..e593ac8b76 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 06fdd480de..8a46eb05ec 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 5cc4bf2eea..cbde416560 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index d9adea2da5..6cc809bbdd 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 2d4fd7605b..1990ee34d8 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 5b7ce875bd..892eb2a33a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index ce2d21c09f..b300f792fa 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index d83fcd182a..11d8ec3cab 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 812ddf0b9d..6df3a36d4a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 301f47571d..dc52283e3f 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 4f06b7ea39..a269438868 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 315738d5a2..49d9fa0794 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index e8610affd2..591de074b4 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index 146efa1357..31f4cf0bff 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 4322f4a777..1ba632def8 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 57573a793f..cfa98b90f5 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 911f86b46e..c644915d70 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index d5454b16d3..7cfe0b52fe 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 9b753b569b..431cd63097 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 1ad3eee82a..78e73a4bce 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index f3e8e133e8..d9a89a82dc 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 39282065ac..e75e892478 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index f833fdac42..2e071e8547 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 9f498ded0a..8415d1a924 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 5e4b5bb137..bf6e831fb9 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 7e30eb8aaa..56fe2920c7 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 40855c7d03..d6374bdd88 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46-SNAPSHOT</version>
+        <version>1.3.46</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index e58b133514..9f981f1dd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.46-SNAPSHOT</version>
+    <version>1.3.46</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.3.46</tag>
     </scm>
 
 

From 10550f58a813d0061038f6fec7d91569880c0fd7 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 05:20:49 +0000
Subject: [PATCH 04/15] [WSO2 Release] [Jenkins #1266] [Release 1.3.46] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 2b043dc3a5..8beec0a89b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 032dbce55d..463f884a5e 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index ce3b39249b..e8eb10910e 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 20cc55e870..b314d15a3f 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 2e5931ae34..8494ada74c 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index aa660cd53a..bdaade7811 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index 43a6859254..8b68c88b55 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index 00a56aa8fa..5d85088564 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index 67d2fa3c2d..bd6869e611 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 00da03f509..4513e6344d 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 26cc654f89..0664fc1a55 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 4396c5d3ef..735b9dd04a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index e406b70c5b..6141e3899e 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index d4291ab2b9..67628e5aaa 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 41640461d0..8a69f72f2d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index df4a2f00ed..707377beca 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.46</version>
+    <version>1.3.47-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index aff9a835bc..bd81f05c77 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.46</version>
+    <version>1.3.47-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 3241c8a0c9..42db9643de 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.46</version>
+    <version>1.3.47-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 0f80dc46c2..96c90b7b97 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 4593e9c4e7..e14da002cf 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index e0af13c252..8d80a5a42c 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index eff56ddc4b..4dd688e955 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index b27edff2c1..aedd1caadb 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index c373bdeedc..f244a62d6e 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 12526cad0e..de90caf9e3 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 8eb54c3ecd..88a26bdc87 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index f4891f1061..814fa621f7 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index da50e431a0..5089ce461a 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 77a692cf31..f6bbe5ae13 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index b3220484d0..f64990d471 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 9d9d205157..7b87ff1e58 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index e50f0d355a..ea048c3c68 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 2a6764df80..63300268fa 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index a19bb5c3b4..03b348f880 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 15486db873..417e5aea29 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 12253ecdc5..1fd324a743 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index c98a29e227..50900810dc 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 9e6b30ba57..c1149e6d2c 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index c9cd888a91..7d5a07d5f9 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 815a342eec..e8978e69a1 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 87d93c2822..74afea25de 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 242f466a9d..e140e69426 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 77324b2a5f..d26e13831a 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 66105e804f..19559b635b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index a259abb9cb..7fc8e95b68 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 7ef373db26..002ea471d9 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index ca7e8b3acb..ccfd482261 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 7bdc0b0d7e..121b3d6b30 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index dffd4b4bae..77b2b4526d 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index ecaedd5345..7bbfdbc7c7 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 9db08212e7..11a450c7ad 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index c325a5aba1..783719ed93 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.46</version>
+    <version>1.3.47-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 558b673511..6db49b6157 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 6599616ea5..c465026c11 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index f371f4b9d3..5d0db19fee 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index bb563e6ea6..f60f6cd2f7 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 90abacf036..ffa243673e 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 5e9b98aecf..209c857856 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index a9a4d40e4e..037fae90af 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 958bc48b51..9151d636b6 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index b0785b49b5..9f32da979f 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index b8c76bdac8..07deb6306e 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 90c6e6184b..55e3d0dc4a 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index eeb24737ee..5f5e7e4371 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 92f57de668..4995170c93 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index 7d678854ed..ab4bd38388 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index de263bd707..db477eb27c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index dbbdcef8af..2b614c9026 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 149ddbbf49..48a1c6f723 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 5b088dbdd6..410386d352 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 37314e9574..d484cf16d1 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index e593ac8b76..d75cfa3ecb 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 8a46eb05ec..c1c42e0c60 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index cbde416560..b433c6eb0d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 6cc809bbdd..19f29b8a82 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 1990ee34d8..72cd3fde99 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 892eb2a33a..c5bbeb8964 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index b300f792fa..38ec1ef5d2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 11d8ec3cab..3b798a2df2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 6df3a36d4a..6f5ca0a2c4 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index dc52283e3f..215253bc9e 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index a269438868..c964c9f1b8 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 49d9fa0794..cef1d5ae06 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 591de074b4..9abb4a902f 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index 31f4cf0bff..69a241cde5 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 1ba632def8..15ffd378d2 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index cfa98b90f5..47028b09df 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index c644915d70..5d33b75582 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 7cfe0b52fe..c7b5501849 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 431cd63097..0b7b8de655 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 78e73a4bce..42d8e0eefd 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index d9a89a82dc..57b05fc6bc 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index e75e892478..61ac538493 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 2e071e8547..c244c4873a 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 8415d1a924..dcd3fc138c 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index bf6e831fb9..2ebe38f776 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 56fe2920c7..87828d2bd9 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index d6374bdd88..9156d9cc00 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.46</version>
+        <version>1.3.47-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 9f981f1dd9..fb9d419102 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.46</version>
+    <version>1.3.47-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.3.46</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From 970037201fe0aa2f6fd2112a1284c5b918ee2876 Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:26:26 +0530
Subject: [PATCH 05/15] [Spring Cleanup] Remove Spring dependencies in the
 secret management API (#810)

---
 .../pom.xml                                   |  9 +--
 .../common/SecretManagementServiceHolder.java | 28 +++++----
 .../factory/SecretMgtOSGiServiceFactory.java  | 58 -------------------
 .../pom.xml                                   |  9 +--
 .../secret/management/v1/SecretTypeApi.java   | 29 ++++++----
 .../secret/management/v1/SecretsApi.java      | 41 +++++++------
 .../SecretTypeApiServiceFactory.java          | 46 +++++++++------
 .../factories/SecretsApiServiceFactory.java   | 46 +++++++++------
 .../v1/core/SecretManagementService.java      | 43 ++++++++------
 .../v1/core/SecretTypeManagementService.java  | 35 ++++++-----
 .../SecretManagementServiceFactory.java       | 52 +++++++++++++++++
 .../SecretTypeManagementServiceFactory.java   | 52 +++++++++++++++++
 .../v1/impl/SecretTypeApiServiceImpl.java     | 37 +++++++-----
 .../v1/impl/SecretsApiServiceImpl.java        | 33 +++++++----
 .../cxf/secret-management-server-v1-cxf.xml   | 27 ---------
 15 files changed, 310 insertions(+), 235 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/factory/SecretMgtOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretManagementServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/resources/META-INF/cxf/secret-management-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 0b7b8de655..368164e2c3 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+  ~ Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -52,11 +52,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/SecretManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/SecretManagementServiceHolder.java
index 43b6ae43b2..c2c7ab0672 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/SecretManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/SecretManagementServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.secret.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
 
 /**
@@ -25,26 +26,23 @@
  */
 public class SecretManagementServiceHolder {
 
-    private static SecretManager secretConfigManager;
+    private SecretManagementServiceHolder() {
 
-    /**
-     * Get SecretManager OSGi service.
-     *
-     * @return secretConfig manager.
-     */
-    public static SecretManager getSecretConfigManager() {
+    }
+
+    private static class SecretManagerServiceHolder {
 
-        return secretConfigManager;
+        static final SecretManager SERVICE = (SecretManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(SecretManager.class, null);
     }
 
     /**
-     * Set SecretManager OSGi service.
+     * Get SecretManager OSGi service.
      *
-     * @param secretConfigManager Secret Manager.
+     * @return secretConfig manager.
      */
-    public static void setSecretConfigManager(SecretManager secretConfigManager) {
+    public static SecretManager getSecretConfigManager() {
 
-        SecretManagementServiceHolder.secretConfigManager = secretConfigManager;
+        return SecretManagerServiceHolder.SERVICE;
     }
-
 }
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/factory/SecretMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/factory/SecretMgtOSGiServiceFactory.java
deleted file mode 100644
index 6f28a78bf5..0000000000
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/src/main/java/org/wso2/carbon/identity/api/server/secret/management/common/factory/SecretMgtOSGiServiceFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-
-/*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.secret.management.common.factory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
-
-/**
- * Service holder class for secret management.
- */
-public class SecretMgtOSGiServiceFactory extends AbstractFactoryBean<SecretManager> {
-
-    private SecretManager secretManager;
-    private static final Log log = LogFactory.getLog(SecretMgtOSGiServiceFactory.class);
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected SecretManager createInstance() throws Exception {
-
-        if (this.secretManager == null) {
-
-            SecretManager secretManager = (SecretManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(SecretManager.class, null);
-
-            if (secretManager != null) {
-                this.secretManager = secretManager;
-            } else {
-                throw new Exception("Unable to retrieve SecretManager service.");
-            }
-        }
-        return this.secretManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 42d8e0eefd..386f324529 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+  ~ Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -104,11 +104,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretTypeApi.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretTypeApi.java
index b8d932288e..6bf70672a2 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretTypeApi.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretTypeApi.java
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretTypeApiServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeAddRequest;
@@ -35,8 +36,12 @@
 
 public class SecretTypeApi {
 
-    @Autowired
-    private SecretTypeApiService delegate;
+    private final SecretTypeApiService delegate;
+
+    public SecretTypeApi() {
+
+        this.delegate = SecretTypeApiServiceFactory.getSecretTypeApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretsApi.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretsApi.java
index 926afcb36d..d9247dd27b 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/SecretsApi.java
@@ -1,23 +1,24 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretPatchRequest;
@@ -35,8 +36,12 @@
 
 public class SecretsApi  {
 
-    @Autowired
-    private SecretsApiService delegate;
+    private final SecretsApiService delegate;
+
+    public SecretsApi() {
+
+        this.delegate = SecretsApiServiceFactory.getSecretsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeApiServiceFactory.java
index 1487411b05..bebdf026ac 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.factories;
 
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretTypeApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretTypeApiServiceImpl;
 
+/**
+ * Factory class for SecretTypeApiService.
+ */
 public class SecretTypeApiServiceFactory {
 
-   private final static SecretTypeApiService service = new SecretTypeApiServiceImpl();
+   private static final SecretTypeApiService SERVICE = new SecretTypeApiServiceImpl();
 
-   public static SecretTypeApiService getSecretTypeApi()
-   {
-      return service;
+   /**
+    * Get SecretTypeApiService.
+    *
+    * @return SecretTypeApiService.
+    */
+   public static SecretTypeApiService getSecretTypeApi() {
+
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretsApiServiceFactory.java
index d5df11ff82..9374668fee 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretsApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.factories;
 
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretsApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretsApiServiceImpl;
 
+/**
+ * Factory class for SecretsApiService.
+ */
 public class SecretsApiServiceFactory {
 
-   private final static SecretsApiService service = new SecretsApiServiceImpl();
+   private static final SecretsApiService SERVICE = new SecretsApiServiceImpl();
 
-   public static SecretsApiService getSecretsApi()
-   {
-      return service;
+   /**
+    * Get SecretsApiService.
+    *
+    * @return SecretsApiService.
+    */
+   public static SecretsApiService getSecretsApi() {
+
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretManagementService.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretManagementService.java
index 74c4052da6..150915d72b 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretManagementService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.core;
@@ -22,11 +24,11 @@
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementConstants;
-import org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretPatchRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretUpdateRequest;
+import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementClientException;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementException;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementServerException;
@@ -35,6 +37,7 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.secret.mgt.core.constant.SecretConstants.ErrorMessages.ERROR_CODE_SECRET_ALREADY_EXISTS;
@@ -45,8 +48,14 @@
  */
 public class SecretManagementService {
 
+    private final SecretManager secretManager;
     private static final Log log = LogFactory.getLog(SecretManagementService.class);
 
+    public SecretManagementService(SecretManager secretManager) {
+
+        this.secretManager = secretManager;
+    }
+
     /**
      * Create a secret.
      *
@@ -60,7 +69,7 @@ public SecretResponse addSecret(String secretType, SecretAddRequest secretAddReq
         Secret requestDTO, responseDTO;
         try {
             requestDTO = buildSecretRequestDTOFromSecretAddRequest(secretAddRequest);
-            responseDTO = SecretManagementServiceHolder.getSecretConfigManager().addSecret(secretType, requestDTO);
+            responseDTO = secretManager.addSecret(secretType, requestDTO);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.ERROR_CODE_ERROR_ADDING_SECRET,
                     secretAddRequest.getName());
@@ -128,7 +137,7 @@ private Secret buildSecretRequestDTOFromSecretAddRequest(SecretAddRequest secret
     public void deleteSecret(String secretType, String name) {
 
         try {
-            SecretManagementServiceHolder.getSecretConfigManager().deleteSecret(secretType, name);
+            secretManager.deleteSecret(secretType, name);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.
                     ERROR_CODE_ERROR_DELETING_SECRET, name);
@@ -145,7 +154,7 @@ public void deleteSecret(String secretType, String name) {
     public SecretResponse getSecret(String secretType, String name) {
 
         try {
-            Secret responseDTO = SecretManagementServiceHolder.getSecretConfigManager().getSecret(secretType, name);
+            Secret responseDTO = secretManager.getSecret(secretType, name);
             SecretResponse secretResponse = new SecretResponse();
             secretResponse.secretName(responseDTO.getSecretName());
             secretResponse.setCreated(responseDTO.getCreatedTime());
@@ -169,7 +178,7 @@ public SecretResponse getSecret(String secretType, String name) {
     public List<SecretResponse> getSecretsList(String secretType) {
 
         try {
-            Secrets secrets = SecretManagementServiceHolder.getSecretConfigManager().getSecrets(secretType);
+            Secrets secrets = secretManager.getSecrets(secretType);
             List<Secret> secretsList = secrets.getSecrets();
             return secretsList.stream().map(secret ->
                     buildSecretResponseFromResponseDTO(secret)).collect(Collectors.toList());
@@ -191,7 +200,7 @@ public SecretResponse patchSecret(String secretType, String name, SecretPatchReq
 
         Secret secret, responseDTO;
         try {
-            secret = SecretManagementServiceHolder.getSecretConfigManager().getSecret(secretType, name);
+            secret = secretManager.getSecret(secretType, name);
             if (secret == null) {
                 throw handleException(Response.Status.NOT_FOUND, SecretManagementConstants.ErrorMessage.
                         ERROR_CODE_SECRET_NOT_FOUND, name);
@@ -201,11 +210,11 @@ public SecretResponse patchSecret(String secretType, String name, SecretPatchReq
             // Only the Replace operation supported with PATCH request.
             if (SecretPatchRequest.OperationEnum.REPLACE.equals(operation)) {
                 if (SecretManagementConstants.VALUE_PATH.equals(path)) {
-                    responseDTO = SecretManagementServiceHolder.getSecretConfigManager().updateSecretValue(secretType,
+                    responseDTO = secretManager.updateSecretValue(secretType,
                             name, secretPatchRequest.getValue());
 
                 } else if (SecretManagementConstants.DESCRIPTION_PATH.equals(path)) {
-                    responseDTO = SecretManagementServiceHolder.getSecretConfigManager().updateSecretDescription
+                    responseDTO = secretManager.updateSecretDescription
                             (secretType, name, secretPatchRequest.getValue());
                 } else {
                     throw handleException(Response.Status.BAD_REQUEST, SecretManagementConstants.ErrorMessage
@@ -238,7 +247,7 @@ public SecretResponse updateSecret(String secretType, String name, SecretUpdateR
         SecretAddRequest secretAddRequest = buildSecretAddFromSecretUpdateRequest(name, secretUpdateRequest);
         try {
             requestDTO = buildSecretRequestDTOFromSecretAddRequest(secretAddRequest);
-            responseDTO = SecretManagementServiceHolder.getSecretConfigManager().replaceSecret(secretType, requestDTO);
+            responseDTO = secretManager.replaceSecret(secretType, requestDTO);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.ERROR_CODE_ERROR_UPDATING_SECRET,
                     name);
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretTypeManagementService.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretTypeManagementService.java
index 70b0a6d784..6b05f8abf7 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretTypeManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/core/SecretTypeManagementService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.core;
@@ -22,10 +24,10 @@
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementConstants;
-import org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeUpdateRequest;
+import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementClientException;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementException;
 import org.wso2.carbon.identity.secret.mgt.core.exception.SecretManagementServerException;
@@ -41,8 +43,14 @@
  */
 public class SecretTypeManagementService {
 
+    private final SecretManager secretManager;
     private static final Log log = LogFactory.getLog(SecretManagementService.class);
 
+    public SecretTypeManagementService(SecretManager secretManager) {
+
+        this.secretManager = secretManager;
+    }
+
     /**
      * Create a secret Type.
      *
@@ -55,7 +63,7 @@ public SecretTypeResponse addSecretType(SecretTypeAddRequest secretTypeAddReques
         SecretType requestDTO, responseDTO;
         try {
             requestDTO = buildSecretTypeRequestDTOFromSecretTypeAddRequest(secretTypeAddRequest);
-            responseDTO = SecretManagementServiceHolder.getSecretConfigManager().addSecretType(requestDTO);
+            responseDTO = secretManager.addSecretType(requestDTO);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.ERROR_CODE_ERROR_ADDING_SECRET,
                     secretTypeAddRequest.getName());
@@ -114,7 +122,7 @@ private SecretType buildSecretTypeRequestDTOFromSecretTypeAddRequest(SecretTypeA
     public void deleteSecretType(String secretTypeName) {
 
         try {
-            SecretManagementServiceHolder.getSecretConfigManager().deleteSecretType(secretTypeName);
+            secretManager.deleteSecretType(secretTypeName);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.
                     ERROR_CODE_ERROR_DELETING_SECRET, secretTypeName);
@@ -130,8 +138,7 @@ public void deleteSecretType(String secretTypeName) {
     public SecretTypeResponse getSecretType(String secretTypeName) {
 
         try {
-            SecretType responseDTO = SecretManagementServiceHolder.getSecretConfigManager().getSecretType
-                    (secretTypeName);
+            SecretType responseDTO = secretManager.getSecretType(secretTypeName);
             SecretTypeResponse secretTypeResponse = new SecretTypeResponse();
             secretTypeResponse.setId(responseDTO.getId());
             secretTypeResponse.setName(responseDTO.getName());
@@ -156,7 +163,7 @@ public SecretTypeResponse updateTypeSecret(String name, SecretTypeUpdateRequest
         SecretTypeAddRequest secretAdd = buildSecretTypeAddFromSecretTypeUpdateRequest(name, secretUpdateRequest);
         try {
             requestDTO = buildSecretTypeRequestDTOFromSecretTypeAddRequest(secretAdd);
-            responseDTO = SecretManagementServiceHolder.getSecretConfigManager().replaceSecretType(requestDTO);
+            responseDTO = secretManager.replaceSecretType(requestDTO);
         } catch (SecretManagementException e) {
             throw handleSecretMgtException(e, SecretManagementConstants.ErrorMessage.ERROR_CODE_ERROR_UPDATING_SECRET,
                     name);
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretManagementServiceFactory.java
new file mode 100644
index 0000000000..e21bd9f6dd
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretManagementServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.secret.management.v1.factories;
+
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretManagementService;
+import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
+
+/**
+ * Factory class for SecretManagementService.
+ */
+public class SecretManagementServiceFactory {
+
+    private static final SecretManagementService SERVICE;
+
+    static {
+        SecretManager secretManager = (SecretManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(SecretManager.class, null);
+
+        if (secretManager == null) {
+            throw new IllegalStateException("SecretManager is not available from OSGi context.");
+        }
+
+        SERVICE = new SecretManagementService(secretManager);
+    }
+
+    /**
+     * Get SecretManagementService.
+     *
+     * @return SecretManagementService.
+     */
+    public static SecretManagementService getSecretManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeManagementServiceFactory.java
new file mode 100644
index 0000000000..f3385d5f87
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/factories/SecretTypeManagementServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.secret.management.v1.factories;
+
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretTypeManagementService;
+import org.wso2.carbon.identity.secret.mgt.core.SecretManager;
+
+/**
+ * Factory class for SecretTypeManagementService.
+ */
+public class SecretTypeManagementServiceFactory {
+
+    private static final SecretTypeManagementService SERVICE;
+
+    static {
+        SecretManager secretManager = (SecretManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(SecretManager.class, null);
+
+        if (secretManager == null) {
+            throw new IllegalStateException("SecretManager is not available from OSGi context.");
+        }
+
+        SERVICE = new SecretTypeManagementService(secretManager);
+    }
+
+    /**
+     * Get SecretTypeManagementService.
+     *
+     * @return SecretTypeManagementService.
+     */
+    public static SecretTypeManagementService getSecretTypeManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretTypeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretTypeApiServiceImpl.java
index 3d427db68d..d278cb529c 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretTypeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretTypeApiServiceImpl.java
@@ -1,30 +1,33 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretTypeApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretTypeManagementService;
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretTypeManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretTypeUpdateRequest;
 
 import java.net.URI;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementConstants.SECRET_TYPE_CONTEXT_PATH;
@@ -35,8 +38,16 @@
  */
 public class SecretTypeApiServiceImpl implements SecretTypeApiService {
 
-    @Autowired
-    private SecretTypeManagementService secretTypeManagementService;
+    private final SecretTypeManagementService secretTypeManagementService;
+
+    public SecretTypeApiServiceImpl() {
+
+        try {
+            this.secretTypeManagementService = SecretTypeManagementServiceFactory.getSecretTypeManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating SecretTypeManagementService.", e);
+        }
+    }
 
     @Override
     public Response createSecretType(SecretTypeAddRequest secretTypeAddRequest) {
@@ -63,7 +74,7 @@ public Response getSecretType(String name) {
     @Override
     public Response updateSecretType(String name, SecretTypeUpdateRequest secretTypeUpdateRequest) {
 
-        return Response.ok()
-                .entity(secretTypeManagementService.updateTypeSecret(name, secretTypeUpdateRequest)).build();
+        return Response.ok().entity(secretTypeManagementService
+                .updateTypeSecret(name, secretTypeUpdateRequest)).build();
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretsApiServiceImpl.java
index cb0d593c67..c3db8edf91 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/java/org/wso2/carbon/identity/api/server/secret/management/v1/impl/SecretsApiServiceImpl.java
@@ -1,31 +1,34 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * Copyright (c) 2021-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.secret.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.secret.management.v1.SecretsApiService;
 import org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretManagementService;
+import org.wso2.carbon.identity.api.server.secret.management.v1.factories.SecretManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretAddRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretPatchRequest;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretResponse;
 import org.wso2.carbon.identity.api.server.secret.management.v1.model.SecretUpdateRequest;
 
 import java.net.URI;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementConstants.SECRET_CONTEXT_PATH;
@@ -36,8 +39,16 @@
  */
 public class SecretsApiServiceImpl implements SecretsApiService {
 
-    @Autowired
-    private SecretManagementService secretManagementService;
+    private final SecretManagementService secretManagementService;
+
+    public SecretsApiServiceImpl() {
+
+        try {
+            this.secretManagementService = SecretManagementServiceFactory.getSecretManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating SecretManagementService.", e);
+        }
+    }
 
     @Override
     public Response createSecret(String secretType, SecretAddRequest secretAddRequest) {
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/resources/META-INF/cxf/secret-management-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/resources/META-INF/cxf/secret-management-server-v1-cxf.xml
deleted file mode 100644
index 2a3fbbc7fa..0000000000
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/src/main/resources/META-INF/cxf/secret-management-server-v1-cxf.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.secret.management.v1.core.SecretTypeManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.secret.management.v1.impl.SecretTypeApiServiceImpl"/>
-    <bean id="secretManagerFactoryBean" class="org.wso2.carbon.identity.api.server.secret.management.common.factory.SecretMgtOSGiServiceFactory"/>
-    <bean id="SecretServiceImplDataHolderBean" class="org.wso2.carbon.identity.api.server.secret.management.common.SecretManagementServiceHolder">
-        <property name="secretConfigManager" ref="secretManagerFactoryBean"/>
-    </bean>
-</beans>

From b7de3f460cd46ab9ca762238d6d76d157427a5be Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:26:48 +0530
Subject: [PATCH 06/15] [Spring Cleanup] Remove Spring dependencies in the
 script library (#812)

---
 .../pom.xml                                   |  9 +--
 .../common/ScriptLibraryServiceHolder.java    | 38 +++++++------
 .../factory/ScriptLibraryMgtOSGIService.java  | 57 -------------------
 .../pom.xml                                   |  9 +--
 .../script/library/v1/ScriptLibrariesApi.java | 29 ++++++----
 .../ScriptLibrariesApiServiceFactory.java     | 46 +++++++++------
 .../v1/core/ServerScriptLibrariesService.java | 45 ++++++++-------
 .../ServerScriptLibrariesServiceFactory.java  | 52 +++++++++++++++++
 .../impl/ScriptLibrariesApiServiceImpl.java   | 32 +++++++----
 .../cxf/script-libraries-server-v1-cxf.xml    | 29 ----------
 10 files changed, 168 insertions(+), 178 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/factory/ScriptLibraryMgtOSGIService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ServerScriptLibrariesServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/resources/META-INF/cxf/script-libraries-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 47028b09df..96355e3807 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -29,11 +29,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
             <artifactId>org.wso2.carbon.identity.oauth</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/ScriptLibraryServiceHolder.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/ScriptLibraryServiceHolder.java
index 7ea88dc06c..e39ca66752 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/ScriptLibraryServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/ScriptLibraryServiceHolder.java
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.script.library.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.functions.library.mgt.FunctionLibraryManagementService;
 
 /**
@@ -23,7 +26,16 @@
  */
 public class ScriptLibraryServiceHolder {
 
-    private static FunctionLibraryManagementService scriptLibaryManagementService;
+    private ScriptLibraryServiceHolder() {
+
+    }
+
+    private static class FunctionLibraryManagementServiceHolder {
+
+        static final FunctionLibraryManagementService SERVICE =
+                (FunctionLibraryManagementService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(FunctionLibraryManagementService.class, null);
+    }
 
     /**
      * Get FunctionLibraryManagementService osgi service.
@@ -32,12 +44,6 @@ public class ScriptLibraryServiceHolder {
      */
     public static FunctionLibraryManagementService getScriptLibraryManagementService() {
 
-        return scriptLibaryManagementService;
-    }
-
-    public static void setScriptLibraryManagementService(
-            FunctionLibraryManagementService scriptLibraryManagementService) {
-
-        ScriptLibraryServiceHolder.scriptLibaryManagementService = scriptLibraryManagementService;
+        return FunctionLibraryManagementServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/factory/ScriptLibraryMgtOSGIService.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/factory/ScriptLibraryMgtOSGIService.java
deleted file mode 100644
index 37da6e9fb6..0000000000
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/src/main/java/org/wso2/carbon/identity/api/server/script/library/common/factory/ScriptLibraryMgtOSGIService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.script.library.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.functions.library.mgt.FunctionLibraryManagementService;
-
-import java.util.Hashtable;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the FunctionLibraryManagementService type of object inside the container.
- */
-public class ScriptLibraryMgtOSGIService extends AbstractFactoryBean<FunctionLibraryManagementService> {
-
-    private FunctionLibraryManagementService functionLibraryManagementService;
-
-    public ScriptLibraryMgtOSGIService() {
-
-    }
-
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    protected FunctionLibraryManagementService createInstance() throws Exception {
-
-        if (this.functionLibraryManagementService == null) {
-            FunctionLibraryManagementService taskOperationService =
-                    (FunctionLibraryManagementService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(FunctionLibraryManagementService.class, (Hashtable) null);
-            if (taskOperationService == null) {
-                throw new Exception("Unable to retrieve Function Library Management Service.");
-            }
-
-            this.functionLibraryManagementService = taskOperationService;
-        }
-
-        return this.functionLibraryManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 5d33b75582..43cfcb2449 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -74,11 +74,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/ScriptLibrariesApi.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/ScriptLibrariesApi.java
index 7422d7821e..c98fea8e4a 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/ScriptLibrariesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/ScriptLibrariesApi.java
@@ -1,34 +1,35 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.script.library.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 
 import java.io.InputStream;
 
+import org.wso2.carbon.identity.api.server.script.library.v1.factories.ScriptLibrariesApiServiceFactory;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.Error;
 
 import java.io.File;
 
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryListResponse;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryResponse;
-import org.wso2.carbon.identity.api.server.script.library.v1.ScriptLibrariesApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -43,8 +44,12 @@
 
 public class ScriptLibrariesApi {
 
-    @Autowired
-    private ScriptLibrariesApiService delegate;
+    private final ScriptLibrariesApiService delegate;
+
+    public ScriptLibrariesApi() {
+
+        this.delegate = ScriptLibrariesApiServiceFactory.getScriptLibrariesApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ScriptLibrariesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ScriptLibrariesApiServiceFactory.java
index 07092dadbd..a2925113c9 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ScriptLibrariesApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/gen/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ScriptLibrariesApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2019-2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.script.library.v1.factories;
 
 import org.wso2.carbon.identity.api.server.script.library.v1.ScriptLibrariesApiService;
 import org.wso2.carbon.identity.api.server.script.library.v1.impl.ScriptLibrariesApiServiceImpl;
 
+/**
+ * Factory class for Script Libraries API.
+ */
 public class ScriptLibrariesApiServiceFactory {
 
-   private final static ScriptLibrariesApiService service = new ScriptLibrariesApiServiceImpl();
+   private static final ScriptLibrariesApiService SERVICE = new ScriptLibrariesApiServiceImpl();
 
-   public static ScriptLibrariesApiService getScriptLibrariesApi()
-   {
-      return service;
+   /**
+    * Get Script Libraries API service.
+    *
+    * @return Script Libraries API service.
+    */
+   public static ScriptLibrariesApiService getScriptLibrariesApi() {
+
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/core/ServerScriptLibrariesService.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/core/ServerScriptLibrariesService.java
index c849395744..caca820368 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/core/ServerScriptLibrariesService.java
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/core/ServerScriptLibrariesService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.wso2.carbon.identity.api.server.script.library.v1.core;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -26,13 +27,13 @@
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.script.library.common.Constants;
-import org.wso2.carbon.identity.api.server.script.library.common.ScriptLibraryServiceHolder;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibrary;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryListResponse;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryPOSTRequest;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryPUTRequest;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryResponse;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.functions.library.mgt.FunctionLibraryManagementService;
 import org.wso2.carbon.identity.functions.library.mgt.exception.FunctionLibraryManagementClientException;
 import org.wso2.carbon.identity.functions.library.mgt.exception.FunctionLibraryManagementException;
 import org.wso2.carbon.identity.functions.library.mgt.exception.FunctionLibraryManagementServerException;
@@ -57,8 +58,14 @@
  */
 public class ServerScriptLibrariesService {
 
+    private final FunctionLibraryManagementService functionLibraryManagementService;
     private static final Log log = LogFactory.getLog(ServerScriptLibrariesService.class);
 
+    public ServerScriptLibrariesService(FunctionLibraryManagementService functionLibraryManagementService) {
+
+        this.functionLibraryManagementService = functionLibraryManagementService;
+    }
+
     /**
      * Get list of Script Libraries.
      *
@@ -70,8 +77,8 @@ public ScriptLibraryListResponse getScriptLibraries(Integer limit, Integer offse
 
         List<FunctionLibrary> functionLibraries;
         try {
-            functionLibraries = ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                    .listFunctionLibraries(ContextLoader.getTenantDomainFromContext());
+            functionLibraries = functionLibraryManagementService.listFunctionLibraries(ContextLoader
+                    .getTenantDomainFromContext());
         } catch (FunctionLibraryManagementException e) {
             throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_LISTING_SCRIPT_LIBRARIES);
         }
@@ -123,9 +130,8 @@ public ScriptLibraryResponse getScriptLibrary(String scriptLibraryId) {
         if (isScriptLibraryAvailable(scriptLibraryId)) {
             FunctionLibrary functionLibrary;
             try {
-                functionLibrary = ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                        .getFunctionLibrary(scriptLibraryId,
-                                ContextLoader.getTenantDomainFromContext());
+                functionLibrary = functionLibraryManagementService.getFunctionLibrary(scriptLibraryId,
+                        ContextLoader.getTenantDomainFromContext());
             } catch (FunctionLibraryManagementException e) {
                 throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_RETRIEVING_SCRIPT_LIBRARY);
             }
@@ -166,9 +172,8 @@ public void addScriptLibrary(String name, InputStream contentInputStream, String
                     scriptLibraryPOSTRequest);
             try {
                 if (scriptLibraryPOSTRequest.getName().contains(Constants.SCRIPT_LIBRARY_EXTENSION)) {
-                    ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                            .createFunctionLibrary(functionLibrary,
-                                    ContextLoader.getTenantDomainFromContext());
+                    functionLibraryManagementService.createFunctionLibrary(functionLibrary, ContextLoader
+                            .getTenantDomainFromContext());
                 } else {
                     throw handleScriptLibraryClientError(Constants.ErrorMessage.ERROR_SCRIPT_LIBRARY_NAME_VALIDATION,
                             Response.Status.BAD_REQUEST);
@@ -204,9 +209,8 @@ public void updateScriptLibrary(String scriptLibraryName, InputStream contentInp
             FunctionLibrary functionLibrary = createScriptLibraryPut(scriptLibraryName, scriptLibraryPUTRequestContent,
                     scriptLibraryPUTRequest);
             try {
-                ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                        .updateFunctionLibrary(scriptLibraryName, functionLibrary,
-                                ContextLoader.getTenantDomainFromContext());
+                functionLibraryManagementService.updateFunctionLibrary(scriptLibraryName, functionLibrary,
+                        ContextLoader.getTenantDomainFromContext());
             } catch (FunctionLibraryManagementException e) {
                 throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_UPDATING_SCRIPT_LIBRARY);
             }
@@ -227,9 +231,8 @@ public String getScriptLibraryContentByName(String scriptLibraryName) {
 
         if (isScriptLibraryAvailable(scriptLibraryName)) {
             try {
-                FunctionLibrary functionLibrary = ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                        .getFunctionLibrary(scriptLibraryName,
-                                ContextLoader.getTenantDomainFromContext());
+                FunctionLibrary functionLibrary = functionLibraryManagementService
+                        .getFunctionLibrary(scriptLibraryName, ContextLoader.getTenantDomainFromContext());
                 return functionLibrary.getFunctionLibraryScript();
             } catch (FunctionLibraryManagementException e) {
                 throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_RETRIEVING_SCRIPT_LIBRARY);
@@ -249,8 +252,8 @@ public void deleteScriptLibrary(String scriptLibraryId) {
 
         if (isScriptLibraryAvailable(scriptLibraryId)) {
             try {
-                ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                        .deleteFunctionLibrary(scriptLibraryId, ContextLoader.getTenantDomainFromContext());
+                functionLibraryManagementService.deleteFunctionLibrary(scriptLibraryId,
+                        ContextLoader.getTenantDomainFromContext());
             } catch (FunctionLibraryManagementException e) {
                 throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_DELETING_SCRIPT_LIBRARY);
             }
@@ -267,8 +270,8 @@ public boolean isScriptLibraryAvailable(String scriptLibraryName) {
 
         boolean isAvailable;
         try {
-            isAvailable = ScriptLibraryServiceHolder.getScriptLibraryManagementService()
-                    .isFunctionLibraryExists(scriptLibraryName, ContextLoader.getTenantDomainFromContext());
+            isAvailable = functionLibraryManagementService.isFunctionLibraryExists(scriptLibraryName,
+                    ContextLoader.getTenantDomainFromContext());
         } catch (FunctionLibraryManagementException e) {
             throw handleScriptLibraryError(e, Constants.ErrorMessage.ERROR_CODE_ERROR_RETRIEVING_SCRIPT_LIBRARY);
         }
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ServerScriptLibrariesServiceFactory.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ServerScriptLibrariesServiceFactory.java
new file mode 100644
index 0000000000..7dcfa0e7da
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/factories/ServerScriptLibrariesServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.script.library.v1.factories;
+
+import org.wso2.carbon.identity.api.server.script.library.common.ScriptLibraryServiceHolder;
+import org.wso2.carbon.identity.api.server.script.library.v1.core.ServerScriptLibrariesService;
+import org.wso2.carbon.identity.functions.library.mgt.FunctionLibraryManagementService;
+
+/**
+ * Factory class for Server Script Libraries API.
+ */
+public class ServerScriptLibrariesServiceFactory {
+
+    private static final ServerScriptLibrariesService SERVICE;
+
+    static {
+        FunctionLibraryManagementService functionLibraryManagementService = ScriptLibraryServiceHolder
+                .getScriptLibraryManagementService();
+
+        if (functionLibraryManagementService == null) {
+            throw new IllegalStateException("FunctionLibraryManagementService is not available from OSGi context.");
+        }
+
+        SERVICE = new ServerScriptLibrariesService(functionLibraryManagementService);
+    }
+
+    /**
+     * Get Server Script Libraries API service.
+     *
+     * @return Server Script Libraries API service.
+     */
+    public static ServerScriptLibrariesService getServerScriptLibrariesService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/impl/ScriptLibrariesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/impl/ScriptLibrariesApiServiceImpl.java
index 016250a3db..6424ae0171 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/impl/ScriptLibrariesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/java/org/wso2/carbon/identity/api/server/script/library/v1/impl/ScriptLibrariesApiServiceImpl.java
@@ -1,29 +1,31 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2025, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.script.library.v1.impl;
 
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.script.library.common.Constants;
 import org.wso2.carbon.identity.api.server.script.library.v1.ScriptLibrariesApiService;
 import org.wso2.carbon.identity.api.server.script.library.v1.core.ServerScriptLibrariesService;
+import org.wso2.carbon.identity.api.server.script.library.v1.factories.ServerScriptLibrariesServiceFactory;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryListResponse;
 import org.wso2.carbon.identity.api.server.script.library.v1.model.ScriptLibraryResponse;
 
@@ -44,8 +46,16 @@
  */
 public class ScriptLibrariesApiServiceImpl implements ScriptLibrariesApiService {
 
-    @Autowired
-    private ServerScriptLibrariesService serverScriptLibrariesService;
+    private final ServerScriptLibrariesService serverScriptLibrariesService;
+
+    public ScriptLibrariesApiServiceImpl() {
+
+        try {
+            this.serverScriptLibrariesService = ServerScriptLibrariesServiceFactory.getServerScriptLibrariesService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerScriptLibrariesService.", e);
+        }
+    }
 
     @Override
     public Response addScriptLibrary(String name, InputStream contentInputStream, Attachment contentDetail,
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/resources/META-INF/cxf/script-libraries-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/resources/META-INF/cxf/script-libraries-server-v1-cxf.xml
deleted file mode 100644
index 443a5bf817..0000000000
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/src/main/resources/META-INF/cxf/script-libraries-server-v1-cxf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.script.library.v1.core.ServerScriptLibrariesService"/>
-    <bean class="org.wso2.carbon.identity.api.server.script.library.v1.impl.ScriptLibrariesApiServiceImpl"/>
-    <bean id="scriptLibraryManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.script.library.common.factory.ScriptLibraryMgtOSGIService"/>
-    <bean id="scriptLibraryServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.script.library.common.ScriptLibraryServiceHolder">
-        <property name="scriptLibraryManagementService" ref="scriptLibraryManagementServiceFactoryBean"/>
-    </bean>
-</beans>

From 38744d26778ac79807b2ebf9d439942e5b510099 Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:27:11 +0530
Subject: [PATCH 07/15] [Spring Cleanup] Remove Spring dependencies in the
 organization user invitation API (#813)

* [Spring Cleanup] Remove Spring dependencies in the organization user invitation API
---
 .../pom.xml                                   |  5 --
 .../UserInvitationMgtServiceHolder.java       | 23 ++++----
 .../UserInvitationMgtOSGIServiceFactory.java  | 53 -------------------
 .../pom.xml                                   | 10 ----
 .../invitation/management/v1/GuestsApi.java   | 10 ++--
 .../v1/factories/GuestsApiServiceFactory.java | 16 ++++--
 .../v1/core/GuestApiServiceCore.java          | 14 ++---
 .../factories/GuestApiServiceCoreFactory.java | 51 ++++++++++++++++++
 .../v1/impl/GuestsApiServiceImpl.java         | 14 +++--
 ...rganization-user-invitation-mgt-v1-cxf.xml | 33 ------------
 10 files changed, 100 insertions(+), 129 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/factory/UserInvitationMgtOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestApiServiceCoreFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 38ec1ef5d2..d4ddbcb964 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -56,11 +56,6 @@
             <artifactId>javax.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtServiceHolder.java
index c04ae756aa..32506bbedd 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/UserInvitationMgtServiceHolder.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.organization.user.invitation.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreService;
 
 /**
@@ -25,25 +26,23 @@
  */
 public class UserInvitationMgtServiceHolder {
 
-    private static InvitationCoreService invitationCoreService;
+    private UserInvitationMgtServiceHolder() {
 
-    /**
-     * Get Invitation Core osgi service.
-     *
-     * @return InvitationCoreService.
-     */
-    public static InvitationCoreService getInvitationCoreService() {
+    }
+
+    private static class InvitationCoreServiceHolder {
 
-        return invitationCoreService;
+        static final InvitationCoreService SERVICE = (InvitationCoreService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(InvitationCoreService.class, null);
     }
 
     /**
-     * Set Invitation Core osgi service.
+     * Get Invitation Core osgi service.
      *
-     * @param invitationCoreService InvitationCoreService.
+     * @return InvitationCoreService.
      */
-    public static void setInvitationCoreService(InvitationCoreService invitationCoreService) {
+    public static InvitationCoreService getInvitationCoreService() {
 
-        UserInvitationMgtServiceHolder.invitationCoreService = invitationCoreService;
+        return InvitationCoreServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/factory/UserInvitationMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/factory/UserInvitationMgtOSGIServiceFactory.java
deleted file mode 100644
index fe226ba1ac..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/common/factory/UserInvitationMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.user.invitation.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the Invitation Core Service inside the container.
- */
-public class UserInvitationMgtOSGIServiceFactory extends AbstractFactoryBean<InvitationCoreService> {
-
-    private InvitationCoreService invitationCoreService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected InvitationCoreService createInstance() throws Exception {
-
-        if (this.invitationCoreService == null) {
-            InvitationCoreService invitationCoreService = (InvitationCoreService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(InvitationCoreService.class, null);
-            if (invitationCoreService == null) {
-                throw new Exception("Unable to retrieve InvitationCoreService.");
-            }
-            this.invitationCoreService = invitationCoreService;
-        }
-        return this.invitationCoreService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 3b798a2df2..9da9a3320a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -34,16 +34,6 @@
             <artifactId>javax.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/GuestsApi.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/GuestsApi.java
index b61714a05c..e0b284017e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/GuestsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/GuestsApi.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.factories.GuestsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.AcceptanceRequestBody;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.IntrospectRequestBody;
@@ -45,8 +45,12 @@
 
 public class GuestsApi  {
 
-    @Autowired
-    private GuestsApiService delegate;
+    private final GuestsApiService delegate;
+
+    public GuestsApi() {
+
+        this.delegate = GuestsApiServiceFactory.getGuestsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestsApiServiceFactory.java
index 973a1e4266..74fe92e2b5 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.GuestsApiService;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.impl.GuestsApiServiceImpl;
 
+/**
+ * This class is the factory class for GuestsApiService.
+ */
 public class GuestsApiServiceFactory {
 
-   private final static GuestsApiService service = new GuestsApiServiceImpl();
+   private static final GuestsApiService SERVICE = new GuestsApiServiceImpl();
+
+   /**
+    * Get GuestsApiService.
+    *
+    * @return GuestsApiService.
+    */
+   public static GuestsApiService getGuestsApi() {
 
-   public static GuestsApiService getGuestsApi()
-   {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java
index 43a4d51eaf..0848b1d3ea 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/core/GuestApiServiceCore.java
@@ -33,7 +33,7 @@
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.InvitationsListResponse;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.Property;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.RoleAssignmentResponse;
-import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreServiceImpl;
+import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreService;
 import org.wso2.carbon.identity.organization.user.invitation.management.exception.UserInvitationMgtException;
 import org.wso2.carbon.identity.organization.user.invitation.management.models.GroupAssignments;
 import org.wso2.carbon.identity.organization.user.invitation.management.models.Invitation;
@@ -63,6 +63,13 @@
  */
 public class GuestApiServiceCore {
 
+    private final InvitationCoreService invitationCoreService;
+
+    public GuestApiServiceCore(InvitationCoreService invitationCoreService) {
+
+        this.invitationCoreService = invitationCoreService;
+    }
+
     private static List<RoleAssignmentResponse> buildRoleAssignmentResponse(Invitation invitationRecord) {
 
         List<RoleAssignmentResponse> roleAssignmentResponseList = new ArrayList<>();
@@ -104,7 +111,6 @@ private static List<GroupAssignmentResponse> buildGroupAssignmentResponse(Invita
      */
     public List<InvitationSuccessResponse> createInvitation(InvitationRequestBody invitationRequestBody) {
 
-        InvitationCoreServiceImpl invitationCoreService = new InvitationCoreServiceImpl();
         InvitationDO invitation = new InvitationDO();
         invitation.setUsernamesList(invitationRequestBody.getUsernames());
         invitation.setUserDomain(invitationRequestBody.getUserDomain());
@@ -161,7 +167,6 @@ public InvitationsListResponse getInvitations(String filter, Integer limit, Inte
                                                   String sortBy) {
 
         if (!isUnsupportedParamAvailable(limit, offset, sortOrder, sortBy)) {
-            InvitationCoreServiceImpl invitationCoreService = new InvitationCoreServiceImpl();
             try {
                 return buildInvitationsListResponse(invitationCoreService.getInvitations(filter));
             } catch (UserInvitationMgtException e) {
@@ -190,7 +195,6 @@ public InvitationsListResponse getInvitations(String filter, Integer limit, Inte
      */
     public IntrospectSuccessResponse introspectInvitation(String confirmationCode) {
 
-        InvitationCoreServiceImpl invitationCoreService = new InvitationCoreServiceImpl();
         try {
             return buildValidateResponse(invitationCoreService.introspectInvitation(confirmationCode));
         } catch (UserInvitationMgtException e) {
@@ -211,7 +215,6 @@ public IntrospectSuccessResponse introspectInvitation(String confirmationCode) {
      */
     public boolean deleteInvitation(String invitationId) {
 
-        InvitationCoreServiceImpl invitationCoreService = new InvitationCoreServiceImpl();
         try {
             return invitationCoreService.deleteInvitation(invitationId);
         } catch (UserInvitationMgtException e) {
@@ -233,7 +236,6 @@ public boolean deleteInvitation(String invitationId) {
      */
     public void acceptInvitation(AcceptanceRequestBody acceptanceRequestBody) {
 
-        InvitationCoreServiceImpl invitationCoreService = new InvitationCoreServiceImpl();
         try {
             invitationCoreService.acceptInvitation(acceptanceRequestBody.getConfirmationCode());
         } catch (UserInvitationMgtException e) {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestApiServiceCoreFactory.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestApiServiceCoreFactory.java
new file mode 100644
index 0000000000..d8f90af568
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/factories/GuestApiServiceCoreFactory.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.organization.user.invitation.management.common.UserInvitationMgtServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.core.GuestApiServiceCore;
+import org.wso2.carbon.identity.organization.user.invitation.management.InvitationCoreService;
+
+/**
+ * The factory class for GuestApiServiceCore.
+ */
+public class GuestApiServiceCoreFactory {
+
+    private static final GuestApiServiceCore SERVICE;
+
+    static {
+        InvitationCoreService invitationCoreService = UserInvitationMgtServiceHolder.getInvitationCoreService();
+
+        if (invitationCoreService == null) {
+            throw new IllegalStateException("InvitationCoreService is not available from OSGi context.");
+        }
+
+        SERVICE = new GuestApiServiceCore(invitationCoreService);
+    }
+
+    /**
+     * Get GuestApiServiceCore.
+     *
+     * @return GuestApiServiceCore.
+     */
+    public static GuestApiServiceCore getGuestApiServiceCore() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/impl/GuestsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/impl/GuestsApiServiceImpl.java
index 2ba1611d14..92fed9ee2b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/impl/GuestsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/user/invitation/management/v1/impl/GuestsApiServiceImpl.java
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.GuestsApiService;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.core.GuestApiServiceCore;
+import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.factories.GuestApiServiceCoreFactory;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.AcceptanceRequestBody;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.IntrospectRequestBody;
 import org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.model.IntrospectSuccessResponse;
@@ -36,8 +36,16 @@
  */
 public class GuestsApiServiceImpl implements GuestsApiService {
 
-    @Autowired
-    private GuestApiServiceCore guestApiServiceCore;
+    private final GuestApiServiceCore guestApiServiceCore;
+
+    public GuestsApiServiceImpl() {
+
+        try {
+            this.guestApiServiceCore = GuestApiServiceCoreFactory.getGuestApiServiceCore();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating user invitation management services.", e);
+        }
+    }
 
     @Override
     public Response invitationAcceptPost(AcceptanceRequestBody acceptanceRequestBody) {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml
deleted file mode 100644
index 223a6e3652..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/src/main/resources/META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
-  ~
-  ~ WSO2 LLC. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation=" http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-       http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.core.GuestApiServiceCore"/>
-    <bean class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.impl.GuestsApiServiceImpl"/>
-    <bean id="userInvitationMgtOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.common.factory.UserInvitationMgtOSGIServiceFactory"/>
-    <bean id="userInvitationManagerHolderBean"
-          class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.common.UserInvitationMgtServiceHolder">
-        <property name="invitationCoreService" ref="userInvitationMgtOSGIServiceFactoryBean"/>
-    </bean>
-</beans>

From 78408203c04c8654e1529bba5df1f51bd2558d04 Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:28:01 +0530
Subject: [PATCH 08/15] [Spring Cleanup] Remove Spring dependencies in the
 organization management API (#815)

* [Spring Cleanup] Remove Spring dependencies in the organization management API
---
 .../pom.xml                                   |  5 --
 .../OrganizationManagementServiceHolder.java  | 62 +++++-----------
 ...gApplicationManagerOSGIServiceFactory.java | 53 --------------
 ...DiscoveryManagementOSGIServiceFactory.java | 53 --------------
 ...anizationManagementOSGIServiceFactory.java | 53 --------------
 .../pom.xml                                   |  5 --
 .../management/v1/OrganizationsApi.java       | 11 ++-
 .../OrganizationsApiServiceFactory.java       | 16 +++-
 .../OrganizationManagementServiceFactory.java | 65 +++++++++++++++++
 .../v1/impl/OrganizationsApiServiceImpl.java  | 15 +++-
 .../OrganizationManagementService.java        | 73 +++++++++----------
 .../META-INF/cxf/org-mgt-server-v1-cxf.xml    | 38 ----------
 12 files changed, 150 insertions(+), 299 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrgApplicationManagerOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationDiscoveryManagementOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationManagementOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/resources/META-INF/cxf/org-mgt-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 48a1c6f723..763d4b1d89 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -30,11 +30,6 @@
     <artifactId>org.wso2.carbon.identity.api.server.organization.management.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.organization.management.core</groupId>
             <artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/OrganizationManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/OrganizationManagementServiceHolder.java
index 8f2fcb35ca..8598e82b67 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/OrganizationManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/OrganizationManagementServiceHolder.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.organization.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.organization.discovery.service.OrganizationDiscoveryManager;
 import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
 import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
@@ -27,39 +28,34 @@
  */
 public class OrganizationManagementServiceHolder {
 
-    private static OrganizationManagementServiceHolder instance = new OrganizationManagementServiceHolder();
+    private OrganizationManagementServiceHolder() {}
 
-    private OrgApplicationManager orgApplicationManager;
-    private OrganizationManager organizationManager;
-    private OrganizationDiscoveryManager organizationDiscoveryManager;
-
-    private OrganizationManagementServiceHolder() {
+    private static class OrgApplicationManagerHolder {
 
+        static final OrgApplicationManager SERVICE = (OrgApplicationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OrgApplicationManager.class, null);
     }
 
-    public static OrganizationManagementServiceHolder getInstance() {
+    private static class OrganizationManagerHolder {
 
-        return instance;
+        static final OrganizationManager SERVICE = (OrganizationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OrganizationManager.class, null);
     }
 
-    /**
-     * Get OrgApplicationManager OSGi service.
-     *
-     * @return OrgApplicationManager.
-     */
-    public OrgApplicationManager getOrgApplicationManager() {
+    private static class OrganizationDiscoveryManagerHolder {
 
-        return OrganizationManagementServiceHolder.getInstance().orgApplicationManager;
+        static final OrganizationDiscoveryManager SERVICE = (OrganizationDiscoveryManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OrganizationDiscoveryManager.class, null);
     }
 
     /**
-     * Set OrgApplicationManager OSGi service.
+     * Get OrgApplicationManager OSGi service.
      *
-     * @param orgApplicationManager OrgApplicationManager.
+     * @return OrgApplicationManager.
      */
-    public void setOrgApplicationManager(OrgApplicationManager orgApplicationManager) {
+    public static OrgApplicationManager getOrgApplicationManager() {
 
-        OrganizationManagementServiceHolder.getInstance().orgApplicationManager = orgApplicationManager;
+        return OrgApplicationManagerHolder.SERVICE;
     }
 
     /**
@@ -67,19 +63,9 @@ public void setOrgApplicationManager(OrgApplicationManager orgApplicationManager
      *
      * @return OrganizationManager.
      */
-    public OrganizationManager getOrganizationManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().organizationManager;
-    }
-
-    /**
-     * Set OrganizationManager OSGi service.
-     *
-     * @param organizationManager OrganizationManager.
-     */
-    public void setOrganizationManager(OrganizationManager organizationManager) {
+    public static OrganizationManager getOrganizationManager() {
 
-        OrganizationManagementServiceHolder.getInstance().organizationManager = organizationManager;
+        return OrganizationManagerHolder.SERVICE;
     }
 
     /**
@@ -87,18 +73,8 @@ public void setOrganizationManager(OrganizationManager organizationManager) {
      *
      * @return OrganizationDiscoveryManager.
      */
-    public OrganizationDiscoveryManager getOrganizationDiscoveryManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().organizationDiscoveryManager;
-    }
-
-    /**
-     * Set OrganizationDiscoveryManager OSGi service.
-     *
-     * @param organizationDiscoveryManager OrganizationDiscoveryManager.
-     */
-    public void setOrganizationDiscoveryManager(OrganizationDiscoveryManager organizationDiscoveryManager) {
+    public static OrganizationDiscoveryManager getOrganizationDiscoveryManager() {
 
-        OrganizationManagementServiceHolder.getInstance().organizationDiscoveryManager = organizationDiscoveryManager;
+        return OrganizationDiscoveryManagerHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrgApplicationManagerOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrgApplicationManagerOSGIServiceFactory.java
deleted file mode 100644
index 7e8c43e586..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrgApplicationManagerOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrgApplicationManager type of object inside the container.
- */
-public class OrgApplicationManagerOSGIServiceFactory extends AbstractFactoryBean<OrgApplicationManager> {
-
-    private OrgApplicationManager orgApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrgApplicationManager createInstance() throws Exception {
-
-        if (this.orgApplicationManager == null) {
-            OrgApplicationManager service = (OrgApplicationManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(OrgApplicationManager.class, null);
-            if (service != null) {
-                this.orgApplicationManager = service;
-            } else {
-                throw new Exception("Unable to retrieve OrgApplicationManager service.");
-            }
-        }
-        return this.orgApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationDiscoveryManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationDiscoveryManagementOSGIServiceFactory.java
deleted file mode 100644
index 603cbff06b..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationDiscoveryManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.discovery.service.OrganizationDiscoveryManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationDiscoveryManager type of object inside the container.
- */
-public class OrganizationDiscoveryManagementOSGIServiceFactory extends
-        AbstractFactoryBean<OrganizationDiscoveryManager> {
-
-    private OrganizationDiscoveryManager organizationDiscoveryManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrganizationDiscoveryManager createInstance() throws Exception {
-
-        if (this.organizationDiscoveryManager == null) {
-            OrganizationDiscoveryManager service = (OrganizationDiscoveryManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(OrganizationDiscoveryManager.class, null);
-            if (service == null) {
-                throw new Exception("Unable to retrieve OrganizationDiscoveryManager service.");
-            }
-            this.organizationDiscoveryManager = service;
-        }
-        return this.organizationDiscoveryManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationManagementOSGIServiceFactory.java
deleted file mode 100644
index d94f93c07a..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/management/common/factory/OrganizationManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationManager type of object inside the container.
- */
-public class OrganizationManagementOSGIServiceFactory extends AbstractFactoryBean<OrganizationManager> {
-
-    private OrganizationManager organizationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrganizationManager createInstance() throws Exception {
-
-        if (this.organizationManager == null) {
-            OrganizationManager service = (OrganizationManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(OrganizationManager.class, null);
-            if (service != null) {
-                this.organizationManager = service;
-            } else {
-                throw new Exception("Unable to retrieve OrganizationManager service.");
-            }
-        }
-        return this.organizationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 410386d352..d90ea8b102 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/OrganizationsApi.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/OrganizationsApi.java
index ab50d0215f..15659d81b0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/OrganizationsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/OrganizationsApi.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.api.server.organization.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.organization.management.v1.factories.OrganizationsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.ApplicationSharePOSTRequest;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.GetOrganizationResponse;
@@ -44,7 +44,6 @@
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.OrganizationsResponse;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.SharedApplicationsResponse;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.SharedOrganizationsResponse;
-import org.wso2.carbon.identity.api.server.organization.management.v1.OrganizationsApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -58,8 +57,12 @@
 
 public class OrganizationsApi  {
 
-    @Autowired
-    private OrganizationsApiService delegate;
+    private final OrganizationsApiService delegate;
+
+    public OrganizationsApi() {
+
+        this.delegate = OrganizationsApiServiceFactory.getOrganizationsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationsApiServiceFactory.java
index ccdf2c0142..e4cecd7b31 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.organization.management.v1.OrganizationsApiService;
 import org.wso2.carbon.identity.api.server.organization.management.v1.impl.OrganizationsApiServiceImpl;
 
+/**
+ * Factory class for OrganizationsApiService.
+ */
 public class OrganizationsApiServiceFactory {
 
-   private final static OrganizationsApiService service = new OrganizationsApiServiceImpl();
+   private static final OrganizationsApiService SERVICE = new OrganizationsApiServiceImpl();
+
+   /**
+    * Get OrganizationsApiService.
+    *
+    * @return OrganizationsApiService.
+    */
+   public static OrganizationsApiService getOrganizationsApi() {
 
-   public static OrganizationsApiService getOrganizationsApi()
-   {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationManagementServiceFactory.java
new file mode 100644
index 0000000000..9e46615d3b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/factories/OrganizationManagementServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.organization.management.common.OrganizationManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.management.v1.service.OrganizationManagementService;
+import org.wso2.carbon.identity.organization.discovery.service.OrganizationDiscoveryManager;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
+import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
+
+/**
+ * Factory class for OrganizationManagementService.
+ */
+public class OrganizationManagementServiceFactory {
+
+    private static final OrganizationManagementService SERVICE;
+
+    static {
+        OrgApplicationManager orgApplicationManager = OrganizationManagementServiceHolder.getOrgApplicationManager();
+        OrganizationManager organizationManager = OrganizationManagementServiceHolder.getOrganizationManager();
+        OrganizationDiscoveryManager organizationDiscoveryManager = OrganizationManagementServiceHolder
+                .getOrganizationDiscoveryManager();
+
+        if (orgApplicationManager == null) {
+            throw new IllegalStateException("OrgApplicationManager service is not available from OSGi context.");
+        }
+
+        if (organizationManager == null) {
+            throw new IllegalStateException("OrganizationManager service is not available from OSGi context.");
+        }
+
+        if (organizationDiscoveryManager == null) {
+            throw new IllegalStateException("OrganizationDiscoveryManager service is not available from OSGi context.");
+        }
+
+        SERVICE = new OrganizationManagementService(orgApplicationManager,
+                organizationManager, organizationDiscoveryManager);
+    }
+
+    /**
+     * Get OrganizationManagementService.
+     *
+     * @return OrganizationManagementService.
+     */
+    public static OrganizationManagementService getOrganizationManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/impl/OrganizationsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/impl/OrganizationsApiServiceImpl.java
index dd20146288..4bac69e2f6 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/impl/OrganizationsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/impl/OrganizationsApiServiceImpl.java
@@ -18,8 +18,8 @@
 
 package org.wso2.carbon.identity.api.server.organization.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.organization.management.v1.OrganizationsApiService;
+import org.wso2.carbon.identity.api.server.organization.management.v1.factories.OrganizationManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.ApplicationSharePOSTRequest;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.OrganizationDiscoveryAttributes;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.OrganizationDiscoveryCheckPOSTRequest;
@@ -39,8 +39,17 @@
  */
 public class OrganizationsApiServiceImpl implements OrganizationsApiService {
 
-    @Autowired
-    private OrganizationManagementService organizationManagementService;
+    private final OrganizationManagementService organizationManagementService;
+
+    public OrganizationsApiServiceImpl() {
+
+        try {
+            this.organizationManagementService = OrganizationManagementServiceFactory
+                    .getOrganizationManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating organization management service.", e);
+        }
+    }
 
     @Override
     public Response organizationsGet(String filter, Integer limit, String after, String before, Boolean recursive) {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
index 79330fb7d8..eaa109417b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/management/v1/service/OrganizationManagementService.java
@@ -24,7 +24,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.server.common.Util;
-import org.wso2.carbon.identity.api.server.organization.management.common.OrganizationManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.ApplicationSharePOSTRequest;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.Attribute;
 import org.wso2.carbon.identity.api.server.organization.management.v1.model.BasicOrganizationResponse;
@@ -110,8 +109,21 @@
  */
 public class OrganizationManagementService {
 
+    private final OrgApplicationManager orgApplicationManager;
+    private final OrganizationManager organizationManager;
+    private final OrganizationDiscoveryManager organizationDiscoveryManager;
+
     private static final Log LOG = LogFactory.getLog(OrganizationManagementService.class);
 
+    public OrganizationManagementService(OrgApplicationManager orgApplicationManager,
+                                         OrganizationManager organizationManager,
+                                         OrganizationDiscoveryManager organizationDiscoveryManager) {
+
+        this.orgApplicationManager = orgApplicationManager;
+        this.organizationManager = organizationManager;
+        this.organizationDiscoveryManager = organizationDiscoveryManager;
+    }
+
     /**
      * Retrieve organization IDs.
      *
@@ -127,7 +139,7 @@ public Response getOrganizations(String filter, Integer limit, String after, Str
         try {
             limit = validateLimit(limit);
             String sortOrder = StringUtils.isNotBlank(before) ? ASC_SORT_ORDER : DESC_SORT_ORDER;
-            List<Organization> organizations = getOrganizationManager().getOrganizationsList(limit + 1, after,
+            List<Organization> organizations = organizationManager.getOrganizationsList(limit + 1, after,
                     before, sortOrder, filter, Boolean.TRUE.equals(recursive));
             return Response.ok().entity(getOrganizationsResponse(limit, after, before, filter, organizations,
                     Boolean.TRUE.equals(recursive))).build();
@@ -146,7 +158,7 @@ public Response getOrganizations(String filter, Integer limit, String after, Str
      */
     public Response checkOrganizationName(String organizationName) {
 
-        boolean nameExist = getOrganizationManager().isOrganizationExistByNameInGivenHierarchy(organizationName);
+        boolean nameExist = organizationManager.isOrganizationExistByNameInGivenHierarchy(organizationName);
         OrganizationNameCheckPOSTResponse response = new OrganizationNameCheckPOSTResponse().available(false);
         if (!nameExist) {
             response.setAvailable(true);
@@ -163,7 +175,7 @@ public Response checkOrganizationName(String organizationName) {
     public Response deleteOrganization(String organizationId) {
 
         try {
-            getOrganizationManager().deleteOrganization(organizationId);
+            organizationManager.deleteOrganization(organizationId);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -181,7 +193,7 @@ public Response deleteOrganization(String organizationId) {
     public Response getOrganization(String organizationId, Boolean includePermissions) {
 
         try {
-            Organization organization = getOrganizationManager().getOrganization(organizationId,
+            Organization organization = organizationManager.getOrganization(organizationId,
                     false, Boolean.TRUE.equals(includePermissions));
             return Response.ok().entity(getOrganizationResponseWithPermission(organization)).build();
         } catch (OrganizationManagementClientException e) {
@@ -202,7 +214,7 @@ public Response patchOrganization(String organizationId, List<OrganizationPatchR
             organizationPatchRequestItem) {
 
         try {
-            Organization organization = getOrganizationManager().patchOrganization(organizationId,
+            Organization organization = organizationManager.patchOrganization(organizationId,
                     organizationPatchRequestItem.stream().map(op ->
                             new PatchOperation(op.getOperation() == null ? null : op.getOperation().toString(),
                                     op.getPath(), op.getValue())).collect(Collectors.toList()));
@@ -242,7 +254,7 @@ public Response updateOrganization(String organizationId, OrganizationPUTRequest
     public Response addOrganization(OrganizationPOSTRequest organizationPOSTRequest) {
 
         try {
-            Organization organization = getOrganizationManager().addOrganization(getOrganizationFromPostRequest
+            Organization organization = organizationManager.addOrganization(getOrganizationFromPostRequest
                     (organizationPOSTRequest));
             String organizationId = organization.getId();
             return Response.created(OrganizationManagementEndpointUtil.getResourceLocation(organizationId)).entity
@@ -269,7 +281,7 @@ public Response shareOrganizationApplication(String organizationId, String appli
             validateApplicationSharePostRequestBody(requestBody);
             boolean shareWithAllChildren = (requestBody.getShareWithAllChildren() != null)
                     ? requestBody.getShareWithAllChildren() : false;
-            getOrgApplicationManager().shareOrganizationApplication(organizationId, applicationId,
+            orgApplicationManager.shareOrganizationApplication(organizationId, applicationId,
                     shareWithAllChildren, requestBody.getSharedOrganizations());
             return Response.ok().build();
         } catch (OrganizationManagementClientException e) {
@@ -306,7 +318,7 @@ private void validateApplicationSharePostRequestBody(ApplicationSharePOSTRequest
     public Response deleteSharedApplication(String organizationId, String applicationId, String sharedOrganizationId) {
 
         try {
-            getOrgApplicationManager().deleteSharedApplication(organizationId, applicationId, sharedOrganizationId);
+            orgApplicationManager.deleteSharedApplication(organizationId, applicationId, sharedOrganizationId);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -325,7 +337,7 @@ public Response deleteSharedApplication(String organizationId, String applicatio
     public Response deleteAllSharedApplications(String organizationId, String applicationId) {
 
         try {
-            getOrgApplicationManager().deleteSharedApplication(organizationId, applicationId, null);
+            orgApplicationManager.deleteSharedApplication(organizationId, applicationId, null);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -345,7 +357,7 @@ public Response getApplicationSharedOrganizations(String organizationId, String
 
         try {
             List<BasicOrganization> basicOrganizations =
-                    getOrgApplicationManager().getApplicationSharedOrganizations(organizationId, applicationId);
+                    orgApplicationManager.getApplicationSharedOrganizations(organizationId, applicationId);
             return Response.ok(createSharedOrgResponse(basicOrganizations)).build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -365,7 +377,7 @@ public Response getSharedApplications(String organizationId, String applicationI
 
         try {
             List<SharedApplication> sharedApplications =
-                    getOrgApplicationManager().getSharedApplications(organizationId, applicationId);
+                    orgApplicationManager.getSharedApplications(organizationId, applicationId);
             return Response.ok(createSharedApplicationsResponse(sharedApplications)).build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -384,7 +396,7 @@ public Response addOrganizationDiscoveryAttributes(OrganizationDiscoveryPostRequ
                                                                organizationDiscoveryPostRequest) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .addOrganizationDiscoveryAttributes(organizationDiscoveryPostRequest.getOrganizationId(),
                             getOrgDiscoveryAttributesFromPostRequest(organizationDiscoveryPostRequest), true);
             String organizationId = organizationDiscoveryPostRequest.getOrganizationId();
@@ -406,7 +418,7 @@ public Response addOrganizationDiscoveryAttributes(OrganizationDiscoveryPostRequ
     public Response getOrganizationDiscoveryAttributes(String organizationId) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .getOrganizationDiscoveryAttributes(organizationId, true);
             return Response.ok().entity(getOrganizationDiscoveryAttributesResponse(orgDiscoveryAttributeList)).build();
         } catch (OrganizationManagementClientException e) {
@@ -428,7 +440,7 @@ public Response updateOrganizationDiscoveryAttributes(String organizationId, Org
             organizationDiscoveryAttributes) {
 
         try {
-            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = getOrganizationDiscoveryManager()
+            List<OrgDiscoveryAttribute> orgDiscoveryAttributeList = organizationDiscoveryManager
                     .updateOrganizationDiscoveryAttributes(organizationId,
                             getOrgDiscoveryAttributesFromPutRequest(organizationDiscoveryAttributes), true);
             return Response.ok().entity(getOrganizationDiscoveryAttributesResponse(orgDiscoveryAttributeList)).build();
@@ -448,7 +460,7 @@ public Response updateOrganizationDiscoveryAttributes(String organizationId, Org
     public Response deleteOrganizationDiscoveryAttributes(String organizationId) {
 
         try {
-            getOrganizationDiscoveryManager().deleteOrganizationDiscoveryAttributes(organizationId, true);
+            organizationDiscoveryManager.deleteOrganizationDiscoveryAttributes(organizationId, true);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return OrganizationManagementEndpointUtil.handleClientErrorResponse(e, LOG);
@@ -468,7 +480,7 @@ public Response deleteOrganizationDiscoveryAttributes(String organizationId) {
     public Response getOrganizationsDiscoveryAttributes(String filter, Integer offset, Integer limit) {
 
         try {
-            DiscoveryOrganizationsResult discoveryOrganizationsResult = getOrganizationDiscoveryManager()
+            DiscoveryOrganizationsResult discoveryOrganizationsResult = organizationDiscoveryManager
                     .getOrganizationsDiscoveryAttributes(limit, offset, filter);
             OrganizationsDiscoveryResponse response = new OrganizationsDiscoveryResponse();
             List<OrganizationDiscovery> organizationsDiscoveryAttributes = discoveryOrganizationsResult
@@ -516,7 +528,7 @@ public Response isDiscoveryAttributeAvailable(OrganizationDiscoveryCheckPOSTRequ
                                                           organizationDiscoveryCheckPOSTRequest) {
 
         try {
-            boolean discoveryAttributeValueAvailable = getOrganizationDiscoveryManager()
+            boolean discoveryAttributeValueAvailable = organizationDiscoveryManager
                     .isDiscoveryAttributeValueAvailable(organizationDiscoveryCheckPOSTRequest.getType(),
                             organizationDiscoveryCheckPOSTRequest.getValue());
             OrganizationDiscoveryCheckPOSTResponse organizationDiscoveryCheckPOSTResponse =
@@ -538,8 +550,8 @@ public Response isDiscoveryAttributeAvailable(OrganizationDiscoveryCheckPOSTRequ
     public Response getOrganizationMetadata() {
 
         try {
-            Organization organization = getOrganizationManager().getOrganization(getOrganizationId(), false, true);
-            List<OrgDiscoveryAttribute> organizationDiscoveryAttributes = getOrganizationDiscoveryManager()
+            Organization organization = organizationManager.getOrganization(getOrganizationId(), false, true);
+            List<OrgDiscoveryAttribute> organizationDiscoveryAttributes = organizationDiscoveryManager
                     .getOrganizationDiscoveryAttributes(getOrganizationId(), false);
             return Response.ok().entity(getOrganizationMetadataResponse(organization, organizationDiscoveryAttributes))
                     .build();
@@ -566,7 +578,7 @@ public Response getOrganizationsMetaAttributes(String filter, Integer limit, Str
         try {
             limit = validateLimit(limit);
             String sortOrder = StringUtils.isNotBlank(before) ? DESC_SORT_ORDER : ASC_SORT_ORDER;
-            List<String> metaAttributes = getOrganizationManager().getOrganizationsMetaAttributes(limit + 1, after,
+            List<String> metaAttributes = organizationManager.getOrganizationsMetaAttributes(limit + 1, after,
                     before, sortOrder, filter, Boolean.TRUE.equals(recursive));
             return Response.ok().entity(getMetaAttributesResponse(limit, after, before, filter, metaAttributes,
                     Boolean.TRUE.equals(recursive))).build();
@@ -803,7 +815,7 @@ private OrganizationsResponse getOrganizationsResponse(Integer limit, String aft
     private Organization getUpdatedOrganization(String organizationId, OrganizationPUTRequest organizationPUTRequest)
             throws OrganizationManagementException {
 
-        Organization oldOrganization = getOrganizationManager().getOrganization(organizationId, false, false);
+        Organization oldOrganization = organizationManager.getOrganization(organizationId, false, false);
         String currentOrganizationName = oldOrganization.getName();
         Organization organization = createOrganizationClone(oldOrganization);
 
@@ -827,7 +839,7 @@ private Organization getUpdatedOrganization(String organizationId, OrganizationP
         } else {
             organization.setAttributes(null);
         }
-        return getOrganizationManager().updateOrganization(organizationId, currentOrganizationName, organization);
+        return organizationManager.updateOrganization(organizationId, currentOrganizationName, organization);
     }
 
     private Organization createOrganizationClone(Organization organization) {
@@ -1005,19 +1017,4 @@ private MetaAttributesResponse getMetaAttributesResponse(Integer limit, String a
         }
         return metaAttributesResponse;
     }
-
-    private OrganizationManager getOrganizationManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().getOrganizationManager();
-    }
-
-    private OrgApplicationManager getOrgApplicationManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().getOrgApplicationManager();
-    }
-
-    private OrganizationDiscoveryManager getOrganizationDiscoveryManager() {
-
-        return OrganizationManagementServiceHolder.getInstance().getOrganizationDiscoveryManager();
-    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/resources/META-INF/cxf/org-mgt-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/resources/META-INF/cxf/org-mgt-server-v1-cxf.xml
deleted file mode 100644
index f2dd110f24..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/src/main/resources/META-INF/cxf/org-mgt-server-v1-cxf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
-  ~
-  ~ WSO2 LLC. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.server.organization.management.v1.impl.OrganizationsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.organization.management.v1.service.OrganizationManagementService"/>
-    <bean id="OrgMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.management.common.factory.OrganizationManagementOSGIServiceFactory"/>
-    <bean id="OrgApplicationMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.management.common.factory.OrgApplicationManagerOSGIServiceFactory"/>
-    <bean id="OrgDiscoveryMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.management.common.factory.OrganizationDiscoveryManagementOSGIServiceFactory"/>
-    <bean id="OrganizationManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.organization.management.common.OrganizationManagementServiceHolder">
-        <property name="organizationManager" ref="OrgMgtServiceFactoryBean"/>
-        <property name="orgApplicationManager" ref="OrgApplicationMgtServiceFactoryBean"/>
-        <property name="organizationDiscoveryManager" ref="OrgDiscoveryMgtServiceFactoryBean"/>
-    </bean>
-</beans>

From eec3a51e1a4863bc964d504f75eefa69fe05364c Mon Sep 17 00:00:00 2001
From: Lashini Jayasekara <30428591+lashinijay@users.noreply.github.com>
Date: Sat, 25 Jan 2025 14:32:25 +0530
Subject: [PATCH 09/15] [Spring Cleanup] Remove Spring dependencies in the
 organization roles management API (#814)

* [Spring Cleanup] Remove Spring dependencies in the organization roles management API
---
 .../pom.xml                                   |  5 --
 ...ganizationRoleManagementServiceHolder.java | 47 ++++-----------
 ...ationRoleManagementOSGIServiceFactory.java | 53 -----------------
 ...serResidentResolverOSGIServiceFactory.java | 56 ------------------
 .../pom.xml                                   |  5 --
 .../role/management/v1/OrganizationsApi.java  | 11 ++--
 .../OrganizationsApiServiceFactory.java       | 16 +++--
 .../RoleManagementServiceFactory.java         | 59 +++++++++++++++++++
 .../v1/impl/OrganizationsApiServiceImpl.java  | 14 ++++-
 .../v1/service/RoleManagementService.java     | 32 ++++++----
 .../v1/util/RoleManagementEndpointUtils.java  |  4 +-
 .../cxf/org-role-mgt-server-v1-cxf.xml        | 34 -----------
 12 files changed, 124 insertions(+), 212 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index d75cfa3ecb..76925cd598 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -30,11 +30,6 @@
     <artifactId>org.wso2.carbon.identity.api.server.organization.role.management.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.organization.management</groupId>
             <artifactId>org.wso2.carbon.identity.organization.management.role.management.service</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java
index 8057d94bec..e1f85c9da9 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.organization.role.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
 import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
 
@@ -26,19 +27,19 @@
  */
 public class OrganizationRoleManagementServiceHolder {
 
-    private static OrganizationRoleManagementServiceHolder instance = new OrganizationRoleManagementServiceHolder();
+    private OrganizationRoleManagementServiceHolder() {}
 
-    private RoleManager roleManager;
-
-    private OrganizationUserResidentResolverService organizationUserResidentResolverService;
-
-    private OrganizationRoleManagementServiceHolder() {
+    private static class RoleManagerServiceHolder {
 
+        static final RoleManager SERVICE = (RoleManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(RoleManager.class, null);
     }
 
-    public static OrganizationRoleManagementServiceHolder getInstance() {
+    private static class OrganizationUserResidentResolverServiceHolder {
 
-        return instance;
+        static final OrganizationUserResidentResolverService SERVICE =
+                (OrganizationUserResidentResolverService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrganizationUserResidentResolverService.class, null);
     }
 
     /**
@@ -46,19 +47,9 @@ public static OrganizationRoleManagementServiceHolder getInstance() {
      *
      * @return RoleManager.
      */
-    public RoleManager getRoleManager() {
-
-        return OrganizationRoleManagementServiceHolder.getInstance().roleManager;
-    }
-
-    /**
-     * Set RoleManager OSGi service.
-     *
-     * @param roleManager RoleManager.
-     */
-    public void setRoleManager(RoleManager roleManager) {
+    public static RoleManager getRoleManager() {
 
-        OrganizationRoleManagementServiceHolder.getInstance().roleManager = roleManager;
+        return RoleManagerServiceHolder.SERVICE;
     }
 
     /**
@@ -66,20 +57,8 @@ public void setRoleManager(RoleManager roleManager) {
      *
      * @return OrganizationUserResidentResolverService.
      */
-    public OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
-
-        return OrganizationRoleManagementServiceHolder.getInstance().organizationUserResidentResolverService;
-    }
-
-    /**
-     * Set OrganizationUserResidentResolverService OSGi service.
-     *
-     * @param organizationUserResidentResolverService OrganizationUserResidentResolverService.
-     */
-    public void setOrganizationUserResidentResolverService(
-            OrganizationUserResidentResolverService organizationUserResidentResolverService) {
+    public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        OrganizationRoleManagementServiceHolder.getInstance().organizationUserResidentResolverService
-                = organizationUserResidentResolverService;
+        return OrganizationUserResidentResolverServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java
deleted file mode 100644
index cd7a5f33c7..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.role.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RoleManager type of object inside the container.
- */
-public class OrganizationRoleManagementOSGIServiceFactory extends AbstractFactoryBean<RoleManager> {
-
-    private RoleManager roleManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RoleManager createInstance() throws Exception {
-
-        if (this.roleManager == null) {
-            RoleManager service = (RoleManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(RoleManager.class, null);
-            if (service != null) {
-                this.roleManager = service;
-            } else {
-                throw new Exception("Unable to retrieve RoleManager service.");
-            }
-        }
-        return this.roleManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
deleted file mode 100644
index 2e0f3eacd4..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.role.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationUserResidentResolverService type of object inside the container.
- */
-public class OrganizationUserResidentResolverOSGIServiceFactory extends
-        AbstractFactoryBean<OrganizationUserResidentResolverService> {
-
-    private OrganizationUserResidentResolverService organizationUserResidentResolverService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrganizationUserResidentResolverService createInstance() throws Exception {
-
-        if (this.organizationUserResidentResolverService == null) {
-            OrganizationUserResidentResolverService service =
-                    (OrganizationUserResidentResolverService) PrivilegedCarbonContext.
-                            getThreadLocalCarbonContext()
-                            .getOSGiService(OrganizationUserResidentResolverService.class, null);
-            if (service != null) {
-                this.organizationUserResidentResolverService = service;
-            } else {
-                throw new Exception("Unable to retrieve OrganizationUserResidentResolverService service.");
-            }
-        }
-        return this.organizationUserResidentResolverService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index c1c42e0c60..33be49e3e7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java
index 0e28659331..2bb8a17a96 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.api.server.organization.role.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.factories.OrganizationsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RoleGetResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RoleObj;
@@ -34,7 +34,6 @@
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolesListResponse;
-import org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -48,8 +47,12 @@
 
 public class OrganizationsApi  {
 
-    @Autowired
-    private OrganizationsApiService delegate;
+    private final OrganizationsApiService delegate;
+
+    public OrganizationsApi() {
+
+        this.delegate = OrganizationsApiServiceFactory.getOrganizationsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java
index 941cd276ba..2a62454ca7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApiService;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.impl.OrganizationsApiServiceImpl;
 
+/**
+ * Factory class for OrganizationsApiService.
+ */
 public class OrganizationsApiServiceFactory {
 
-   private final static OrganizationsApiService service = new OrganizationsApiServiceImpl();
+   private static final OrganizationsApiService SERVICE = new OrganizationsApiServiceImpl();
+
+   /**
+    * Get OrganizationsApiService.
+    *
+    * @return OrganizationsApiService.
+    */
+   public static OrganizationsApiService getOrganizationsApi() {
 
-   public static OrganizationsApiService getOrganizationsApi()
-   {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
new file mode 100644
index 0000000000..4f6dae8ac3
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.role.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.organization.role.management.common.OrganizationRoleManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.service.RoleManagementService;
+import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
+import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
+
+/**
+ * Factory class for RoleManagementService.
+ */
+public class RoleManagementServiceFactory {
+
+    private static final RoleManagementService SERVICE;
+
+    static {
+        RoleManager roleManager = OrganizationRoleManagementServiceHolder.getRoleManager();
+        OrganizationUserResidentResolverService organizationUserResidentResolverService =
+                OrganizationRoleManagementServiceHolder.getOrganizationUserResidentResolverService();
+
+        if (roleManager == null) {
+            throw new IllegalStateException("RoleManager service is not available from OSGi context.");
+        }
+
+        if (organizationUserResidentResolverService == null) {
+            throw new IllegalStateException("OrganizationUserResidentResolverService is not available " +
+                    "from OSGi context.");
+        }
+
+        SERVICE = new RoleManagementService(roleManager, organizationUserResidentResolverService);
+    }
+
+    /**
+     * Get RoleManagementService.
+     *
+     * @return RoleManagementService.
+     */
+    public static RoleManagementService getRoleManagementService() {
+    
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java
index 5066d050f4..d61505ba32 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java
@@ -18,8 +18,8 @@
 
 package org.wso2.carbon.identity.api.server.organization.role.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApiService;
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.factories.RoleManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePatchRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePostRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutRequest;
@@ -32,8 +32,16 @@
  */
 public class OrganizationsApiServiceImpl implements OrganizationsApiService {
 
-    @Autowired
-    private RoleManagementService roleManagementService;
+    private final RoleManagementService roleManagementService;
+
+    public OrganizationsApiServiceImpl() {
+
+        try {
+            this.roleManagementService = RoleManagementServiceFactory.getRoleManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating role management service.", e);
+        }
+    }
 
     @Override
     public Response createRole(String organizationId, RolePostRequest rolePostRequest) {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java
index f8bbfc88da..f83e3dfa4b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java
@@ -43,11 +43,13 @@
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolesListResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.util.RoleManagementEndpointUtils;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.Group;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.PatchOperation;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.Role;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.RolesResponse;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.User;
+import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementClientException;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
 
@@ -76,8 +78,18 @@
  */
 public class RoleManagementService {
 
+    private final RoleManager roleManager;
+    private final OrganizationUserResidentResolverService organizationUserResidentResolverService;
+
     private static final Log LOG = LogFactory.getLog(RoleManagementService.class);
 
+    public RoleManagementService(RoleManager roleManager,
+                                 OrganizationUserResidentResolverService organizationUserResidentResolverService) {
+
+        this.roleManager = roleManager;
+        this.organizationUserResidentResolverService = organizationUserResidentResolverService;
+    }
+
     /**
      * Service for creating a role inside an organization.
      *
@@ -88,7 +100,7 @@ public class RoleManagementService {
     public Response createRole(String organizationId, RolePostRequest rolePostRequest) {
 
         try {
-            Role role = RoleManagementEndpointUtils.getRoleManager().createRole(organizationId,
+            Role role = roleManager.createRole(organizationId,
                     generateRoleFromPostRequest(rolePostRequest));
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, role.getId(),
                     RoleManagementEndpointConstants.ROLE_PATH,
@@ -111,7 +123,7 @@ public Response createRole(String organizationId, RolePostRequest rolePostReques
     public Response deleteRole(String organizationId, String roleId) {
 
         try {
-            RoleManagementEndpointUtils.getRoleManager().deleteRole(organizationId, roleId);
+            roleManager.deleteRole(organizationId, roleId);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -130,7 +142,7 @@ public Response deleteRole(String organizationId, String roleId) {
     public Response getRoleUsingOrganizationIdAndRoleId(String organizationId, String roleId) {
 
         try {
-            Role role = RoleManagementEndpointUtils.getRoleManager().getRoleById(organizationId, roleId);
+            Role role = roleManager.getRoleById(organizationId, roleId);
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, roleId,
                     RoleManagementEndpointConstants.ROLE_PATH,
                     ERROR_CODE_ERROR_BUILDING_ROLE_URI);
@@ -155,8 +167,7 @@ public Response getRolesOfOrganization(String organizationId, String filter, Int
 
         try {
             int limitValue = validateCount(count);
-            RolesResponse rolesResponse = RoleManagementEndpointUtils.getRoleManager()
-                    .getOrganizationRoles(limitValue, filter, organizationId, cursor);
+            RolesResponse rolesResponse = roleManager.getOrganizationRoles(limitValue, filter, organizationId, cursor);
             return Response.ok().entity(getRoleListResponse(organizationId, rolesResponse)).build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -175,8 +186,7 @@ public Response getRolesOfOrganization(String organizationId, String filter, Int
     public Response getUserRolesOfOrganization(String organizationId, String userId) {
 
         try {
-            String userResidentOrgId = String.valueOf(RoleManagementEndpointUtils
-                    .getOrganizationUserResidentResolverService()
+            String userResidentOrgId = String.valueOf(organizationUserResidentResolverService
                     .resolveResidentOrganization(userId, organizationId)
                     .orElseThrow(() -> handleClientException(ERROR_CODE_USER_ROOT_ORGANIZATION_NOT_FOUND, userId)));
             if (!StringUtils.equals(userResidentOrgId, organizationId)) {
@@ -184,8 +194,7 @@ public Response getUserRolesOfOrganization(String organizationId, String userId)
                         (ERROR_CODE_ERROR_WHILE_RESOLVING_USER_FROM_RESIDENT_ORG, userResidentOrgId, organizationId);
             }
 
-            List<Role> userRolesResponse = RoleManagementEndpointUtils.getRoleManager()
-                    .getUserOrganizationRoles(userId, organizationId);
+            List<Role> userRolesResponse = roleManager.getUserOrganizationRoles(userId, organizationId);
             return Response.ok().entity(getUserRoleListResponse(organizationId, userRolesResponse)).build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -226,8 +235,7 @@ public Response patchRole(String organizationId, String roleId, RolePatchRequest
                     throw handleClientException(ERROR_CODE_PATCH_VALUE_EMPTY);
                 }
             }
-            Role role = RoleManagementEndpointUtils.getRoleManager().patchRole(organizationId, roleId,
-                    patchOperations);
+            Role role = roleManager.patchRole(organizationId, roleId, patchOperations);
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, roleId,
                     RoleManagementEndpointConstants.ROLE_PATH,
                     ERROR_CODE_ERROR_BUILDING_ROLE_URI);
@@ -258,7 +266,7 @@ public Response putRole(String organizationId, String roleId, RolePutRequest rol
             List<RolePutRequestGroup> groups = rolePutRequest.getGroups();
             List<String> permissions = rolePutRequest.getPermissions();
 
-            Role role = RoleManagementEndpointUtils.getRoleManager().putRole(organizationId, roleId,
+            Role role = roleManager.putRole(organizationId, roleId,
                     new Role(roleId, displayName,
                             (groups == null ? Collections.emptyList() : groups.stream().map(group ->
                                     new Group(group.getValue())).collect(Collectors.toList())),
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java
index dfc57c5c40..a08922d906 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java
@@ -58,7 +58,7 @@ public class RoleManagementEndpointUtils {
      */
     public static RoleManager getRoleManager() {
 
-        return OrganizationRoleManagementServiceHolder.getInstance().getRoleManager();
+        return OrganizationRoleManagementServiceHolder.getRoleManager();
     }
 
     /**
@@ -66,7 +66,7 @@ public static RoleManager getRoleManager() {
      */
     public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        return OrganizationRoleManagementServiceHolder.getInstance().getOrganizationUserResidentResolverService();
+        return OrganizationRoleManagementServiceHolder.getOrganizationUserResidentResolverService();
     }
 
     /**
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml
deleted file mode 100644
index 0e2705cf42..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
-  ~
-  ~ WSO2 LLC. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.server.organization.role.management.v1.impl.OrganizationsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.organization.role.management.v1.service.RoleManagementService"/>
-    <bean id="OrganizationUserResidentResolverServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.role.management.common.factory.OrganizationUserResidentResolverOSGIServiceFactory"/>
-    <bean id="RoleMgtServiceFactoryBean" class="org.wso2.carbon.identity.api.server.organization.role.management.common.factory.OrganizationRoleManagementOSGIServiceFactory"/>
-    <bean id="RoleManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.organization.role.management.common.OrganizationRoleManagementServiceHolder">
-        <property name="organizationUserResidentResolverService" ref="OrganizationUserResidentResolverServiceFactoryBean"/>
-        <property name="roleManager" ref="RoleMgtServiceFactoryBean"/>
-    </bean>
-</beans>

From 1939b7529b4688b8227db48bacee943c1a4307e9 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 09:08:40 +0000
Subject: [PATCH 10/15] [WSO2 Release] [Jenkins #1268] [Release 1.3.47] prepare
 release v1.3.47

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 8beec0a89b..d6a63e8d92 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 463f884a5e..ee5b127305 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index e8eb10910e..da4a409567 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index b314d15a3f..96f6cdfadd 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 8494ada74c..56947a9fef 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index bdaade7811..ec9b764660 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index 8b68c88b55..94b03e933b 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index 5d85088564..a0ce5ded1f 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index bd6869e611..59db45075f 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 4513e6344d..9de900e0f4 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 0664fc1a55..05b74a338f 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 735b9dd04a..17153765a3 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 6141e3899e..164b08cdec 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 67628e5aaa..c12d148e4e 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 8a69f72f2d..7ff6b5b457 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 707377beca..f733da4dd1 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.47-SNAPSHOT</version>
+    <version>1.3.47</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index bd81f05c77..f9a8e0d50b 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.47-SNAPSHOT</version>
+    <version>1.3.47</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 42db9643de..7853a197ac 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.47-SNAPSHOT</version>
+    <version>1.3.47</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 96c90b7b97..79cf53a370 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index e14da002cf..817bb97ad8 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 8d80a5a42c..7105e3e244 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 4dd688e955..fb836a1d6b 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index aedd1caadb..8cb36456be 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index f244a62d6e..26ebcdfd8e 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index de90caf9e3..f2cac5e220 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 88a26bdc87..7f650986c7 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 814fa621f7..679810f024 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 5089ce461a..be3e02728c 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index f6bbe5ae13..62f0f42a5b 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index f64990d471..22ca45a02e 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 7b87ff1e58..c2b2682cfb 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index ea048c3c68..c3d64e2fa8 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 63300268fa..f0b45fff8a 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 03b348f880..67c05042ba 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 417e5aea29..134474c582 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 1fd324a743..226e6e13eb 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 50900810dc..1f08886c7c 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index c1149e6d2c..9364eac045 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 7d5a07d5f9..4e31839baf 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index e8978e69a1..ce2d467f18 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 74afea25de..80148e7be5 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index e140e69426..1c844f0a5b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index d26e13831a..dbf2db496b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 19559b635b..1927fcada5 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 7fc8e95b68..bc6e8cac26 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 002ea471d9..459ae76ebb 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index ccfd482261..37e637d544 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 121b3d6b30..2be85b99d8 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 77b2b4526d..db98d270ed 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 7bbfdbc7c7..2461af5268 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 11a450c7ad..efe5716de6 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 783719ed93..bca73e2a02 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.47-SNAPSHOT</version>
+    <version>1.3.47</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 6db49b6157..1c46959a5d 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index c465026c11..4faf3192dd 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 5d0db19fee..661b5ae766 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index f60f6cd2f7..99285f1962 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index ffa243673e..9bcd2f5978 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 209c857856..cfcc1c4a4b 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 037fae90af..403633a327 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 9151d636b6..cf9b56abcd 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index 9f32da979f..23128b1ad0 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index 07deb6306e..614e2e3a44 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 55e3d0dc4a..90355cfc92 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 5f5e7e4371..766c214d62 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 4995170c93..c0a70a0e63 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index ab4bd38388..daabb17363 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index db477eb27c..2309a90961 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 2b614c9026..78e3f3e593 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 763d4b1d89..2a3486a365 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index d90ea8b102..2d1082692c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index d484cf16d1..b1a9c52750 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index d75cfa3ecb..574db35b64 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index c1c42e0c60..7818816311 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index b433c6eb0d..2ae225b001 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 19f29b8a82..665ec3cade 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 72cd3fde99..84941c424c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index c5bbeb8964..1d4361272b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index d4ddbcb964..5976d8fa54 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 9da9a3320a..c00c6b5d2e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 6f5ca0a2c4..8af00f499b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 215253bc9e..2ba34985af 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index c964c9f1b8..4411f4b955 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index cef1d5ae06..42a7a1a24f 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 9abb4a902f..0f514af3a5 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index 69a241cde5..73ad952cd7 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 15ffd378d2..4bc3ab6573 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 96355e3807..6d0b783430 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 43cfcb2449..313df601e6 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index c7b5501849..51a865ff16 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 368164e2c3..c64574952f 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 386f324529..1574739a38 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 57b05fc6bc..f4ff9354ab 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 61ac538493..a4584f6564 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index c244c4873a..3fae9a5f88 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index dcd3fc138c..48e533c3f8 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 2ebe38f776..ffc00d5470 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 87828d2bd9..305c8356f0 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 9156d9cc00..4a77dd6d1e 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47-SNAPSHOT</version>
+        <version>1.3.47</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index fb9d419102..cb824657b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.47-SNAPSHOT</version>
+    <version>1.3.47</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.3.47</tag>
     </scm>
 
 

From 926417a071888476568cdd48b4ddf9b8564b731b Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 09:08:43 +0000
Subject: [PATCH 11/15] [WSO2 Release] [Jenkins #1268] [Release 1.3.47] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index d6a63e8d92..c91e2e217b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index ee5b127305..0cc76bb52f 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index da4a409567..751bbd2907 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 96f6cdfadd..e9dbb5b92a 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 56947a9fef..e3dc546105 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index ec9b764660..70c65dc0b8 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index 94b03e933b..c5aec5411a 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index a0ce5ded1f..bc62af50b0 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index 59db45075f..e0e51c5060 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 9de900e0f4..1fca958dd5 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 05b74a338f..951ee8efd9 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 17153765a3..f42767be83 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 164b08cdec..0ba94eef06 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index c12d148e4e..3b10a7c31e 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 7ff6b5b457..c69eda4ea6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index f733da4dd1..15be51e65a 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.47</version>
+    <version>1.3.48-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index f9a8e0d50b..cc9fb6a17b 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.47</version>
+    <version>1.3.48-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 7853a197ac..3d780ab9fe 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.47</version>
+    <version>1.3.48-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 79cf53a370..8619e44261 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 817bb97ad8..3a1e5ed5b5 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 7105e3e244..9776786db4 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index fb836a1d6b..a3685809a7 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 8cb36456be..bb6e746880 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 26ebcdfd8e..4b82a8fedf 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index f2cac5e220..69b93d5a96 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 7f650986c7..ea9f11989e 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 679810f024..1d4ab65712 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index be3e02728c..a7a4d03c4d 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 62f0f42a5b..1faed4bf9b 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 22ca45a02e..9c596aa9b3 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index c2b2682cfb..5d611d81d7 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index c3d64e2fa8..3278d8d944 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index f0b45fff8a..7de83bbcfc 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 67c05042ba..074ebc19e7 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 134474c582..1b0fdaa466 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 226e6e13eb..255dff5a2d 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 1f08886c7c..655554ca5d 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 9364eac045..7fce110e68 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 4e31839baf..e22d41d2b9 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index ce2d467f18..bdd70faa09 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 80148e7be5..9a04236918 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 1c844f0a5b..35733988f5 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index dbf2db496b..d20e45ccd1 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 1927fcada5..6feb1bbe08 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index bc6e8cac26..8f0e457333 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 459ae76ebb..0e6746a68c 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 37e637d544..13313ca91b 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 2be85b99d8..9181343810 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index db98d270ed..d99ab538a7 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 2461af5268..515e1cfe30 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index efe5716de6..234c1ef04e 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index bca73e2a02..6f9b813701 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.47</version>
+    <version>1.3.48-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 1c46959a5d..cbd0fd99ab 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 4faf3192dd..2906a107a2 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 661b5ae766..6b2038d12f 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 99285f1962..0e3390425f 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 9bcd2f5978..21979d45d3 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index cfcc1c4a4b..4b9343de40 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 403633a327..efbc281239 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index cf9b56abcd..326b825f4a 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index 23128b1ad0..0b63be6b86 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index 614e2e3a44..e9d272155b 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 90355cfc92..2306872146 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 766c214d62..4501e32341 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index c0a70a0e63..84a3d1480e 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index daabb17363..e9829c1fd3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index 2309a90961..7b7f56eda7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 78e3f3e593..760b8c676a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 2a3486a365..e4a5bbdf6c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 2d1082692c..7a0ffa0852 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index b1a9c52750..6790321b9a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 574db35b64..8dcbe2b00a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 7818816311..9c51560997 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 2ae225b001..b34e1637a3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 665ec3cade..69d313931b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 84941c424c..084acd9dba 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 1d4361272b..157c603c6d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 5976d8fa54..a804302420 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index c00c6b5d2e..99b88c103e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 8af00f499b..695b081bbe 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 2ba34985af..997343d796 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 4411f4b955..d3b561ab39 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 42a7a1a24f..bf7d032497 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 0f514af3a5..504140e7fd 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index 73ad952cd7..e7eb89bc3c 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 4bc3ab6573..ad11f27827 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 6d0b783430..525ab85884 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 313df601e6..58301684b7 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 51a865ff16..d5abed13c4 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index c64574952f..98daa3d740 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 1574739a38..edefeb9aab 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index f4ff9354ab..9fef194782 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index a4584f6564..12097317de 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 3fae9a5f88..2ad428d60d 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 48e533c3f8..541f565d37 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index ffc00d5470..7c6c1509e9 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 305c8356f0..19cfc56c13 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 4a77dd6d1e..b247a68ce1 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.47</version>
+        <version>1.3.48-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index cb824657b8..27a734ad53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.47</version>
+    <version>1.3.48-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.3.47</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From 9d46707af3f0bd09a3e7cffd879e161124bb4a94 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 09:29:57 +0000
Subject: [PATCH 12/15] [WSO2 Release] [Jenkins #1269] [Release 1.3.48] prepare
 release v1.3.48

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index c91e2e217b..a0d8cbeec6 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 0cc76bb52f..bca9ed9313 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 751bbd2907..70bef879c9 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index e9dbb5b92a..ab0183281a 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index e3dc546105..307ebfa5a1 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 70c65dc0b8..6cd2439fe3 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index c5aec5411a..c1d1a322aa 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index bc62af50b0..ecbaeb363b 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index e0e51c5060..cbc8c3bf14 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 1fca958dd5..57a826d23a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 951ee8efd9..9b3d6f69c6 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index f42767be83..e5e7e30ac5 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 0ba94eef06..59f56d76e6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 3b10a7c31e..869285e0d2 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index c69eda4ea6..fc9af70574 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 15be51e65a..6e3c9faedd 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.48-SNAPSHOT</version>
+    <version>1.3.48</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index cc9fb6a17b..483f877f7b 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.48-SNAPSHOT</version>
+    <version>1.3.48</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 3d780ab9fe..cf3557c6dd 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.48-SNAPSHOT</version>
+    <version>1.3.48</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 8619e44261..7f910d6736 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 3a1e5ed5b5..ccbea56e6c 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 9776786db4..711d00f1e4 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index a3685809a7..72f4873041 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index bb6e746880..0b2d967c74 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 4b82a8fedf..e9e77d0994 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 69b93d5a96..d5a7a71357 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index ea9f11989e..bf6627d5b0 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 1d4ab65712..68b67d01af 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index a7a4d03c4d..eb1b8591b4 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 1faed4bf9b..32087f55e1 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 9c596aa9b3..4c65e61bc5 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 5d611d81d7..3f5b41c76a 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 3278d8d944..a18d8dae5f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 7de83bbcfc..15449ce07a 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 074ebc19e7..1dcdc02a1b 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 1b0fdaa466..e98f796089 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 255dff5a2d..8b2aab2238 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 655554ca5d..5c69135e69 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 7fce110e68..712dd4ab64 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index e22d41d2b9..865742dd50 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index bdd70faa09..265cdb87b8 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 9a04236918..7a5814df57 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 35733988f5..0c6ce67b53 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index d20e45ccd1..3d1bf68aaa 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 6feb1bbe08..fe90d15ff1 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 8f0e457333..edcbef36a0 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 0e6746a68c..9e846df584 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 13313ca91b..5c59537828 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 9181343810..e4a14cdb88 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index d99ab538a7..289df9996b 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 515e1cfe30..daf9a392fc 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 234c1ef04e..6a32f9ef79 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 6f9b813701..4f66d21b03 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.48-SNAPSHOT</version>
+    <version>1.3.48</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index cbd0fd99ab..5578a9d585 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 2906a107a2..7c638ceaee 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 6b2038d12f..23ab49db20 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 0e3390425f..2d84eeba93 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 21979d45d3..f8b87c48c8 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 4b9343de40..23a91e575f 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index efbc281239..100581dd19 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 326b825f4a..8f47eb197c 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index 0b63be6b86..d8f2496345 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index e9d272155b..e2a1233699 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 2306872146..6b2aa3d1b7 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 4501e32341..825383a5b5 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 84a3d1480e..96b2110ca2 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index e9829c1fd3..afd04c7bd0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index 7b7f56eda7..d3324ae5a7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 760b8c676a..25a8cb7509 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index e4a5bbdf6c..a5361d0e9c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 7a0ffa0852..d5d63bbc95 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 6790321b9a..2d50c356a3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 97f242ba7e..0d24b9e72f 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 71432d7345..5dd9455bde 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index b34e1637a3..f97ee85d8a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 69d313931b..85421d8c91 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 084acd9dba..b0085afa3a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 157c603c6d..1b391fce76 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index a804302420..85524f6b06 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 99b88c103e..b6a64c3c92 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 695b081bbe..47319bde1d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 997343d796..95c2525423 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index d3b561ab39..6edb013ee6 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index bf7d032497..d76f87c079 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 504140e7fd..f63a743376 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index e7eb89bc3c..580e526460 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index ad11f27827..778ea34f87 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 525ab85884..ad05fdc2b7 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 58301684b7..bb66484290 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index d5abed13c4..5e7aeb4538 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 98daa3d740..c64f9132b7 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index edefeb9aab..420521d9eb 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 9fef194782..38c7251c57 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 12097317de..62cf4d77f4 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 2ad428d60d..3f5531b8f8 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 541f565d37..371b1445c6 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 7c6c1509e9..c6a647efd1 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 19cfc56c13..eecfecddf8 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index b247a68ce1..02ba9bd801 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48-SNAPSHOT</version>
+        <version>1.3.48</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 27a734ad53..aa776d468f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.48-SNAPSHOT</version>
+    <version>1.3.48</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.3.48</tag>
     </scm>
 
 

From df5b31949aabac90be83a78c8c78a629bedf165e Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 09:29:59 +0000
Subject: [PATCH 13/15] [WSO2 Release] [Jenkins #1269] [Release 1.3.48] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index a0d8cbeec6..ed5fd5b943 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index bca9ed9313..f05834b9ae 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 70bef879c9..33cfce940f 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index ab0183281a..d383d47181 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 307ebfa5a1..47ea186b57 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 6cd2439fe3..dce7143f33 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index c1d1a322aa..29d707c1b1 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index ecbaeb363b..076047197d 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index cbc8c3bf14..45cd317205 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 57a826d23a..b63692e883 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 9b3d6f69c6..4ad5298320 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index e5e7e30ac5..948e8c18a1 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 59f56d76e6..6a006035bc 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 869285e0d2..957243c226 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index fc9af70574..de74ce6ff7 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 6e3c9faedd..34580ff794 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.48</version>
+    <version>1.3.49-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 483f877f7b..0da58ff007 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.48</version>
+    <version>1.3.49-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index cf3557c6dd..73954f46e8 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.48</version>
+    <version>1.3.49-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 7f910d6736..2356634885 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index ccbea56e6c..435b3bcd2f 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 711d00f1e4..9ca3e2eb0a 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 72f4873041..621aa15dd8 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 0b2d967c74..44c5511ae5 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index e9e77d0994..1fdb8bbf58 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index d5a7a71357..366c5de9a1 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index bf6627d5b0..8b98a522be 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 68b67d01af..b526b0ca09 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index eb1b8591b4..cf15971dba 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 32087f55e1..fd20437667 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 4c65e61bc5..f92e022388 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 3f5b41c76a..8d45643847 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index a18d8dae5f..a3916d0294 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 15449ce07a..23d86b2ae0 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 1dcdc02a1b..2150ccf518 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index e98f796089..554fb5281b 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 8b2aab2238..7bfb8d0b55 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 5c69135e69..73cf3b8ad6 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 712dd4ab64..21e1f9d2fe 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 865742dd50..8279c5ab8b 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 265cdb87b8..abb79ab104 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 7a5814df57..87812680fd 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 0c6ce67b53..a7025c9517 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 3d1bf68aaa..f5871b97c9 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index fe90d15ff1..dcb2c107f7 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index edcbef36a0..bba9a78bd8 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 9e846df584..d0f2cc0a60 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 5c59537828..626fe79b83 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index e4a14cdb88..1b226915ec 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 289df9996b..33b1d2a00b 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index daf9a392fc..28d13037b9 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 6a32f9ef79..f5fda76134 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 4f66d21b03..81d7c2e022 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.48</version>
+    <version>1.3.49-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 5578a9d585..86483ebe2f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 7c638ceaee..602138be63 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 23ab49db20..23261830b3 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 2d84eeba93..20f201a1c7 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index f8b87c48c8..8c443756af 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 23a91e575f..1ae61ad690 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 100581dd19..437431072f 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 8f47eb197c..ec55f62941 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index d8f2496345..a35b2db025 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index e2a1233699..6b233fba79 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 6b2aa3d1b7..2e889cb2c6 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 825383a5b5..415be1610a 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 96b2110ca2..4c41b7f12c 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index afd04c7bd0..e92bbbb0f9 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index d3324ae5a7..d7339634d7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 25a8cb7509..8431f729d2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index a5361d0e9c..5f7c401b67 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index d5d63bbc95..f4f25419c7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 2d50c356a3..149b5a99da 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 0d24b9e72f..a8bba57df0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 5dd9455bde..c1f8f59daa 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index f97ee85d8a..d5d9b23a55 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 85421d8c91..c49a2ea74b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index b0085afa3a..88278eadcf 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 1b391fce76..7567afc755 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 85524f6b06..258df9f8fa 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index b6a64c3c92..ac8ad1cb42 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 47319bde1d..197b3889d8 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 95c2525423..6fc6ca52dd 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 6edb013ee6..90793187c1 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index d76f87c079..d88729fc81 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index f63a743376..7cb308f5e4 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index 580e526460..bdb0e007e5 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 778ea34f87..78b90c8e92 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index ad05fdc2b7..1442998994 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index bb66484290..c5b67b64e7 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 5e7aeb4538..a551f93c8d 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index c64f9132b7..918f8e9158 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 420521d9eb..0b0ee34e88 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 38c7251c57..6ddf768f03 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 62cf4d77f4..5ce0f39d16 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 3f5531b8f8..1909dac2a8 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 371b1445c6..619566e6ba 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index c6a647efd1..72a3632853 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index eecfecddf8..199d118371 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 02ba9bd801..6f64d8ce59 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.48</version>
+        <version>1.3.49-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index aa776d468f..1ad06fcf02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.48</version>
+    <version>1.3.49-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.3.48</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From 66aa99f61f01fba32093b7afd20a02bf3f23f793 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 11:18:01 +0000
Subject: [PATCH 14/15] [WSO2 Release] [Jenkins #1271] [Release 1.3.49] prepare
 release v1.3.49

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index ed5fd5b943..385d1a8e95 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index f05834b9ae..d5be8e287c 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 33cfce940f..13d93d8ae2 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index d383d47181..0958cbd29e 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 47ea186b57..3b304b745a 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index dce7143f33..85e0916eb1 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index 29d707c1b1..6c572ae82d 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index 076047197d..5c7bac2505 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index 45cd317205..206579ff4c 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index b63692e883..242ef3f1fd 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 4ad5298320..8ac0e1769c 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 948e8c18a1..0effc1f8fd 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 6a006035bc..ee2901a0e1 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 957243c226..894769a9e3 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index de74ce6ff7..f99b1138bd 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 34580ff794..0cc0a640bc 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.49-SNAPSHOT</version>
+    <version>1.3.49</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 0da58ff007..08fefd6ee4 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.49-SNAPSHOT</version>
+    <version>1.3.49</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 73954f46e8..5436acdcf4 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.49-SNAPSHOT</version>
+    <version>1.3.49</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 2356634885..54a2c5133f 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 435b3bcd2f..9d495d0ea4 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 9ca3e2eb0a..1dedb724e7 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 621aa15dd8..a4e31234b6 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 44c5511ae5..d798340272 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 1fdb8bbf58..79003d5d8d 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 366c5de9a1..895be81a28 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 8b98a522be..8a05261450 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index b526b0ca09..762a290c85 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index cf15971dba..174a7f1e68 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index fd20437667..869a38e5ab 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index f92e022388..d69ac17537 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 8d45643847..22c605a5e8 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index a3916d0294..72f0216d9f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 23d86b2ae0..df1e236c5b 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 2150ccf518..4fadc0f91b 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 554fb5281b..0d6ceb81b8 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 7bfb8d0b55..268b761078 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 73cf3b8ad6..720b48ab56 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 21e1f9d2fe..c675febb04 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 8279c5ab8b..8acb0c0ee3 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index abb79ab104..0e53c6f4b5 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 87812680fd..ee90c5d2ee 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index a7025c9517..a065ce9b1e 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index f5871b97c9..50d9f9e3de 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index dcb2c107f7..21f5aa2b4c 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index bba9a78bd8..409039893f 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index d0f2cc0a60..163aa95d3c 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 626fe79b83..4ee0a80a1c 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 1b226915ec..4fa45fcbe5 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 33b1d2a00b..ae8eb56fdf 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 28d13037b9..03b8c4db94 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index f5fda76134..5af889366a 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 81d7c2e022..34964412bc 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.49-SNAPSHOT</version>
+    <version>1.3.49</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 86483ebe2f..5e8daa8dfa 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 602138be63..3a1056b5a9 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 23261830b3..fb682934b3 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 20f201a1c7..5e55a61d4f 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 8c443756af..f3c40789ae 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 1ae61ad690..6f7199364d 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 437431072f..19b26a178f 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index ec55f62941..6c4fc58b9d 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index a35b2db025..da2c2d0777 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index 6b233fba79..db8b078657 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 2e889cb2c6..afd7e2bff6 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 415be1610a..3071294f16 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 4c41b7f12c..db8880042e 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index e92bbbb0f9..6b48906d15 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index d7339634d7..4a82287964 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 8431f729d2..ee3bc7b262 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 5f7c401b67..f6350346a8 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index f4f25419c7..4c131b0def 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 149b5a99da..a22229f124 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index a8bba57df0..a2662448d8 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index c1f8f59daa..4f610fe2f1 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index d5d9b23a55..788c56aa87 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index c49a2ea74b..fa212c638a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 88278eadcf..8be2ee04a2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 7567afc755..6d0bc6da85 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 258df9f8fa..2882c68ef0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index ac8ad1cb42..111a92797e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 197b3889d8..1b2c55f06c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 6fc6ca52dd..510c76dd6f 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 90793187c1..e5695b22f5 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index d88729fc81..b1f61eabb0 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 7cb308f5e4..748becbba4 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index bdb0e007e5..ee3c95c9e1 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 78b90c8e92..16166e45c4 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 1442998994..5d932844dd 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index c5b67b64e7..08a61d501a 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index a551f93c8d..718c47e697 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 918f8e9158..20096e5037 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 0b0ee34e88..ce9bdefedb 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 6ddf768f03..8645ec721e 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 5ce0f39d16..2b02699ef7 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 1909dac2a8..fc9a8da82d 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 619566e6ba..32c95c0728 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 72a3632853..2804eb112e 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 199d118371..8ca55c2771 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 6f64d8ce59..16014090af 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49-SNAPSHOT</version>
+        <version>1.3.49</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 1ad06fcf02..10babbdc33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.49-SNAPSHOT</version>
+    <version>1.3.49</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.3.49</tag>
     </scm>
 
 

From 6dec037a07f87277fabd5c64312d89cd30231316 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 25 Jan 2025 11:18:04 +0000
Subject: [PATCH 15/15] [WSO2 Release] [Jenkins #1271] [Release 1.3.49] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.rule.metadata/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 pom.xml                                                       | 4 ++--
 99 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 385d1a8e95..c7ca9655a6 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index d5be8e287c..dd08e0e2d7 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 13d93d8ae2..837142f80b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 0958cbd29e..83679297a2 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 3b304b745a..9fbbce788f 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 85e0916eb1..cc00919262 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
index 6c572ae82d..e112ba0862 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index 5c7bac2505..63ee88e8a6 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.action.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
index 206579ff4c..cb1711eb7e 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 242ef3f1fd..20c34c5eb1 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 8ac0e1769c..a312e556ab 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 0effc1f8fd..781633843a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index ee2901a0e1..9353972ba3 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 894769a9e3..da0c4894a6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index f99b1138bd..5b25d0c1c2 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 0cc0a640bc..6f9d7f78b2 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.3.49</version>
+    <version>1.3.50-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 08fefd6ee4..09d93aa897 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.3.49</version>
+    <version>1.3.50-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 5436acdcf4..e7733fda1a 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.3.49</version>
+    <version>1.3.50-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 54a2c5133f..69b07ae6de 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 9d495d0ea4..2b058ed130 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 1dedb724e7..19100294ce 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index a4e31234b6..5fa3e64f38 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index d798340272..ffc44f50ff 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 79003d5d8d..5c2a819500 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 895be81a28..6f8bd0141a 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 8a05261450..cd9ad193a7 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 762a290c85..132800658e 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 174a7f1e68..169cd22f32 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 869a38e5ab..3f104ae6b2 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index d69ac17537..cdc82cf017 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 22c605a5e8..de794b7f77 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 72f0216d9f..e131271a5f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index df1e236c5b..6b7c9be9e0 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 4fadc0f91b..c8eb404541 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 0d6ceb81b8..c9967cafb3 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 268b761078..e25f2dab79 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
index 720b48ab56..daf246983f 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index c675febb04..13e6bed8fa 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 8acb0c0ee3..85f82e1452 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 0e53c6f4b5..9f7d1ba915 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index ee90c5d2ee..cbd7d9ab1c 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index a065ce9b1e..ad83321ff5 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 50d9f9e3de..a651b6b6a7 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 21f5aa2b4c..6e1907d8be 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 409039893f..b004fc7d9a 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 163aa95d3c..d41864fabc 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 4ee0a80a1c..2ec961b06f 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 4fa45fcbe5..a65b8a89c1 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index ae8eb56fdf..0f10a90f47 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 03b8c4db94..64de9fd6bc 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 5af889366a..15572d8504 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 34964412bc..a6d09abe17 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.3.49</version>
+    <version>1.3.50-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 5e8daa8dfa..09e0ca8409 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 3a1056b5a9..1b5fe98187 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index fb682934b3..64b385cca4 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 5e55a61d4f..bf9e703a00 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index f3c40789ae..5d02e54b81 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 6f7199364d..9006fe2549 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 19b26a178f..e3e115b097 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
index 6c4fc58b9d..3dfed19281 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.api.server.notification.template.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
index da2c2d0777..fb5aa6e6bd 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/org.wso2.carbon.identity.rest.api.server.notification.template.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.notification.template</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
index db8b078657..9aadf1f962 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index afd7e2bff6..3deab25f20 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 3071294f16..b5c8e84416 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index db8880042e..ff2cf617c4 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index 6b48906d15..64c91cea58 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index 4a82287964..ce55fd6a42 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index ee3bc7b262..aee0d358e5 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index f6350346a8..dc32be59e0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 4c131b0def..145ebe104b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index a22229f124..eb81533199 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index a2662448d8..8b177274da 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 4f610fe2f1..14bf60d5f7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 788c56aa87..4851f0ac2a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index fa212c638a..ef90f20057 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index 8be2ee04a2..6dd8227751 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
index 6d0bc6da85..87926b69d7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 2882c68ef0..a80b169ac2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 111a92797e..aaa92ce16f 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 1b2c55f06c..ae17d9cedf 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 510c76dd6f..a1ca60f1fb 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index e5695b22f5..ee74989c71 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index b1f61eabb0..1680336ade 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
index 748becbba4..ee0d7e541c 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
index ee3c95c9e1..7bddfdd121 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/org.wso2.carbon.identity.api.server.rule.metadata.v1/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.rule.metadata</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
index 16166e45c4..e7273ec675 100644
--- a/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.rule.metadata/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 5d932844dd..5ca40d6d69 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 08a61d501a..52a46f393f 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 718c47e697..2402c1f785 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 20096e5037..d152e7a262 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index ce9bdefedb..8bc00bb13c 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 8645ec721e..8eb62914f5 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 2b02699ef7..32e80ce23c 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index fc9a8da82d..65a5a7b8a4 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 32c95c0728..00a30450d4 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 2804eb112e..2b9518f528 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 8ca55c2771..161c949e05 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 16014090af..ddb045c658 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.3.49</version>
+        <version>1.3.50-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 10babbdc33..a170dd48ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.49</version>
+    <version>1.3.50-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.3.49</tag>
+        <tag>HEAD</tag>
     </scm>