From 047cc85e8a079b1c9a2fd782a4aeed73c0f6e201 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 11 Apr 2023 22:37:00 +0530
Subject: [PATCH 01/27] Add apiKeyHeader param to publisher api

---
 .../src/main/resources/publisher-api.yaml                  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
index 23c811714c84..a1fdc4745d15 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
@@ -8705,6 +8705,13 @@ components:
             Name of the Authorization header used for invoking the API. If it is not set, Authorization header name specified
             in tenant or system level will be used.
           example: Authorization
+        apiKeyHeader:
+          type: string
+          pattern: '(^[^~!@#;:%^*()+={}|\\<>"'',&$\s+]*$)'
+          description: |
+            Name of the API key header used for invoking the API. If it is not set, API key header name specified
+            in tenant or system level will be used.
+          example: apiKey
         securityScheme:
           type: array
           description: |

From f6257b92d929544e946e1ac4b0975effb51335d9 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 11 Apr 2023 22:41:26 +0530
Subject: [PATCH 02/27] Add mapping between API and APIDTO for apiKeyHeader

---
 .../org/wso2/carbon/apimgt/api/model/API.java |  7 ++++++
 .../rest/api/publisher/v1/dto/APIDTO.java     | 23 ++++++++++++++++++-
 .../v1/common/mappings/APIMappingUtil.java    |  2 ++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
index 86b7d5a125f6..c2218b1ac403 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
@@ -152,6 +152,7 @@ public void setSoapToRestSequences(List<SOAPToRestSequence> soapToRestSequences)
 
     //Custom authorization header specific to the API
     private String authorizationHeader;
+    private String apiKeyHeader;
     private Set<Scope> scopes;
 
     private boolean isDefaultVersion = false;
@@ -1175,6 +1176,12 @@ public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
 
+    public String getApiKeyHeader() {return apiKeyHeader; }
+
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
     /**
      * Check the status of the Json schema validation property.
      *
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
index 5b0c60bf330d..2a85680e9462 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
@@ -144,6 +144,7 @@ public static AudienceEnum fromValue(String v) {
     @Scope(name = "apim:api_manage", description="", value ="")
     private String apiThrottlingPolicy = null;
     private String authorizationHeader = null;
+    private String apiKeyHeader = null;
     private List<String> securityScheme = new ArrayList<String>();
     private APIMaxTpsDTO maxTps = null;
 
@@ -757,6 +758,24 @@ public void setAuthorizationHeader(String authorizationHeader) {
     this.authorizationHeader = authorizationHeader;
   }
 
+  /**
+   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   **/
+  public APIDTO apiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "apiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @JsonProperty("apiKeyHeader")
+ @Pattern(regexp="(^[^~!@#;:%^*()+={}|\\\\<>\"',&$\\s+]*$)")  public String getApiKeyHeader() {
+    return apiKeyHeader;
+  }
+  public void setApiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+  }
+
   /**
    * Types of API security, the current API secured with. It can be either OAuth2 or mutual SSL or both. If it is not set OAuth2 will be set as the security for the current API. 
    **/
@@ -1381,6 +1400,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(policies, API.policies) &&
         Objects.equals(apiThrottlingPolicy, API.apiThrottlingPolicy) &&
         Objects.equals(authorizationHeader, API.authorizationHeader) &&
+        Objects.equals(apiKeyHeader, API.apiKeyHeader) &&
         Objects.equals(securityScheme, API.securityScheme) &&
         Objects.equals(maxTps, API.maxTps) &&
         Objects.equals(visibility, API.visibility) &&
@@ -1418,7 +1438,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, name, description, context, version, provider, lifeCycleStatus, wsdlInfo, wsdlUrl, responseCachingEnabled, cacheTimeout, hasThumbnail, isDefaultVersion, isRevision, revisionedApiId, revisionId, enableSchemaValidation, enableSubscriberVerification, type, audience, transport, tags, policies, apiThrottlingPolicy, authorizationHeader, securityScheme, maxTps, visibility, visibleRoles, visibleTenants, mediationPolicies, apiPolicies, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, accessControl, accessControlRoles, businessInformation, corsConfiguration, websubSubscriptionConfiguration, workflowStatus, createdTime, lastUpdatedTimestamp, lastUpdatedTime, endpointConfig, endpointImplementationType, scopes, operations, threatProtectionPolicies, categories, keyManagers, serviceInfo, advertiseInfo, gatewayVendor, gatewayType, asyncTransportProtocols);
+    return Objects.hash(id, name, description, context, version, provider, lifeCycleStatus, wsdlInfo, wsdlUrl, responseCachingEnabled, cacheTimeout, hasThumbnail, isDefaultVersion, isRevision, revisionedApiId, revisionId, enableSchemaValidation, enableSubscriberVerification, type, audience, transport, tags, policies, apiThrottlingPolicy, authorizationHeader, apiKeyHeader, securityScheme, maxTps, visibility, visibleRoles, visibleTenants, mediationPolicies, apiPolicies, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, accessControl, accessControlRoles, businessInformation, corsConfiguration, websubSubscriptionConfiguration, workflowStatus, createdTime, lastUpdatedTimestamp, lastUpdatedTime, endpointConfig, endpointImplementationType, scopes, operations, threatProtectionPolicies, categories, keyManagers, serviceInfo, advertiseInfo, gatewayVendor, gatewayType, asyncTransportProtocols);
   }
 
   @Override
@@ -1451,6 +1471,7 @@ public String toString() {
     sb.append("    policies: ").append(toIndentedString(policies)).append("\n");
     sb.append("    apiThrottlingPolicy: ").append(toIndentedString(apiThrottlingPolicy)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
+    sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
     sb.append("    securityScheme: ").append(toIndentedString(securityScheme)).append("\n");
     sb.append("    maxTps: ").append(toIndentedString(maxTps)).append("\n");
     sb.append("    visibility: ").append(toIndentedString(visibility)).append("\n");
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
index 042df703e82b..75eee78d44dd 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
@@ -370,6 +370,7 @@ public static API fromDTOtoAPI(APIDTO dto, String provider) throws APIManagement
         model.setCorsConfiguration(corsConfiguration);
         setMaxTpsFromApiDTOToModel(dto, model);
         model.setAuthorizationHeader(dto.getAuthorizationHeader());
+        model.setApiKeyHeader(dto.getApiKeyHeader());
         model.setApiSecurity(getSecurityScheme(dto.getSecurityScheme()));
 
         if (dto.getType().toString().equals(APIConstants.API_TYPE_WEBSUB)) {
@@ -1342,6 +1343,7 @@ public static APIDTO fromAPItoDTO(API model, boolean preserveCredentials,
         setMaxTpsFromModelToApiDTO(model, dto);
 
         dto.setAuthorizationHeader(model.getAuthorizationHeader());
+        dto.setApiKeyHeader(model.getApiKeyHeader());
         if (model.getApiSecurity() != null) {
             dto.setSecurityScheme(Arrays.asList(model.getApiSecurity().split(",")));
         }

From 13397121824bb1098a2100a9b5b2118396cc04bb Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 11 Apr 2023 22:43:03 +0530
Subject: [PATCH 03/27] Add configurable deployment.toml param for apiKeyHeader

---
 .../templates/repository/conf/api-manager.xml.j2              | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2 b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
index 329d983da1f0..9e0af9ef9ab3 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
@@ -356,6 +356,10 @@
         <!--Authorization header-->
         <AuthorizationHeader>{{apim.oauth_config.auth_header}}</AuthorizationHeader>
         {% endif %}
+        {% if apim.oauth_config.api_key_header is defined %}
+        <!--API key header-->
+        <ApiKeyHeader>{{apim.oauth_config.api_key_header}}</ApiKeyHeader>
+        {% endif %}
         <!-- Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens -->
         <ApplicationTokenScope>{{apim.oauth_config.default_app_scope}}</ApplicationTokenScope>
         <!-- All  scopes under the AllowedScopes element are not validating against roles that has assigned to it.

From d5230af099c9c187db6e05a9e08c74a4cdc6b2f0 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 11 Apr 2023 22:47:09 +0530
Subject: [PATCH 04/27] Set default value for apiKeyHeader in case of null

---
 .../publisher/v1/common/mappings/PublisherCommonUtils.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
index da6a3d6b485a..a5141323dbbb 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
@@ -1150,6 +1150,12 @@ public static API prepareToCreateAPIByDTO(APIDTO body, APIProvider apiProvider,
         if (body.getAuthorizationHeader() == null) {
             body.setAuthorizationHeader(APIConstants.AUTHORIZATION_HEADER_DEFAULT);
         }
+        if (body.getApiKeyHeader() == null) {
+            body.setApiKeyHeader(APIUtil.getOAuthConfigurationFromAPIMConfig(APIConstants.API_KEY_HEADER));
+        }
+        if (body.getApiKeyHeader() == null) {
+            body.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
+        }
 
         if (body.getVisibility() == APIDTO.VisibilityEnum.RESTRICTED && body.getVisibleRoles().isEmpty()) {
             throw new APIManagementException(

From 5974ce291b11e00044124888910f5cf1ff76729e Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 11 Apr 2023 22:48:57 +0530
Subject: [PATCH 05/27] Add and retrieve APIs with apiKeyHeader from registry

---
 .../java/org/wso2/carbon/apimgt/impl/APIConstants.java |  3 +++
 .../org/wso2/carbon/apimgt/impl/utils/APIUtil.java     |  3 +++
 .../wso2/carbon/apimgt/persistence/APIConstants.java   |  1 +
 .../carbon/apimgt/persistence/dto/PublisherAPI.java    | 10 ++++++++++
 .../persistence/utils/RegistryPersistenceUtil.java     |  2 ++
 5 files changed, 19 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
index c6f3104e5e15..a1d41d4aa796 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
@@ -335,6 +335,7 @@ public final class APIConstants {
     public static final String API_OVERVIEW_OUTSEQUENCE = "overview_outSequence";
     public static final String API_OVERVIEW_FAULTSEQUENCE = "overview_faultSequence";
     public static final String API_OVERVIEW_AUTHORIZATION_HEADER = "overview_authorizationHeader";
+    public static final String API_OVERVIEW_API_KEY_HEADER = "overview_apiKeyHeader";
     public static final String API_OVERVIEW_API_SECURITY = "overview_apiSecurity";
     public static final String API_OVERVIEW_WS_URI_MAPPING = "overview_wsUriMapping";
     public static final String AUTHORIZATION_HEADER_BASIC = "Basic";
@@ -458,10 +459,12 @@ public final class APIConstants {
     public static final String MEDIATOR_CONFIG = "MediatorConfigs.";
     public static final String OAUTH_CONFIGS = "OAuthConfigurations.";
     public static final String AUTHORIZATION_HEADER = "AuthorizationHeader";
+    public static final String API_KEY_HEADER = "ApiKeyHeader";
     public static final String API_SECURITY = "APISecurity";
     public static final String API_LEVEL_POLICY = "APILevelPolicy";
     public static final String CERTIFICATE_INFORMATION = "CertificateInformation";
     public static final String AUTHORIZATION_HEADER_DEFAULT = "Authorization";
+    public static final String API_KEY_HEADER_DEFAULT = "ApiKey";
     public static final String HEADER_TENANT = "xWSO2Tenant";
     public static final String X_WSO2_TENANT_HEADER = "X-WSO2-Tenant";
     public static final String AUTHORIZATION_QUERY_PARAM_DEFAULT = "access_token";
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
index 34f409d38ddf..6b5885e62e86 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -704,6 +704,7 @@ public static API getAPI(GovernanceArtifact artifact)
             api.setEnvironments(extractEnvironmentsForAPI(environments));
             api.setCorsConfiguration(getCorsConfigurationFromArtifact(artifact));
             api.setAuthorizationHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER));
+            api.setApiKeyHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER));
             api.setApiSecurity(artifact.getAttribute(APIConstants.API_OVERVIEW_API_SECURITY));
 
             //get endpoint config string from artifact, parse it as a json and set the environment list configured with
@@ -914,6 +915,7 @@ public static GenericArtifact createAPIArtifactContent(GenericArtifact artifact,
             artifact.setAttribute(APIConstants.API_PRODUCTION_THROTTLE_MAXTPS, api.getProductionMaxTps());
             artifact.setAttribute(APIConstants.API_SANDBOX_THROTTLE_MAXTPS, api.getSandboxMaxTps());
             artifact.setAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER, api.getAuthorizationHeader());
+            artifact.setAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER, api.getApiKeyHeader());
             artifact.setAttribute(APIConstants.API_OVERVIEW_API_SECURITY, api.getApiSecurity());
             artifact.setAttribute(APIConstants.API_OVERVIEW_ENABLE_JSON_SCHEMA,
                     Boolean.toString(api.isEnabledSchemaValidation()));
@@ -9398,6 +9400,7 @@ public static API getReducedPublisherAPIForListing(GovernanceArtifact artifact,
             api.setImplementation(artifact.getAttribute(APIConstants.PROTOTYPE_OVERVIEW_IMPLEMENTATION));
 
             api.setAuthorizationHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER));
+            api.setApiKeyHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER));
             api.setApiSecurity(artifact.getAttribute(APIConstants.API_OVERVIEW_API_SECURITY));
 
         } catch (GovernanceException e) {
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/APIConstants.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/APIConstants.java
index f8f9663d8af4..3acfce4d1ed3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/APIConstants.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/APIConstants.java
@@ -82,6 +82,7 @@ public final class APIConstants {
     public static final String API_OVERVIEW_OUTSEQUENCE = "overview_outSequence";
     public static final String API_OVERVIEW_FAULTSEQUENCE = "overview_faultSequence";
     public static final String API_OVERVIEW_AUTHORIZATION_HEADER = "overview_authorizationHeader";
+    public static final String API_OVERVIEW_API_KEY_HEADER = "overview_apiKeyHeader";
     public static final String API_OVERVIEW_API_SECURITY = "overview_apiSecurity";
     public static final String API_OVERVIEW_RESPONSE_CACHING = "overview_responseCaching";
     public static final String API_OVERVIEW_CACHE_TIMEOUT = "overview_cacheTimeout";
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPI.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPI.java
index 10d1108ae8a5..0480be1104f3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPI.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPI.java
@@ -65,6 +65,7 @@ public class PublisherAPI extends PublisherAPIInfo {
     private String productionMaxTps;
     private String sandboxMaxTps;
     private String authorizationHeader;
+    private String apiKeyHeader;
     private String apiSecurity; // ?check whether same to private List<String> securityScheme = new ArrayList<>();
     private boolean enableSchemaValidation;
     private boolean enableSubscriberVerification;
@@ -348,6 +349,14 @@ public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
 
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
     public String getApiSecurity() {
         return apiSecurity;
     }
@@ -621,6 +630,7 @@ public String toString() {
                 + ", subscriptionAvailability=" + subscriptionAvailability + ", subscriptionAvailableOrgs="
                 + subscriptionAvailableOrgs + ", implementation=" + implementation + ", productionMaxTps="
                 + productionMaxTps + ", sandboxMaxTps=" + sandboxMaxTps + ", authorizationHeader=" + authorizationHeader
+                + ", apiKeyHeader=" + apiKeyHeader
                 + ", apiSecurity=" + apiSecurity + ", enableSchemaValidation=" + enableSchemaValidation
                 + ", enableSubscriberVerification=" + enableSubscriberVerification + ", enableStore=" + enableStore
                 + ", testKey=" + testKey + ", contextTemplate=" + contextTemplate + ", availableTierNames="
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
index bbce559c444f..e2c40e72775e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
@@ -174,6 +174,7 @@ public static GenericArtifact createAPIArtifactContent(GenericArtifact artifact,
             artifact.setAttribute(APIConstants.API_PRODUCTION_THROTTLE_MAXTPS, api.getProductionMaxTps());
             artifact.setAttribute(APIConstants.API_SANDBOX_THROTTLE_MAXTPS, api.getSandboxMaxTps());
             artifact.setAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER, api.getAuthorizationHeader());
+            artifact.setAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER, api.getApiKeyHeader());
             artifact.setAttribute(APIConstants.API_OVERVIEW_API_SECURITY, api.getApiSecurity());
             artifact.setAttribute(APIConstants.API_OVERVIEW_ENABLE_JSON_SCHEMA,
                                             Boolean.toString(api.isEnableSchemaValidation()));
@@ -680,6 +681,7 @@ public static API getAPI(GovernanceArtifact artifact, Registry registry)
             api.setCorsConfiguration(getCorsConfigurationFromArtifact(artifact));
             api.setWebsubSubscriptionConfiguration(getWebsubSubscriptionConfigurationFromArtifact(artifact));
             api.setAuthorizationHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER));
+            api.setApiKeyHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER));
             api.setApiSecurity(artifact.getAttribute(APIConstants.API_OVERVIEW_API_SECURITY));
             //set data and status related to monetization
             api.setMonetizationEnabled(Boolean.parseBoolean(artifact.getAttribute

From 701358e3ed57f1cf77bfef3eab68fdaa192796dc Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 12 Apr 2023 15:54:00 +0530
Subject: [PATCH 06/27] Add custom api key header support for OAS definitions

---
 .../org/wso2/carbon/apimgt/impl/APIConstants.java    |  1 +
 .../carbon/apimgt/impl/definitions/OAS2Parser.java   |  9 +++++++++
 .../carbon/apimgt/impl/definitions/OAS3Parser.java   |  9 +++++++++
 .../apimgt/impl/definitions/OASParserUtil.java       | 12 ++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
index a1d41d4aa796..a69dccede43c 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
@@ -1597,6 +1597,7 @@ private ConfigParameters() {
 
     //swagger MG related constants
     public static final String X_WSO2_AUTH_HEADER = "x-wso2-auth-header";
+    public static final String X_WSO2_API_KEY_HEADER = "x-wso2-api-key-header";
     public static final String X_THROTTLING_TIER = "x-throttling-tier";
     public static final String X_WSO2_CORS = "x-wso2-cors";
     public static final String X_WSO2_PRODUCTION_ENDPOINTS = "x-wso2-production-endpoints";
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java
index 568a9ff25237..532a558b3c77 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS2Parser.java
@@ -835,6 +835,9 @@ public String getOASDefinitionForPublisher(API api, String oasDefinition) throws
         if (api.getAuthorizationHeader() != null) {
             swagger.setVendorExtension(APIConstants.X_WSO2_AUTH_HEADER, api.getAuthorizationHeader());
         }
+        if (api.getApiKeyHeader() != null) {
+            swagger.setVendorExtension(APIConstants.X_WSO2_API_KEY_HEADER, api.getApiKeyHeader());
+        }
         if (api.getApiLevelPolicy() != null) {
             swagger.setVendorExtension(APIConstants.X_THROTTLING_TIER, api.getApiLevelPolicy());
         }
@@ -1674,6 +1677,12 @@ public API setExtensionsToAPI(String apiDefinition, API api) throws APIManagemen
         if (StringUtils.isNotBlank(authHeader)) {
             api.setAuthorizationHeader(authHeader);
         }
+        //Setup custom api key header for API
+        String apiKeyHeader = OASParserUtil.getApiKeyHeaderFromSwagger(extensions);
+        if (StringUtils.isNotBlank(apiKeyHeader)) {
+            api.setApiKeyHeader(apiKeyHeader);
+        }
+
         //Setup application Security
         List<String> applicationSecurity = OASParserUtil.getApplicationSecurityTypes(extensions);
         Boolean isOptional = OASParserUtil.getAppSecurityStateFromSwagger(extensions);
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS3Parser.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS3Parser.java
index 533f9a355b64..349f04bc0200 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS3Parser.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OAS3Parser.java
@@ -949,6 +949,9 @@ public String getOASDefinitionForPublisher(API api, String oasDefinition) throws
         if (api.getAuthorizationHeader() != null) {
             openAPI.addExtension(APIConstants.X_WSO2_AUTH_HEADER, api.getAuthorizationHeader());
         }
+        if (api.getApiKeyHeader() != null) {
+            openAPI.addExtension(APIConstants.X_WSO2_API_KEY_HEADER, api.getApiKeyHeader());
+        }
         if (api.getApiLevelPolicy() != null) {
             openAPI.addExtension(APIConstants.X_THROTTLING_TIER, api.getApiLevelPolicy());
         }
@@ -1926,6 +1929,12 @@ public API setExtensionsToAPI(String apiDefinition, API api) throws APIManagemen
         if (StringUtils.isNotBlank(authHeader)) {
             api.setAuthorizationHeader(authHeader);
         }
+        //Setup custom api key header for API
+        String apiKeyHeader = OASParserUtil.getApiKeyHeaderFromSwagger(extensions);
+        if (StringUtils.isNotBlank(apiKeyHeader)) {
+            api.setApiKeyHeader(apiKeyHeader);
+        }
+
         //Setup application Security
         List<String> applicationSecurity = OASParserUtil.getApplicationSecurityTypes(extensions);
         Boolean isOptional = OASParserUtil.getAppSecurityStateFromSwagger(extensions);
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java
index 09df3179247f..885228e408ee 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/definitions/OASParserUtil.java
@@ -1649,6 +1649,18 @@ public static String getAuthorizationHeaderFromSwagger(Map<String, Object> exten
         return authorizationHeader == null ? null : authorizationHeader.toString();
     }
 
+    /**
+     * This method returns extension of custom API key Header related to micro-gw
+     *
+     * @param extensions Map<String, Object>
+     * @return API key header header value as String
+     * @throws APIManagementException throws if an error occurred
+     */
+    public static String getApiKeyHeaderFromSwagger(Map<String, Object> extensions) throws APIManagementException {
+        Object apiKeyHeader = extensions.get(APIConstants.X_WSO2_API_KEY_HEADER);
+        return apiKeyHeader == null ? null : apiKeyHeader.toString();
+    }
+
     /**
      * This method returns extension of custom authorization Header related to micro-gw
      *

From be059bb580ee02344982c53a691d92a4638dd4d0 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 18 Apr 2023 11:43:27 +0530
Subject: [PATCH 07/27] Add apiKeyHeader to APIProduct publisher API

---
 .../src/main/resources/publisher-api.yaml                   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
index a1fdc4745d15..dd12f7140f57 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
@@ -9385,6 +9385,12 @@ components:
             Name of the Authorization header used for invoking the API. If it is not set, Authorization header name specified
             in tenant or system level will be used.
           example: Authorization
+        apiKeyHeader:
+          type: string
+          description: |
+            Name of the API key header used for invoking the API. If it is not set, API key header name specified
+            in tenant or system level will be used.
+          example: ApiKey
         securityScheme:
           type: array
           description: |

From cb5c91b6c161d06542f2a2809ce3aeb5e03e02fd Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 18 Apr 2023 13:05:02 +0530
Subject: [PATCH 08/27] Add mapping between APIProduct and APIProductDTO for
 apiKeyHeader

---
 .../carbon/apimgt/api/model/APIProduct.java   |  9 ++++++++
 .../api/publisher/v1/dto/APIProductDTO.java   | 23 ++++++++++++++++++-
 .../v1/common/mappings/APIMappingUtil.java    |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
index 7a11c51433fe..08e33095d82b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
@@ -89,6 +89,7 @@ public class APIProduct {
      * Custom authorization header specific to the API
      */
     private String authorizationHeader;
+    private String apiKeyHeader;
 
     private CORSConfiguration corsConfiguration;
 
@@ -439,6 +440,14 @@ public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
 
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
+    public void setApiKeyHeader(String authorizationHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
     public CORSConfiguration getCorsConfiguration() {
         return corsConfiguration;
     }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
index ed184c00bd84..05725656ae04 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
@@ -149,6 +149,7 @@ public static ApiTypeEnum fromValue(String v) {
     private List<String> policies = new ArrayList<String>();
     private String apiThrottlingPolicy = null;
     private String authorizationHeader = null;
+    private String apiKeyHeader = null;
     private List<String> securityScheme = new ArrayList<String>();
 
     @XmlType(name="SubscriptionAvailabilityEnum")
@@ -623,6 +624,24 @@ public void setAuthorizationHeader(String authorizationHeader) {
     this.authorizationHeader = authorizationHeader;
   }
 
+  /**
+   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   **/
+  public APIProductDTO apiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @JsonProperty("apiKeyHeader")
+  public String getApiKeyHeader() {
+    return apiKeyHeader;
+  }
+  public void setApiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+  }
+
   /**
    * Types of API security, the current API secured with. It can be either OAuth2 or mutual SSL or both. If it is not set OAuth2 will be set as the security for the current API. 
    **/
@@ -941,6 +960,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(policies, apIProduct.policies) &&
         Objects.equals(apiThrottlingPolicy, apIProduct.apiThrottlingPolicy) &&
         Objects.equals(authorizationHeader, apIProduct.authorizationHeader) &&
+        Objects.equals(apiKeyHeader, apIProduct.apiKeyHeader) &&
         Objects.equals(securityScheme, apIProduct.securityScheme) &&
         Objects.equals(subscriptionAvailability, apIProduct.subscriptionAvailability) &&
         Objects.equals(subscriptionAvailableTenants, apIProduct.subscriptionAvailableTenants) &&
@@ -961,7 +981,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, name, context, description, provider, hasThumbnail, state, enableSchemaValidation, isRevision, revisionedApiProductId, revisionId, responseCachingEnabled, cacheTimeout, visibility, visibleRoles, visibleTenants, accessControl, accessControlRoles, apiType, transport, tags, policies, apiThrottlingPolicy, authorizationHeader, securityScheme, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, businessInformation, corsConfiguration, createdTime, lastUpdatedTime, lastUpdatedTimestamp, gatewayVendor, apis, scopes, categories, workflowStatus);
+    return Objects.hash(id, name, context, description, provider, hasThumbnail, state, enableSchemaValidation, isRevision, revisionedApiProductId, revisionId, responseCachingEnabled, cacheTimeout, visibility, visibleRoles, visibleTenants, accessControl, accessControlRoles, apiType, transport, tags, policies, apiThrottlingPolicy, authorizationHeader, apiKeyHeader, securityScheme, subscriptionAvailability, subscriptionAvailableTenants, additionalProperties, additionalPropertiesMap, monetization, businessInformation, corsConfiguration, createdTime, lastUpdatedTime, lastUpdatedTimestamp, gatewayVendor, apis, scopes, categories, workflowStatus);
   }
 
   @Override
@@ -993,6 +1013,7 @@ public String toString() {
     sb.append("    policies: ").append(toIndentedString(policies)).append("\n");
     sb.append("    apiThrottlingPolicy: ").append(toIndentedString(apiThrottlingPolicy)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
+    sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
     sb.append("    securityScheme: ").append(toIndentedString(securityScheme)).append("\n");
     sb.append("    subscriptionAvailability: ").append(toIndentedString(subscriptionAvailability)).append("\n");
     sb.append("    subscriptionAvailableTenants: ").append(toIndentedString(subscriptionAvailableTenants)).append("\n");
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
index 75eee78d44dd..2510f1e1fd91 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
@@ -2291,6 +2291,7 @@ public static APIProductDTO fromAPIProducttoDTO(APIProduct product) throws APIMa
         productDto.setDescription(product.getDescription());
         productDto.setApiType(APIProductDTO.ApiTypeEnum.fromValue(APIConstants.AuditLogConstants.API_PRODUCT));
         productDto.setAuthorizationHeader(product.getAuthorizationHeader());
+        productDto.setApiKeyHeader(product.getApiKeyHeader());
         productDto.setState(product.getState());
         if (product.getGatewayVendor() == null) {
             productDto.setGatewayVendor(APIConstants.WSO2_GATEWAY_ENVIRONMENT);
@@ -2669,6 +2670,7 @@ public static APIProduct fromDTOtoAPIProduct(APIProductDTO dto, String provider)
         product.setProductResources(productResources);
         product.setApiSecurity(getSecurityScheme(dto.getSecurityScheme()));
         product.setAuthorizationHeader(dto.getAuthorizationHeader());
+        product.setApiKeyHeader(dto.getApiKeyHeader());
 
         //attach api categories to API model
         setAPICategoriesToModel(dto, product, provider);

From 7c6ce3159f2bfac37856c211bca4f37e232c22c5 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 18 Apr 2023 13:07:01 +0530
Subject: [PATCH 09/27] Set default value for apiKeyHeader in case of null for
 APIProduct

---
 .../v1/common/mappings/PublisherCommonUtils.java          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
index a5141323dbbb..8ce0770c3644 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
@@ -1771,6 +1771,14 @@ public static APIProduct addAPIProductWithGeneratedSwaggerDefinition(APIProductD
             apiProductDTO.setAuthorizationHeader(APIConstants.AUTHORIZATION_HEADER_DEFAULT);
         }
 
+        if (apiProductDTO.getApiKeyHeader() == null) {
+            apiProductDTO.setApiKeyHeader(
+                    APIUtil.getOAuthConfigurationFromAPIMConfig(APIConstants.API_KEY_HEADER));
+        }
+        if (apiProductDTO.getApiKeyHeader() == null) {
+            apiProductDTO.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
+        }
+
         //Remove the /{version} from the context.
         if (context.endsWith("/" + RestApiConstants.API_VERSION_PARAM)) {
             context = context.replace("/" + RestApiConstants.API_VERSION_PARAM, "");

From ad6d54538353c7cb148776afa329054951b25392 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Tue, 18 Apr 2023 23:40:51 +0530
Subject: [PATCH 10/27] Add and retrieve APIProducts with apiKeyHeader from
 registry

---
 .../org/wso2/carbon/apimgt/api/model/APIProduct.java |  2 +-
 .../org/wso2/carbon/apimgt/impl/utils/APIUtil.java   |  1 +
 .../apimgt/persistence/dto/PublisherAPIProduct.java  | 12 +++++++++++-
 .../persistence/utils/RegistryPersistenceUtil.java   |  2 ++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
index 08e33095d82b..dac2ef0e7fb8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/APIProduct.java
@@ -444,7 +444,7 @@ public String getApiKeyHeader() {
         return apiKeyHeader;
     }
 
-    public void setApiKeyHeader(String authorizationHeader) {
+    public void setApiKeyHeader(String apiKeyHeader) {
         this.apiKeyHeader = apiKeyHeader;
     }
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
index 6b5885e62e86..81c2c209d578 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/utils/APIUtil.java
@@ -1091,6 +1091,7 @@ public static GenericArtifact createAPIProductArtifactContent(GenericArtifact ar
             artifact.setAttribute(APIConstants.API_OVERVIEW_CORS_CONFIGURATION,
                     APIUtil.getCorsConfigurationJsonFromDto(apiProduct.getCorsConfiguration()));
             artifact.setAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER, apiProduct.getAuthorizationHeader());
+            artifact.setAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER, apiProduct.getApiKeyHeader());
             artifact.setAttribute(APIConstants.API_OVERVIEW_API_SECURITY, apiProduct.getApiSecurity());
 
             //Validate if the API has an unsupported context before setting it in the artifact
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPIProduct.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPIProduct.java
index be3e58c36cba..b3abb97607c9 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPIProduct.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/PublisherAPIProduct.java
@@ -46,7 +46,8 @@ public class PublisherAPIProduct extends PublisherAPIProductInfo {
     private Set<String> environments;    
     private String transports;    
     private CORSConfiguration corsConfiguration;    
-    private String authorizationHeader;  
+    private String authorizationHeader;
+    private String apiKeyHeader;
     private String contextTemplate;
     private boolean enableSchemaValidation;
     private boolean isMonetizationEnabled;
@@ -161,6 +162,15 @@ public String getAuthorizationHeader() {
     public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
+
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
     public String getContextTemplate() {
         return contextTemplate;
     }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
index e2c40e72775e..87c63b4a38b0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/utils/RegistryPersistenceUtil.java
@@ -1471,6 +1471,7 @@ public static GenericArtifact createAPIProductArtifactContent(GenericArtifact ar
             artifact.setAttribute(APIConstants.API_OVERVIEW_CORS_CONFIGURATION,
                     getCorsConfigurationJsonFromDto(apiProduct.getCorsConfiguration()));
             artifact.setAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER, apiProduct.getAuthorizationHeader());
+            artifact.setAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER, apiProduct.getApiKeyHeader());
             artifact.setAttribute(APIConstants.API_OVERVIEW_API_SECURITY, apiProduct.getApiSecurity());
 
             //Validate if the API has an unsupported context before setting it in the artifact
@@ -1570,6 +1571,7 @@ public static APIProduct getAPIProduct(GovernanceArtifact artifact, Registry reg
             apiProduct.setTransports(artifact.getAttribute(APIConstants.API_OVERVIEW_TRANSPORTS));
             apiProduct.setApiSecurity(artifact.getAttribute(APIConstants.API_OVERVIEW_API_SECURITY));
             apiProduct.setAuthorizationHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_AUTHORIZATION_HEADER));
+            apiProduct.setApiKeyHeader(artifact.getAttribute(APIConstants.API_OVERVIEW_API_KEY_HEADER));
             apiProduct.setCorsConfiguration(getCorsConfigurationFromArtifact(artifact));
             apiProduct.setCreatedTime(registry.get(artifactPath).getCreatedTime());
             apiProduct.setLastUpdated(registry.get(artifactPath).getLastModified());

From 5891b13304c0536fc016cd38c62dc4c3ad547d57 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 15:50:58 +0530
Subject: [PATCH 11/27] Add deploy API with apiKeyHeader

---
 .../security/APIAuthenticationHandler.java    | 19 +++++++++++++++++++
 .../v1/common/TemplateBuilderUtil.java        | 10 ++++++++++
 2 files changed, 29 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
index 94d68ea03778..4ce7971c3b22 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
@@ -94,6 +94,7 @@ public class APIAuthenticationHandler extends AbstractHandler implements Managed
     private SynapseEnvironment synapseEnvironment;
 
     private String authorizationHeader;
+    private String apiKeyHeader;
     private String apiSecurity;
     private String apiLevelPolicy;
     private String certificateInformation;
@@ -201,6 +202,24 @@ public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
 
+    /**
+     * To get the Api Key Header.
+     *
+     * @return Relevant the Api Key Header of the API request
+     */
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
+    /**
+     * To set the Api Key Header.
+     *
+     * @param apiKeyHeader the Api Key Header of the API request.
+     */
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
     /**
      * To get the API level security expected for the current API in gateway level.
      *
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
index dad7c176b134..c22784a043b4 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
@@ -121,6 +121,13 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(API api, String tenan
             corsProperties.put(APIConstants.AUTHORIZATION_HEADER, authorizationHeader);
         }
 
+        String apiKeyHeader;
+        if (!StringUtils.isBlank(api.getApiKeyHeader())) {
+            apiKeyHeader = api.getApiKeyHeader();
+        } else {
+            apiKeyHeader = APIUtil.getOAuthConfiguration(tenantDomain, APIConstants.API_KEY_HEADER);
+        }
+
         if (!(APIConstants.APITransportType.WS.toString().equals(api.getType()))) {
             if (api.getCorsConfiguration() != null && api.getCorsConfiguration().isCorsConfigurationEnabled()) {
                 CORSConfiguration corsConfiguration = api.getCorsConfiguration();
@@ -184,6 +191,9 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(API api, String tenan
         if (!StringUtils.isBlank(authorizationHeader)) {
             authProperties.put(APIConstants.AUTHORIZATION_HEADER, authorizationHeader);
         }
+        if (!StringUtils.isBlank(apiKeyHeader)) {
+            authProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
+        }
         String apiSecurity = api.getApiSecurity();
         String apiLevelPolicy = api.getApiLevelPolicy();
         authProperties.put(APIConstants.API_SECURITY, apiSecurity);

From 5d4bc6b85d29489b1f8766931f87ad5d73a2c26e Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 15:57:08 +0530
Subject: [PATCH 12/27] Add CORS handling for apiKeyHeader

---
 .../handlers/security/CORSRequestHandler.java        | 12 ++++++++++++
 .../api/publisher/v1/common/TemplateBuilderUtil.java |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/CORSRequestHandler.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/CORSRequestHandler.java
index 1838a79ac779..d88db46fec2b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/CORSRequestHandler.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/CORSRequestHandler.java
@@ -69,6 +69,7 @@ public class CORSRequestHandler extends AbstractHandler implements ManagedLifecy
     private List<String> allowedMethodList;
     private boolean allowCredentialsEnabled;
     private String authorizationHeader;
+    private String apiKeyHeader;
 
     public void init(SynapseEnvironment synapseEnvironment) {
         if (log.isDebugEnabled()) {
@@ -95,6 +96,9 @@ void initializeHeaders() {
         if (authorizationHeader != null) {
             allowHeaders += APIConstants.MULTI_ATTRIBUTE_SEPARATOR_DEFAULT + authorizationHeader;
         }
+        if (apiKeyHeader != null) {
+            allowHeaders += APIConstants.MULTI_ATTRIBUTE_SEPARATOR_DEFAULT + apiKeyHeader;
+        }
         if (allowedOrigins == null) {
             String allowedOriginsList = APIUtil.getAllowedOrigins();
             if (!allowedOriginsList.isEmpty()) {
@@ -447,4 +451,12 @@ public String getAuthorizationHeader() {
     public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
+
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
 }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
index c22784a043b4..0f3e99a69644 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
@@ -127,6 +127,9 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(API api, String tenan
         } else {
             apiKeyHeader = APIUtil.getOAuthConfiguration(tenantDomain, APIConstants.API_KEY_HEADER);
         }
+        if (!StringUtils.isBlank(apiKeyHeader)) {
+            corsProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
+        }
 
         if (!(APIConstants.APITransportType.WS.toString().equals(api.getType()))) {
             if (api.getCorsConfiguration() != null && api.getCorsConfiguration().isCorsConfigurationEnabled()) {

From 6f6152fcc7da3b58d554c1ccd9bf590430c0f3b5 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 22:17:05 +0530
Subject: [PATCH 13/27] Add authentication with custom api key header

---
 .../gateway/handlers/security/APIAuthenticationHandler.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
index 4ce7971c3b22..8726db172bff 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/security/APIAuthenticationHandler.java
@@ -354,7 +354,7 @@ protected void initializeAuthenticators() {
             authenticators.add(authenticator);
         }
         if (isApiKeyProtected) {
-            Authenticator authenticator = new ApiKeyAuthenticator(APIConstants.API_KEY_HEADER_QUERY_PARAM, apiLevelPolicy, isOAuthBasicAuthMandatory);
+            Authenticator authenticator = new ApiKeyAuthenticator(apiKeyHeader, apiLevelPolicy, isOAuthBasicAuthMandatory);
             authenticator.init(synapseEnvironment);
             authenticators.add(authenticator);
         }
@@ -650,7 +650,7 @@ private void handleAuthFailure(MessageContext messageContext, APISecurityExcepti
             errorDetail =
                     APISecurityConstants.getFailureMessageDetailDescription(e.getErrorCode(), e.getMessage()) + "'"
                             + authorizationHeader + " : Bearer ACCESS_TOKEN' or '" + authorizationHeader +
-                            " : Basic ACCESS_TOKEN' or 'apikey: API_KEY'" ;
+                            " : Basic ACCESS_TOKEN' or '" + apiKeyHeader + " : API_KEY'";
         }
         messageContext.setProperty(SynapseConstants.ERROR_DETAIL, errorDetail);
 

From e370e772249627651d617ffe90390fb77f0a9e6d Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 22:44:05 +0530
Subject: [PATCH 14/27] Add support to deploy APIProducts with apiKeyHeader

---
 .../publisher/v1/common/TemplateBuilderUtil.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
index 0f3e99a69644..f21fa3a351ce 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
@@ -309,6 +309,16 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(APIProduct apiProduct
             corsProperties.put(APIConstants.AUTHORIZATION_HEADER, authorizationHeader);
         }
 
+        String apiKeyHeader;
+        if (!StringUtils.isBlank(apiProduct.getApiKeyHeader())) {
+            apiKeyHeader = apiProduct.getApiKeyHeader();
+        } else {
+            apiKeyHeader = APIUtil.getOAuthConfiguration(tenantDomain, APIConstants.API_KEY_HEADER);
+        }
+        if (!StringUtils.isBlank(apiKeyHeader)) {
+            corsProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
+        }
+
         if (apiProduct.getCorsConfiguration() != null &&
                 apiProduct.getCorsConfiguration().isCorsConfigurationEnabled()) {
             CORSConfiguration corsConfiguration = apiProduct.getCorsConfiguration();
@@ -369,6 +379,9 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(APIProduct apiProduct
         if (!StringUtils.isBlank(authorizationHeader)) {
             authProperties.put(APIConstants.AUTHORIZATION_HEADER, authorizationHeader);
         }
+        if (!StringUtils.isBlank(apiKeyHeader)) {
+            authProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
+        }
         String apiSecurity = apiProduct.getApiSecurity();
         String apiLevelPolicy = apiProduct.getProductLevelPolicy();
         authProperties.put(APIConstants.API_SECURITY, apiSecurity);

From e6edaf3082789e825a6dcd9316ccfa776904de0c Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 23:14:45 +0530
Subject: [PATCH 15/27] Add support for apiKeyHeader in devportal

---
 .../apimgt/persistence/dto/DevPortalAPI.java  |  9 ++++++++
 .../apimgt/rest/api/store/v1/dto/APIDTO.java  | 23 ++++++++++++++++++-
 .../api/store/v1/mappings/APIMappingUtil.java |  2 ++
 .../src/main/resources/devportal-api.yaml     |  6 +++++
 .../src/main/resources/store-api.yaml         |  6 +++++
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPI.java b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPI.java
index 5c9171665517..956ab6313028 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPI.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/src/main/java/org/wso2/carbon/apimgt/persistence/dto/DevPortalAPI.java
@@ -46,6 +46,7 @@ public class DevPortalAPI extends DevPortalAPIInfo {
     private String subscriptionAvailability; // need to decide isSubscriptionAvailable
     private String subscriptionAvailableOrgs; // (subscriptionAvailableTenants): need to decide the value of "isSubscriptionAvailable"
     private String authorizationHeader;
+    private String apiKeyHeader;
     private List<String> securityScheme = new ArrayList<>();
     private Set<String> environments;
     private Set<String> apiCategories;
@@ -221,6 +222,14 @@ public String getAuthorizationHeader() {
         return authorizationHeader;
     }
 
+    public void setApiKeyHeader(String apiKeyHeader) {
+        this.apiKeyHeader = apiKeyHeader;
+    }
+
+    public String getApiKeyHeader() {
+        return apiKeyHeader;
+    }
+
     public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
index ea811e18e546..690ea0d0bce3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
@@ -44,6 +44,7 @@ public class APIDTO   {
     private List<String> transport = new ArrayList<String>();
     private List<APIOperationsDTO> operations = new ArrayList<APIOperationsDTO>();
     private String authorizationHeader = null;
+    private String apiKeyHeader = null;
     private List<String> securityScheme = new ArrayList<String>();
     private List<String> tags = new ArrayList<String>();
     private List<APITiersDTO> tiers = new ArrayList<APITiersDTO>();
@@ -319,6 +320,24 @@ public void setAuthorizationHeader(String authorizationHeader) {
     this.authorizationHeader = authorizationHeader;
   }
 
+  /**
+   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   **/
+  public APIDTO apiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+    return this;
+  }
+
+  
+  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @JsonProperty("apiKeyHeader")
+  public String getApiKeyHeader() {
+    return apiKeyHeader;
+  }
+  public void setApiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+  }
+
   /**
    * Types of API security, the current API secured with. It can be either OAuth2 or mutual SSL or both. If it is not set OAuth2 will be set as the security for the current API. 
    **/
@@ -683,6 +702,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(transport, API.transport) &&
         Objects.equals(operations, API.operations) &&
         Objects.equals(authorizationHeader, API.authorizationHeader) &&
+        Objects.equals(apiKeyHeader, API.apiKeyHeader) &&
         Objects.equals(securityScheme, API.securityScheme) &&
         Objects.equals(tags, API.tags) &&
         Objects.equals(tiers, API.tiers) &&
@@ -706,7 +726,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, name, description, context, version, provider, apiDefinition, wsdlUri, lifeCycleStatus, isDefaultVersion, type, transport, operations, authorizationHeader, securityScheme, tags, tiers, hasThumbnail, additionalProperties, monetization, endpointURLs, businessInformation, environmentList, scopes, avgRating, advertiseInfo, isSubscriptionAvailable, categories, keyManagers, createdTime, lastUpdatedTime, gatewayVendor, asyncTransportProtocols);
+    return Objects.hash(id, name, description, context, version, provider, apiDefinition, wsdlUri, lifeCycleStatus, isDefaultVersion, type, transport, operations, authorizationHeader, apiKeyHeader, securityScheme, tags, tiers, hasThumbnail, additionalProperties, monetization, endpointURLs, businessInformation, environmentList, scopes, avgRating, advertiseInfo, isSubscriptionAvailable, categories, keyManagers, createdTime, lastUpdatedTime, gatewayVendor, asyncTransportProtocols);
   }
 
   @Override
@@ -728,6 +748,7 @@ public String toString() {
     sb.append("    transport: ").append(toIndentedString(transport)).append("\n");
     sb.append("    operations: ").append(toIndentedString(operations)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
+    sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
     sb.append("    securityScheme: ").append(toIndentedString(securityScheme)).append("\n");
     sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    tiers: ").append(toIndentedString(tiers)).append("\n");
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/APIMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/APIMappingUtil.java
index 05319e3f9e55..17d314709c6e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/APIMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/APIMappingUtil.java
@@ -243,6 +243,7 @@ public static APIDTO fromAPItoDTO(API model, String organization) throws APIMana
         }
 
         dto.setAuthorizationHeader(model.getAuthorizationHeader());
+        dto.setApiKeyHeader(model.getApiKeyHeader());
         if (model.getApiSecurity() != null) {
             dto.setSecurityScheme(Arrays.asList(model.getApiSecurity().split(",")));
         }
@@ -429,6 +430,7 @@ public static APIDTO fromAPItoDTO(APIProduct model, String organization) throws
         }
 
         dto.setAuthorizationHeader(model.getAuthorizationHeader());
+        dto.setApiKeyHeader(model.getApiKeyHeader());
         if (model.getApiSecurity() != null) {
             dto.setSecurityScheme(Arrays.asList(model.getApiSecurity().split(",")));
         }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
index dac65513e189..c92966e40974 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
@@ -3849,6 +3849,12 @@ components:
             Name of the Authorization header used for invoking the API. If it is not set, Authorization header name specified
             in tenant or system level will be used.
           example: Authorization
+        apiKeyHeader:
+          type: string
+          description: |
+            Name of the API key header used for invoking the API. If it is not set, API key header name specified
+            in tenant or system level will be used.
+          example: ApiKey
         securityScheme:
           type: array
           description: |
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
index a63f9a8f793c..13bfa784fc42 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
@@ -4220,6 +4220,12 @@ definitions:
         description: |
           Name of the Authorization header used for invoking the API. If it is not set, Authorization header name specified
           in tenant or system level will be used.
+      apiKeyHeader:
+        type: string
+        description: |
+          Name of the API key header used for invoking the API. If it is not set, API key header name specified
+          in tenant or system level will be used.
+        example: ApiKey
       securityScheme:
         type: array
         description: |

From ef8a86152c11ac455f23257dc4bfcecbf863e913 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 23:46:29 +0530
Subject: [PATCH 16/27] Add apiKeyHeader to Settings

---
 .../api/publisher/v1/dto/SettingsDTO.java     | 30 +++++++++++++++++++
 .../common/mappings/SettingsMappingUtil.java  |  6 ++++
 .../src/main/resources/publisher-api.yaml     |  4 +++
 3 files changed, 40 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
index b9b533e2fa27..e2f0762a1731 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
@@ -39,6 +39,7 @@ public class SettingsDTO   {
     private String defaultSubscriptionPolicy = null;
     private String authorizationHeader = null;
     private List<SettingsCustomPropertiesDTO> customProperties = new ArrayList<SettingsCustomPropertiesDTO>();
+    private String apiKeyHeader = null;
 
   /**
    * The Developer Portal URL
@@ -256,13 +257,21 @@ public void setAuthorizationHeader(String authorizationHeader) {
   }
 
   /**
+<<<<<<< HEAD
    **/
   public SettingsDTO customProperties(List<SettingsCustomPropertiesDTO> customProperties) {
     this.customProperties = customProperties;
+=======
+   * Api Key Header
+   **/
+  public SettingsDTO apiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+>>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
     return this;
   }
 
   
+<<<<<<< HEAD
   @ApiModelProperty(value = "")
       @Valid
   @JsonProperty("customProperties")
@@ -271,6 +280,15 @@ public List<SettingsCustomPropertiesDTO> getCustomProperties() {
   }
   public void setCustomProperties(List<SettingsCustomPropertiesDTO> customProperties) {
     this.customProperties = customProperties;
+=======
+  @ApiModelProperty(example = "apiKey", value = "Api Key Header")
+  @JsonProperty("apiKeyHeader")
+  public String getApiKeyHeader() {
+    return apiKeyHeader;
+  }
+  public void setApiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+>>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
   }
 
 
@@ -295,12 +313,20 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(defaultAdvancePolicy, settings.defaultAdvancePolicy) &&
         Objects.equals(defaultSubscriptionPolicy, settings.defaultSubscriptionPolicy) &&
         Objects.equals(authorizationHeader, settings.authorizationHeader) &&
+<<<<<<< HEAD
         Objects.equals(customProperties, settings.customProperties);
+=======
+        Objects.equals(apiKeyHeader, settings.apiKeyHeader);
+>>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
   }
 
   @Override
   public int hashCode() {
+<<<<<<< HEAD
     return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, customProperties);
+=======
+    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, apiKeyHeader);
+>>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
   }
 
   @Override
@@ -320,7 +346,11 @@ public String toString() {
     sb.append("    defaultAdvancePolicy: ").append(toIndentedString(defaultAdvancePolicy)).append("\n");
     sb.append("    defaultSubscriptionPolicy: ").append(toIndentedString(defaultSubscriptionPolicy)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
+<<<<<<< HEAD
     sb.append("    customProperties: ").append(toIndentedString(customProperties)).append("\n");
+=======
+    sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
+>>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
     sb.append("}");
     return sb.toString();
   }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
index 213c281845fb..cdd81a8cc8f0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
@@ -90,11 +90,17 @@ public SettingsDTO fromSettingstoDTO(Boolean isUserAvailable, String organizatio
             Map<String, Environment> gatewayEnvironments = APIUtil.getReadOnlyGatewayEnvironments();
             String authorizationHeader = APIUtil.getOAuthConfiguration(loggedInUserTenantDomain,
                     APIConstants.AUTHORIZATION_HEADER);
+            String apiKeyHeader = APIUtil.getOAuthConfiguration(loggedInUserTenantDomain,
+                    APIConstants.API_KEY_HEADER);
 
             if (authorizationHeader == null) {
                 authorizationHeader = APIConstants.AUTHORIZATION_HEADER_DEFAULT;
             }
+            if (apiKeyHeader == null) {
+                apiKeyHeader = APIConstants.API_KEY_HEADER_DEFAULT;
+            }
             settingsDTO.setAuthorizationHeader(authorizationHeader);
+            settingsDTO.setApiKeyHeader(apiKeyHeader);
         }
         return settingsDTO;
     }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
index dd12f7140f57..38e028ae82bc 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
@@ -11483,6 +11483,10 @@ components:
               required:
                 type: boolean
                 example: false
+        apiKeyHeader:
+          type: string
+          description: Api Key Header
+          example: apiKey
     SecurityAuditAttribute:
       title: SecurityAuditAttributeDTO
       type: object

From ae98e877cbc4d258d2bdbd9d78276600b4a44156 Mon Sep 17 00:00:00 2001
From: Isuru Maduranga <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 19 Apr 2023 23:53:47 +0530
Subject: [PATCH 17/27] Add API Key Header field to api.rxt

---
 .../src/main/resources/rxts/api.rxt                            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/rxts/api.rxt b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/rxts/api.rxt
index aa55bebc254a..c4b55ec1746f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/rxts/api.rxt
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/rxts/api.rxt
@@ -196,6 +196,9 @@
      <field type="text">
             <name>Authorization Header</name>
      </field>
+     <field type="text">
+            <name>API Key Header</name>
+     </field>
      <field type="text">
              <name>API Security</name>
       </field>

From 3e49417caa472db0a6157b37e1187aa47064fdd7 Mon Sep 17 00:00:00 2001
From: Isuru Wijesiri <isurumaduranga.16@cse.mrt.ac.lk>
Date: Wed, 2 Aug 2023 01:48:05 +0530
Subject: [PATCH 18/27] Fix formatting

---
 .../org/wso2/carbon/apimgt/api/model/API.java |  2 +-
 .../api/publisher/v1/dto/SettingsDTO.java     | 35 +++++++------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
index c2218b1ac403..c150a1847205 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/model/API.java
@@ -1176,7 +1176,7 @@ public void setAuthorizationHeader(String authorizationHeader) {
         this.authorizationHeader = authorizationHeader;
     }
 
-    public String getApiKeyHeader() {return apiKeyHeader; }
+    public String getApiKeyHeader() { return apiKeyHeader; }
 
     public void setApiKeyHeader(String apiKeyHeader) {
         this.apiKeyHeader = apiKeyHeader;
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
index e2f0762a1731..6de402b49384 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
@@ -257,21 +257,13 @@ public void setAuthorizationHeader(String authorizationHeader) {
   }
 
   /**
-<<<<<<< HEAD
    **/
   public SettingsDTO customProperties(List<SettingsCustomPropertiesDTO> customProperties) {
     this.customProperties = customProperties;
-=======
-   * Api Key Header
-   **/
-  public SettingsDTO apiKeyHeader(String apiKeyHeader) {
-    this.apiKeyHeader = apiKeyHeader;
->>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
     return this;
   }
 
   
-<<<<<<< HEAD
   @ApiModelProperty(value = "")
       @Valid
   @JsonProperty("customProperties")
@@ -280,7 +272,17 @@ public List<SettingsCustomPropertiesDTO> getCustomProperties() {
   }
   public void setCustomProperties(List<SettingsCustomPropertiesDTO> customProperties) {
     this.customProperties = customProperties;
-=======
+  }
+
+  /**
+   * Api Key Header
+   **/
+  public SettingsDTO apiKeyHeader(String apiKeyHeader) {
+    this.apiKeyHeader = apiKeyHeader;
+    return this;
+  }
+
+  
   @ApiModelProperty(example = "apiKey", value = "Api Key Header")
   @JsonProperty("apiKeyHeader")
   public String getApiKeyHeader() {
@@ -288,7 +290,6 @@ public String getApiKeyHeader() {
   }
   public void setApiKeyHeader(String apiKeyHeader) {
     this.apiKeyHeader = apiKeyHeader;
->>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
   }
 
 
@@ -313,20 +314,13 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(defaultAdvancePolicy, settings.defaultAdvancePolicy) &&
         Objects.equals(defaultSubscriptionPolicy, settings.defaultSubscriptionPolicy) &&
         Objects.equals(authorizationHeader, settings.authorizationHeader) &&
-<<<<<<< HEAD
-        Objects.equals(customProperties, settings.customProperties);
-=======
+        Objects.equals(customProperties, settings.customProperties) &&
         Objects.equals(apiKeyHeader, settings.apiKeyHeader);
->>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
   }
 
   @Override
   public int hashCode() {
-<<<<<<< HEAD
-    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, customProperties);
-=======
-    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, apiKeyHeader);
->>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
+    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, customProperties, apiKeyHeader);
   }
 
   @Override
@@ -346,11 +340,8 @@ public String toString() {
     sb.append("    defaultAdvancePolicy: ").append(toIndentedString(defaultAdvancePolicy)).append("\n");
     sb.append("    defaultSubscriptionPolicy: ").append(toIndentedString(defaultSubscriptionPolicy)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
-<<<<<<< HEAD
     sb.append("    customProperties: ").append(toIndentedString(customProperties)).append("\n");
-=======
     sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
->>>>>>> 96094feb5fb (Add apiKeyHeader to Settings)
     sb.append("}");
     return sb.toString();
   }

From 30daa530f0ab4847a237892a476915fe6f002bdd Mon Sep 17 00:00:00 2001
From: BLasan <benuraab@gmail.com>
Date: Mon, 14 Aug 2023 10:38:06 +0530
Subject: [PATCH 19/27] fixes: https://github.com/wso2/api-manager/issues/2069

---
 .../main/java/org/wso2/carbon/apimgt/impl/APIConstants.java  | 1 +
 .../rest/api/publisher/v1/common/mappings/ImportUtils.java   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
index 65573f8ccf09..9f49f5c82057 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConstants.java
@@ -2937,6 +2937,7 @@ public enum ConfigType {
     public static final String OPERATION_SEQUENCE_TYPE_RESPONSE = "response";
     public static final String OPERATION_SEQUENCE_TYPE_FAULT = "fault";
     public static final String SYNAPSE_POLICY_DEFINITION_EXTENSION = ".j2";
+    public static final String SYNAPSE_POLICY_DEFINITION_EXTENSION_XML = ".xml";
     public static final String CC_POLICY_DEFINITION_EXTENSION = ".gotmpl";
     public static final String YAML_CONTENT_TYPE = "text/yaml";
     public static final String COMMON_OPERATION_POLICY_SPECIFICATIONS_LOCATION = "repository" + File.separator
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ImportUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ImportUtils.java
index 6abf20e4f206..572cb7b3f45b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ImportUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/ImportUtils.java
@@ -631,6 +631,11 @@ public static List<OperationPolicy> findOrImportPolicy(List<OperationPolicy> pol
                         OperationPolicyDefinition synapseDefinition =
                                 APIUtil.getOperationPolicyDefinitionFromFile(policyDirectory,
                                         policyFileName, APIConstants.SYNAPSE_POLICY_DEFINITION_EXTENSION);
+                        // Synapse definition files can be either in .j2 or .xml format
+                        if (synapseDefinition == null) {
+                            synapseDefinition = APIUtil.getOperationPolicyDefinitionFromFile(policyDirectory,
+                                    policyFileName, APIConstants.SYNAPSE_POLICY_DEFINITION_EXTENSION_XML);
+                        }
                         if (synapseDefinition != null) {
                             synapseDefinition.setGatewayType(OperationPolicyDefinition.GatewayType.Synapse);
                             operationPolicyData.setSynapsePolicyDefinition(synapseDefinition);

From bb454276a4f1823a92fdcec0e718e23e8df478a8 Mon Sep 17 00:00:00 2001
From: Isuru Wijesiri <isurumaduranga.16@cse.mrt.ac.lk>
Date: Thu, 3 Aug 2023 15:57:46 +0530
Subject: [PATCH 20/27] Remove configurability of ApiKeyHeader from
 deployment.toml

---
 .../rest/api/publisher/v1/dto/APIDTO.java     |  4 +--
 .../api/publisher/v1/dto/APIProductDTO.java   |  4 +--
 .../api/publisher/v1/dto/SettingsDTO.java     | 25 ++-----------------
 .../v1/common/TemplateBuilderUtil.java        |  4 +--
 .../v1/common/mappings/APIMappingUtil.java    |  6 +++++
 .../common/mappings/PublisherCommonUtils.java |  7 ------
 .../common/mappings/SettingsMappingUtil.java  |  6 -----
 .../src/main/resources/publisher-api.yaml     | 10 ++------
 .../apimgt/rest/api/store/v1/dto/APIDTO.java  |  4 +--
 .../src/main/resources/devportal-api.yaml     |  3 +--
 .../src/main/resources/store-api.yaml         |  3 +--
 .../repository/conf/api-manager.xml.j2        |  4 ---
 12 files changed, 20 insertions(+), 60 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
index 2a85680e9462..51e5add39d43 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIDTO.java
@@ -759,7 +759,7 @@ public void setAuthorizationHeader(String authorizationHeader) {
   }
 
   /**
-   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   * Name of the API key header used for invoking the API. If it is not set, default value &#x60;apiKey&#x60; will be used. 
    **/
   public APIDTO apiKeyHeader(String apiKeyHeader) {
     this.apiKeyHeader = apiKeyHeader;
@@ -767,7 +767,7 @@ public APIDTO apiKeyHeader(String apiKeyHeader) {
   }
 
   
-  @ApiModelProperty(example = "apiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @ApiModelProperty(example = "apiKey", value = "Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used. ")
   @JsonProperty("apiKeyHeader")
  @Pattern(regexp="(^[^~!@#;:%^*()+={}|\\\\<>\"',&$\\s+]*$)")  public String getApiKeyHeader() {
     return apiKeyHeader;
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
index 05725656ae04..5ba4ac8b52d5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/APIProductDTO.java
@@ -625,7 +625,7 @@ public void setAuthorizationHeader(String authorizationHeader) {
   }
 
   /**
-   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   * Name of the API key header used for invoking the API. If it is not set, default value &#x60;apiKey&#x60; will be used. 
    **/
   public APIProductDTO apiKeyHeader(String apiKeyHeader) {
     this.apiKeyHeader = apiKeyHeader;
@@ -633,7 +633,7 @@ public APIProductDTO apiKeyHeader(String apiKeyHeader) {
   }
 
   
-  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used. ")
   @JsonProperty("apiKeyHeader")
   public String getApiKeyHeader() {
     return apiKeyHeader;
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
index 6de402b49384..b9b533e2fa27 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/gen/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/dto/SettingsDTO.java
@@ -39,7 +39,6 @@ public class SettingsDTO   {
     private String defaultSubscriptionPolicy = null;
     private String authorizationHeader = null;
     private List<SettingsCustomPropertiesDTO> customProperties = new ArrayList<SettingsCustomPropertiesDTO>();
-    private String apiKeyHeader = null;
 
   /**
    * The Developer Portal URL
@@ -274,24 +273,6 @@ public void setCustomProperties(List<SettingsCustomPropertiesDTO> customProperti
     this.customProperties = customProperties;
   }
 
-  /**
-   * Api Key Header
-   **/
-  public SettingsDTO apiKeyHeader(String apiKeyHeader) {
-    this.apiKeyHeader = apiKeyHeader;
-    return this;
-  }
-
-  
-  @ApiModelProperty(example = "apiKey", value = "Api Key Header")
-  @JsonProperty("apiKeyHeader")
-  public String getApiKeyHeader() {
-    return apiKeyHeader;
-  }
-  public void setApiKeyHeader(String apiKeyHeader) {
-    this.apiKeyHeader = apiKeyHeader;
-  }
-
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -314,13 +295,12 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(defaultAdvancePolicy, settings.defaultAdvancePolicy) &&
         Objects.equals(defaultSubscriptionPolicy, settings.defaultSubscriptionPolicy) &&
         Objects.equals(authorizationHeader, settings.authorizationHeader) &&
-        Objects.equals(customProperties, settings.customProperties) &&
-        Objects.equals(apiKeyHeader, settings.apiKeyHeader);
+        Objects.equals(customProperties, settings.customProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, customProperties, apiKeyHeader);
+    return Objects.hash(devportalUrl, environment, scopes, monetizationAttributes, subscriberContactAttributes, securityAuditProperties, externalStoresEnabled, docVisibilityEnabled, crossTenantSubscriptionEnabled, defaultAdvancePolicy, defaultSubscriptionPolicy, authorizationHeader, customProperties);
   }
 
   @Override
@@ -341,7 +321,6 @@ public String toString() {
     sb.append("    defaultSubscriptionPolicy: ").append(toIndentedString(defaultSubscriptionPolicy)).append("\n");
     sb.append("    authorizationHeader: ").append(toIndentedString(authorizationHeader)).append("\n");
     sb.append("    customProperties: ").append(toIndentedString(customProperties)).append("\n");
-    sb.append("    apiKeyHeader: ").append(toIndentedString(apiKeyHeader)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
index f21fa3a351ce..78dc4f55d916 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/TemplateBuilderUtil.java
@@ -125,7 +125,7 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(API api, String tenan
         if (!StringUtils.isBlank(api.getApiKeyHeader())) {
             apiKeyHeader = api.getApiKeyHeader();
         } else {
-            apiKeyHeader = APIUtil.getOAuthConfiguration(tenantDomain, APIConstants.API_KEY_HEADER);
+            apiKeyHeader = APIConstants.API_KEY_HEADER_DEFAULT;
         }
         if (!StringUtils.isBlank(apiKeyHeader)) {
             corsProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
@@ -313,7 +313,7 @@ public static APITemplateBuilderImpl getAPITemplateBuilder(APIProduct apiProduct
         if (!StringUtils.isBlank(apiProduct.getApiKeyHeader())) {
             apiKeyHeader = apiProduct.getApiKeyHeader();
         } else {
-            apiKeyHeader = APIUtil.getOAuthConfiguration(tenantDomain, APIConstants.API_KEY_HEADER);
+            apiKeyHeader = APIConstants.API_KEY_HEADER_DEFAULT;
         }
         if (!StringUtils.isBlank(apiKeyHeader)) {
             corsProperties.put(APIConstants.API_KEY_HEADER, apiKeyHeader);
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
index 2510f1e1fd91..8db46a61f44c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/APIMappingUtil.java
@@ -371,6 +371,9 @@ public static API fromDTOtoAPI(APIDTO dto, String provider) throws APIManagement
         setMaxTpsFromApiDTOToModel(dto, model);
         model.setAuthorizationHeader(dto.getAuthorizationHeader());
         model.setApiKeyHeader(dto.getApiKeyHeader());
+        if (model.getApiKeyHeader() == null) {
+            model.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
+        }
         model.setApiSecurity(getSecurityScheme(dto.getSecurityScheme()));
 
         if (dto.getType().toString().equals(APIConstants.API_TYPE_WEBSUB)) {
@@ -2671,6 +2674,9 @@ public static APIProduct fromDTOtoAPIProduct(APIProductDTO dto, String provider)
         product.setApiSecurity(getSecurityScheme(dto.getSecurityScheme()));
         product.setAuthorizationHeader(dto.getAuthorizationHeader());
         product.setApiKeyHeader(dto.getApiKeyHeader());
+        if (product.getApiKeyHeader() == null) {
+            product.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
+        }
 
         //attach api categories to API model
         setAPICategoriesToModel(dto, product, provider);
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
index 8ce0770c3644..2e64e01ab008 100755
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/PublisherCommonUtils.java
@@ -1150,9 +1150,6 @@ public static API prepareToCreateAPIByDTO(APIDTO body, APIProvider apiProvider,
         if (body.getAuthorizationHeader() == null) {
             body.setAuthorizationHeader(APIConstants.AUTHORIZATION_HEADER_DEFAULT);
         }
-        if (body.getApiKeyHeader() == null) {
-            body.setApiKeyHeader(APIUtil.getOAuthConfigurationFromAPIMConfig(APIConstants.API_KEY_HEADER));
-        }
         if (body.getApiKeyHeader() == null) {
             body.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
         }
@@ -1771,10 +1768,6 @@ public static APIProduct addAPIProductWithGeneratedSwaggerDefinition(APIProductD
             apiProductDTO.setAuthorizationHeader(APIConstants.AUTHORIZATION_HEADER_DEFAULT);
         }
 
-        if (apiProductDTO.getApiKeyHeader() == null) {
-            apiProductDTO.setApiKeyHeader(
-                    APIUtil.getOAuthConfigurationFromAPIMConfig(APIConstants.API_KEY_HEADER));
-        }
         if (apiProductDTO.getApiKeyHeader() == null) {
             apiProductDTO.setApiKeyHeader(APIConstants.API_KEY_HEADER_DEFAULT);
         }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
index cdd81a8cc8f0..213c281845fb 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/src/main/java/org/wso2/carbon/apimgt/rest/api/publisher/v1/common/mappings/SettingsMappingUtil.java
@@ -90,17 +90,11 @@ public SettingsDTO fromSettingstoDTO(Boolean isUserAvailable, String organizatio
             Map<String, Environment> gatewayEnvironments = APIUtil.getReadOnlyGatewayEnvironments();
             String authorizationHeader = APIUtil.getOAuthConfiguration(loggedInUserTenantDomain,
                     APIConstants.AUTHORIZATION_HEADER);
-            String apiKeyHeader = APIUtil.getOAuthConfiguration(loggedInUserTenantDomain,
-                    APIConstants.API_KEY_HEADER);
 
             if (authorizationHeader == null) {
                 authorizationHeader = APIConstants.AUTHORIZATION_HEADER_DEFAULT;
             }
-            if (apiKeyHeader == null) {
-                apiKeyHeader = APIConstants.API_KEY_HEADER_DEFAULT;
-            }
             settingsDTO.setAuthorizationHeader(authorizationHeader);
-            settingsDTO.setApiKeyHeader(apiKeyHeader);
         }
         return settingsDTO;
     }
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
index 38e028ae82bc..5fcefd633578 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/src/main/resources/publisher-api.yaml
@@ -8709,8 +8709,7 @@ components:
           type: string
           pattern: '(^[^~!@#;:%^*()+={}|\\<>"'',&$\s+]*$)'
           description: |
-            Name of the API key header used for invoking the API. If it is not set, API key header name specified
-            in tenant or system level will be used.
+            Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used.
           example: apiKey
         securityScheme:
           type: array
@@ -9388,8 +9387,7 @@ components:
         apiKeyHeader:
           type: string
           description: |
-            Name of the API key header used for invoking the API. If it is not set, API key header name specified
-            in tenant or system level will be used.
+            Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used.
           example: ApiKey
         securityScheme:
           type: array
@@ -11483,10 +11481,6 @@ components:
               required:
                 type: boolean
                 example: false
-        apiKeyHeader:
-          type: string
-          description: Api Key Header
-          example: apiKey
     SecurityAuditAttribute:
       title: SecurityAuditAttributeDTO
       type: object
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
index 690ea0d0bce3..efc2092cf328 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/APIDTO.java
@@ -321,7 +321,7 @@ public void setAuthorizationHeader(String authorizationHeader) {
   }
 
   /**
-   * Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. 
+   * Name of the API key header used for invoking the API. If it is not set, default value &#x60;apiKey&#x60; will be used. 
    **/
   public APIDTO apiKeyHeader(String apiKeyHeader) {
     this.apiKeyHeader = apiKeyHeader;
@@ -329,7 +329,7 @@ public APIDTO apiKeyHeader(String apiKeyHeader) {
   }
 
   
-  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, API key header name specified in tenant or system level will be used. ")
+  @ApiModelProperty(example = "ApiKey", value = "Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used. ")
   @JsonProperty("apiKeyHeader")
   public String getApiKeyHeader() {
     return apiKeyHeader;
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
index c92966e40974..2ced4a7c4808 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
@@ -3852,8 +3852,7 @@ components:
         apiKeyHeader:
           type: string
           description: |
-            Name of the API key header used for invoking the API. If it is not set, API key header name specified
-            in tenant or system level will be used.
+            Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used.
           example: ApiKey
         securityScheme:
           type: array
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
index 13bfa784fc42..aec02dabf4cd 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/store-api.yaml
@@ -4223,8 +4223,7 @@ definitions:
       apiKeyHeader:
         type: string
         description: |
-          Name of the API key header used for invoking the API. If it is not set, API key header name specified
-          in tenant or system level will be used.
+          Name of the API key header used for invoking the API. If it is not set, default value `apiKey` will be used.
         example: ApiKey
       securityScheme:
         type: array
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2 b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
index 9e0af9ef9ab3..329d983da1f0 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/conf_templates/templates/repository/conf/api-manager.xml.j2
@@ -356,10 +356,6 @@
         <!--Authorization header-->
         <AuthorizationHeader>{{apim.oauth_config.auth_header}}</AuthorizationHeader>
         {% endif %}
-        {% if apim.oauth_config.api_key_header is defined %}
-        <!--API key header-->
-        <ApiKeyHeader>{{apim.oauth_config.api_key_header}}</ApiKeyHeader>
-        {% endif %}
         <!-- Scope used for marking Application Tokens. If a token is generated with this scope, they will be treated as Application Access Tokens -->
         <ApplicationTokenScope>{{apim.oauth_config.default_app_scope}}</ApplicationTokenScope>
         <!-- All  scopes under the AllowedScopes element are not validating against roles that has assigned to it.

From e2bdff34be23455285ec8c81b34e3c62f0eba4ac Mon Sep 17 00:00:00 2001
From: piyumaldk <piyumaldk@gmail.com>
Date: Wed, 16 Aug 2023 15:03:59 +0530
Subject: [PATCH 21/27] Handling null for tenant domain

---
 .../wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java  | 1 +
 .../handlers/common/APIMgtLatencySynapseHandler.java        | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java
index dd5d15fc1adc..687912c4d918 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/APIMgtGatewayConstants.java
@@ -139,6 +139,7 @@ public class APIMgtGatewayConstants {
     public static final String CUSTOM_ANALYTICS_RESPONSE_PROPERTIES = "apim.analytics.response.properties";
     public static final String CUSTOM_ANALYTICS_PROPERTY_SEPARATOR = ",";
     public static final String API_UUID_PROPERTY = "API_UUID";
+    public static final String TENANT_DOMAIN = "tenant.info.domain";
 
     /**
      * Constants for swagger schema validator
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java
index dc5e76742fa6..e2cd22aa7a5e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/common/APIMgtLatencySynapseHandler.java
@@ -139,10 +139,11 @@ public boolean handleResponseOutFlow(MessageContext messageContext) {
             if (responseLatencySpan != null) {
                 GatewayUtils.setAPIRelatedTags(responseLatencySpan, messageContext);
                 API api = GatewayUtils.getAPI(messageContext);
+                String tenantDomain = (String) messageContext.getProperty(APIMgtGatewayConstants.TENANT_DOMAIN);
                 if (api != null) {
                     TelemetryUtil.updateOperation(responseLatencySpan,
                             api.getApiName().concat("--").concat(api.getApiVersion()).concat("--")
-                                    .concat(GatewayUtils.getTenantDomain()));
+                                    .concat(tenantDomain));
                 }
                 TelemetryUtil.finishSpan(responseLatencySpan);
             }
@@ -157,10 +158,11 @@ public boolean handleResponseOutFlow(MessageContext messageContext) {
             if (responseLatencySpan != null) {
                 GatewayUtils.setAPIRelatedTags(responseLatencySpan, messageContext);
                 API api = GatewayUtils.getAPI(messageContext);
+                String tenantDomain = (String) messageContext.getProperty(APIMgtGatewayConstants.TENANT_DOMAIN);
                 if (api != null) {
                     Util.updateOperation(responseLatencySpan,
                             api.getApiName().concat("--").concat(api.getApiVersion()).concat("--")
-                                    .concat(GatewayUtils.getTenantDomain()));
+                                    .concat(tenantDomain));
                 }
                 if (responseLatencySpan != null) {
                     Util.finishSpan(responseLatencySpan);

From d50d684b62806264f5907192afc97d23a9eac7b4 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Fri, 18 Aug 2023 14:26:24 +0000
Subject: [PATCH 22/27] [WSO2 Release] [Jenkins #6717] [Release 9.28.169]
 prepare release v9.28.169

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index b6336090684b..3c9a529b21d5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index c5418f64fcd7..0a943f35aaae 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index 0225148cc6da..2ae748953c33 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index 6756a8a3aa49..7692dd84dd2b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index 20bab35c1fc4..cc44ea8093fa 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index 2acf6e134aa4..2413625c5ec0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index 05659f193271..9fa580404768 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 037eb82d7b54..65e59e55e71e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index a6df0a52b14b..742f2ddf975a 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index da4a51e05b35..f64c4fdd3f62 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index 4fbd7e061583..83c2bfb55e41 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index fa56fc77e5ca..e2d4a8c7036b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index 6bcdac1327ca..b20e289aa4bf 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index 6324a137f8fa..c6a117787ea2 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index 71b3a73c1cb5..032003bd3299 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index 1b375b7ebff8..114122a3e9bb 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index e1055f54af4c..f319abd80f0d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index a1dce50ce228..871677474326 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index 8a6030773713..12b616869a30 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index ab2363bac1ba..3124f244b19b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index 9132a23146fa..4b2e4e936700 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index dd5dcb19220a..62a400437dd8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index 4d13d4cbfbbe..21f7ba0301b6 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index 78a00cec0d2a..3650433b76dc 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index aaeb712662f8..3c543a57d96b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index c26540fd24ac..f4248c8575b7 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index 28f5ca1a6bf1..cf02f3cdb0b3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 7ad348a0d5c4..178d5c85c8e9 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index 256d449cfa76..0f3127487862 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index d350e0864ba1..3c8d9f6dad22 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index df9c43d19ca6..fcbee0731c00 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index b56ecb730439..99a3b42bbeba 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index 2c2044853497..4827ef7fa674 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index 9e19d52ece45..db08758cb46d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index ec32498fb3bb..88fe936a346c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index 65f0c153b929..4c96a56c0929 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index 06f5cd9da6ee..6091262527d8 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index d906530428e8..1052917feb46 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index 8dd43d557d2c..c84edf28b65f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index cdb82aea2895..f32a155982e1 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index aef89699baec..98de7b5bdf95 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index 5d839732c0d8..4f49b38c2dbc 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index a737dc0acf73..0d478a8f82dc 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index cc8b2a204611..c122d86c4b5e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index c150ba78d8a8..b12ca92d50db 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index 6dbb5edf3e99..2cf64a0d9aa2 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index b5a5f6afc252..3a8c9f8c9090 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index 7e4a1432b931..0ea0708aefa7 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index 639b519ce6f6..e3b527f5d6f4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index 07cf41f43b14..91bd543714ba 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index 673e932dec05..4b9051deeb28 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index fb8dc4d3f48d..2f9526dfa9e4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index 528e8885690d..cc21bb4c15b2 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index 6dac3739869a..69dc04a76f9a 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index 1faf5b8e66be..e74697a87b54 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index a3ab749fbde7..bd3c985172d1 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index 53cadd87927a..4fece3720632 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index bbf3abb66191..8ced8d4471c9 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index f03d71909108..fa257f4be948 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index f7b74925dac9..b3650b64347d 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index 0fb6a6b7262a..4992311525a2 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index bfb5e18e1516..33cebbf4a5ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.169-SNAPSHOT</version>
+    <version>9.28.169</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.28.169</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.169-SNAPSHOT</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.169</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index 472da2e4c088..1f4065814042 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index 72d6c0f001bc..3364407c9c79 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169-SNAPSHOT</version>
+        <version>9.28.169</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 5fde5485a04a0b1d8b1ae3b3c48b27b2aaf1e40b Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Fri, 18 Aug 2023 14:26:28 +0000
Subject: [PATCH 23/27] [WSO2 Release] [Jenkins #6717] [Release 9.28.169]
 prepare for next development iteration

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index 3c9a529b21d5..8dec7d3d4905 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index 0a943f35aaae..5115e4af367e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index 2ae748953c33..cde00be977c2 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index 7692dd84dd2b..83c625e7cf97 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index cc44ea8093fa..4c7b897f2fbf 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index 2413625c5ec0..87c02aab7c55 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index 9fa580404768..76f4e9cf6b35 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 65e59e55e71e..8b9871dd7342 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index 742f2ddf975a..e0326347725b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index f64c4fdd3f62..3d74beffecd2 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index 83c2bfb55e41..e22b090174e8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index e2d4a8c7036b..5810fd9f34d4 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index b20e289aa4bf..45948f41da81 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index c6a117787ea2..bbe3a3a84926 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index 032003bd3299..e2f05a54a57a 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index 114122a3e9bb..cc544c12f60f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index f319abd80f0d..c3600da6ff27 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index 871677474326..02833684eddd 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index 12b616869a30..e9d03d170ba0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index 3124f244b19b..d5649f5243d9 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index 4b2e4e936700..64ad4d805fba 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index 62a400437dd8..4e90c8046e44 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index 21f7ba0301b6..b9259b4e7167 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index 3650433b76dc..f05e1fa4a77f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index 3c543a57d96b..bf55d7b2bfec 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index f4248c8575b7..1b7426d7f1d0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index cf02f3cdb0b3..06c8a5cceb5c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 178d5c85c8e9..7ac8ad684297 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index 0f3127487862..c0678d5f768e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index 3c8d9f6dad22..62ca0706eb9e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index fcbee0731c00..7118b573b8b3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index 99a3b42bbeba..2cd24c8ce853 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index 4827ef7fa674..b4cf0d4aaee5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index db08758cb46d..7e8f231e1331 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index 88fe936a346c..6900fc989c75 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index 4c96a56c0929..22c8daab97e4 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index 6091262527d8..a84327415623 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index 1052917feb46..82ba456ed6ba 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index c84edf28b65f..73c8d6d6f8a1 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index f32a155982e1..386cbc2b609c 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index 98de7b5bdf95..eaa59383d7ec 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index 4f49b38c2dbc..2e20d9f837f1 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index 0d478a8f82dc..f5cdc571ce18 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index c122d86c4b5e..855247986c07 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index b12ca92d50db..e1954f99671b 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index 2cf64a0d9aa2..bac477148924 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index 3a8c9f8c9090..71e04beeef92 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index 0ea0708aefa7..e5aa43eb6c58 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index e3b527f5d6f4..43d26d0cf71c 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index 91bd543714ba..52d20f6e4983 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index 4b9051deeb28..cce3bc4a3fd7 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index 2f9526dfa9e4..e5cc55ec4359 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index cc21bb4c15b2..afdb6af3b4fd 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index 69dc04a76f9a..d67daa208b89 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index e74697a87b54..0f9892ccd038 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index bd3c985172d1..391e936018a7 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index 4fece3720632..8bd8feb55b77 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index 8ced8d4471c9..b665e4e65313 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index fa257f4be948..211452566e2a 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index b3650b64347d..096ecb225112 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index 4992311525a2..e7a1b8fd1836 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 33cebbf4a5ff..f161a08a96b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.169</version>
+    <version>9.28.170-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>v9.28.169</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.169</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.170-SNAPSHOT</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index 1f4065814042..09b57e532cd4 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index 3364407c9c79..c2b16b4a73eb 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.169</version>
+        <version>9.28.170-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From f61940a42e866a4790e9bc4783d3c50f40717ac8 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 21 Aug 2023 10:17:34 +0000
Subject: [PATCH 24/27] [WSO2 Release] [Jenkins #6719] [Release 9.28.170]
 prepare release v9.28.170

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index 8dec7d3d4905..3c6075661b83 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index 5115e4af367e..868ac911f6ca 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index cde00be977c2..02ce44934f79 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index 83c625e7cf97..f38e16d4f7b2 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index 4c7b897f2fbf..f79cfe333704 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index 87c02aab7c55..d1c8ef426799 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index 76f4e9cf6b35..81f8d70010af 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 8b9871dd7342..3ada1ede6ca1 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index e0326347725b..c2f32e808b15 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index 3d74beffecd2..80285bdf524a 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index e22b090174e8..daa5c7ca0ea3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index 5810fd9f34d4..a4fb1a2111a9 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index 45948f41da81..0c14de6a2a22 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index bbe3a3a84926..00b5aa144e61 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index e2f05a54a57a..7f2fcbe16307 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index cc544c12f60f..913dfdeafaaa 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index c3600da6ff27..b3663e6de488 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index 02833684eddd..4f49d3b38b92 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index e9d03d170ba0..c76ebd584a6c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index d5649f5243d9..79556e85bf20 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index 64ad4d805fba..a124f943242f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index 4e90c8046e44..575574ba2781 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index b9259b4e7167..cac4aca3591f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index f05e1fa4a77f..726d36163be6 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index bf55d7b2bfec..2994f39f7cda 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index 1b7426d7f1d0..8fd1378cc325 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index 06c8a5cceb5c..b66eaffb795e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 7ac8ad684297..30daec956a1c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index c0678d5f768e..9c2dbcf13025 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index 62ca0706eb9e..170fe44451b3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index 7118b573b8b3..09ce826a5486 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index 2cd24c8ce853..973824f66843 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index b4cf0d4aaee5..e7b65677bf05 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index 7e8f231e1331..833834e654d8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index 6900fc989c75..4187f0de9522 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index 22c8daab97e4..d6dc9aaf77c8 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index a84327415623..bfe0546e16ce 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index 82ba456ed6ba..66e93bd3f26a 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index 73c8d6d6f8a1..3c20a592a2fc 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index 386cbc2b609c..191156a7f3a9 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index eaa59383d7ec..77b966146b80 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index 2e20d9f837f1..15f48a94cda1 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index f5cdc571ce18..2d6078253f68 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index 855247986c07..a2bdf5f04d68 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index e1954f99671b..032d94635254 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index bac477148924..6ef59d5508a4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index 71e04beeef92..b11f8c04b7da 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index e5aa43eb6c58..ed74dc999b9e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index 43d26d0cf71c..07b5ff0bd659 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index 52d20f6e4983..b4010395d31c 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index cce3bc4a3fd7..49227f35a554 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index e5cc55ec4359..c0b14c844206 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index afdb6af3b4fd..046d7cd4f577 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index d67daa208b89..0add88cd7dfe 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index 0f9892ccd038..867f2a69a419 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index 391e936018a7..239a0b294450 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index 8bd8feb55b77..9c063f716546 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index b665e4e65313..077da6ec91aa 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index 211452566e2a..5b81b59e0165 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index 096ecb225112..b9a6ceb4368d 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index e7a1b8fd1836..c1b3bb48f27b 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index f161a08a96b5..9aea10e102b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.170-SNAPSHOT</version>
+    <version>9.28.170</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.28.170</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.170-SNAPSHOT</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.170</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index 09b57e532cd4..9ab19c272c13 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index c2b16b4a73eb..724da9914041 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170-SNAPSHOT</version>
+        <version>9.28.170</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 7afdd35b90fb1218318768a76c1faf887c502a2d Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 21 Aug 2023 10:17:38 +0000
Subject: [PATCH 25/27] [WSO2 Release] [Jenkins #6719] [Release 9.28.170]
 prepare for next development iteration

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index 3c6075661b83..989d99a31a9c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index 868ac911f6ca..52853265c313 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index 02ce44934f79..c65129441202 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index f38e16d4f7b2..b54aa8052b16 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index f79cfe333704..c128528fc697 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index d1c8ef426799..47015b739607 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index 81f8d70010af..7a37093a4765 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 3ada1ede6ca1..4039e108836c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index c2f32e808b15..79d4369aa126 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index 80285bdf524a..76e1634e0c71 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index daa5c7ca0ea3..37473e9e4247 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index a4fb1a2111a9..2b3176055f53 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index 0c14de6a2a22..7332290d33b1 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index 00b5aa144e61..d7a457d925e8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index 7f2fcbe16307..94996caa4ece 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index 913dfdeafaaa..22e96c0275e7 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index b3663e6de488..9be465ffc48b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index 4f49d3b38b92..6638dbdd972d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index c76ebd584a6c..251d671d4687 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index 79556e85bf20..7ef2b282ac06 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index a124f943242f..0ca46b92ffed 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index 575574ba2781..11f3568a8c4d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index cac4aca3591f..95051dc0b69d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index 726d36163be6..0c42d573d45e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index 2994f39f7cda..206ac99910dd 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index 8fd1378cc325..b71a99002482 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index b66eaffb795e..195cd909c0af 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 30daec956a1c..2085f3e8d87b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index 9c2dbcf13025..e0be1860ac58 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index 170fe44451b3..d80707910675 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index 09ce826a5486..bcb18d330146 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index 973824f66843..18d63ca93acb 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index e7b65677bf05..8f45baaab191 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index 833834e654d8..dbe21838594f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index 4187f0de9522..75d25bc5b2d8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index d6dc9aaf77c8..7b7c841d983a 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index bfe0546e16ce..441d4da506ac 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index 66e93bd3f26a..12a9321d5abc 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index 3c20a592a2fc..74a56d5a06dc 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index 191156a7f3a9..6d9089888980 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index 77b966146b80..836966e48a3e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index 15f48a94cda1..ed33f48ea3bb 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index 2d6078253f68..0a73816f9b55 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index a2bdf5f04d68..6d1633f29682 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index 032d94635254..eadfd1b6a5b0 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index 6ef59d5508a4..9d0dcf59fa8f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index b11f8c04b7da..c1f784d5b449 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index ed74dc999b9e..bb377694ee52 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index 07b5ff0bd659..cfde5246aabd 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index b4010395d31c..0eaf48f2051d 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index 49227f35a554..516c37d459bd 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index c0b14c844206..5e89d31c4ccd 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index 046d7cd4f577..f20c91833f7b 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index 0add88cd7dfe..7f1600ba6ad4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index 867f2a69a419..8a4a1c105191 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index 239a0b294450..237670a98355 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index 9c063f716546..5a1538539141 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index 077da6ec91aa..8dd81f006243 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index 5b81b59e0165..9ac9f312564e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index b9a6ceb4368d..8ecaccd6afe4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index c1b3bb48f27b..b8e4b51260c9 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 9aea10e102b2..ebaf04a68bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.170</version>
+    <version>9.28.171-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>v9.28.170</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.170</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.171-SNAPSHOT</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index 9ab19c272c13..cb390e737f68 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index 724da9914041..94840d6d18d9 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.170</version>
+        <version>9.28.171-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From f80adfe61dab5b8e0e11d3168060ed1aa5d5df80 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Tue, 22 Aug 2023 01:50:57 +0000
Subject: [PATCH 26/27] [WSO2 Release] [Jenkins #6721] [Release 9.28.171]
 prepare release v9.28.171

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index 989d99a31a9c..174e73a82822 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index 52853265c313..a07feb5f4b46 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index c65129441202..69897fe5c3d0 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index b54aa8052b16..4931d77eeb12 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index c128528fc697..7aa7b4629b7c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index 47015b739607..de23a4969f61 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index 7a37093a4765..d003ce18814d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 4039e108836c..8685abae5bf9 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index 79d4369aa126..185b66524f1d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index 76e1634e0c71..dde8b4831435 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index 37473e9e4247..a53288c54bd8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index 2b3176055f53..90dfaadccff4 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index 7332290d33b1..eb9aa4576f93 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index d7a457d925e8..9237b7be7a79 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index 94996caa4ece..394eaff521f4 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index 22e96c0275e7..3d9c485b0e06 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index 9be465ffc48b..4cab5bba593b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index 6638dbdd972d..d52fdf182000 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index 251d671d4687..539946bb41d5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index 7ef2b282ac06..f5458b9163d2 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index 0ca46b92ffed..1bf887425101 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index 11f3568a8c4d..1c9c68ed22ac 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index 95051dc0b69d..113051b532b8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index 0c42d573d45e..62287108497c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index 206ac99910dd..c2b643fa56b6 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index b71a99002482..4f7aab8838af 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index 195cd909c0af..f61c4649b6f3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 2085f3e8d87b..52df302eaeec 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index e0be1860ac58..8b2628550b50 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index d80707910675..172d6881f834 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index bcb18d330146..264fb49ca9a5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index 18d63ca93acb..57121b58e046 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index 8f45baaab191..d7a2ba39d76e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index dbe21838594f..c461cf7fae72 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index 75d25bc5b2d8..c768ce8761ec 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index 7b7c841d983a..c58c71bcdb74 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index 441d4da506ac..87283b3ed749 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index 12a9321d5abc..912dbc6479c0 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index 74a56d5a06dc..6732cfcdb390 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index 6d9089888980..c4f8ad189a4c 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index 836966e48a3e..4b3ded9d8105 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index ed33f48ea3bb..8bbf999a4739 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index 0a73816f9b55..ee110ef7fb17 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index 6d1633f29682..785d869c0d3e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index eadfd1b6a5b0..b4f510d9dad7 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index 9d0dcf59fa8f..2c9492b4972c 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index c1f784d5b449..40b3279e5403 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index bb377694ee52..46a8c8d908c3 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index cfde5246aabd..88913ff7b7aa 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index 0eaf48f2051d..a386f05b602b 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index 516c37d459bd..513f81d023de 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index 5e89d31c4ccd..0fa682f98754 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index f20c91833f7b..eff8c92220c9 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index 7f1600ba6ad4..54b631d5f564 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index 8a4a1c105191..6bea86151fba 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index 237670a98355..6f0a30a2355a 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index 5a1538539141..f7c48792d6d6 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index 8dd81f006243..7804c6d1dfcc 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index 9ac9f312564e..522368c1eea0 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index 8ecaccd6afe4..92107e26e66f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index b8e4b51260c9..c768ceb242e8 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index ebaf04a68bb7..8e64299e22a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.171-SNAPSHOT</version>
+    <version>9.28.171</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>HEAD</tag>
+        <tag>v9.28.171</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.171-SNAPSHOT</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.171</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index cb390e737f68..e0e2b6e00ecb 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index 94840d6d18d9..7600088ad04c 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171-SNAPSHOT</version>
+        <version>9.28.171</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 97763b10d68e6d07a65f8e4e1766408eb4808d5c Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Tue, 22 Aug 2023 01:51:00 +0000
Subject: [PATCH 27/27] [WSO2 Release] [Jenkins #6721] [Release 9.28.171]
 prepare for next development iteration

---
 components/apimgt/org.wso2.carbon.apimgt.api/pom.xml        | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.cache.invalidation/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.core/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml      | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml    | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml     | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.notification/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.output.adapter.http/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.persistence/pom.xml       | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml  | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml     | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml   | 2 +-
 components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml    | 2 +-
 components/apimgt/pom.xml                                   | 2 +-
 .../org.wso2.carbon.apimgt.samples.calculator/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.samples.pizzashack/pom.xml       | 2 +-
 .../pom.xml                                                 | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml     | 2 +-
 features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml      | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.internal.service.feature/pom.xml | 2 +-
 .../org.wso2.carbon.apimgt.jms.listener.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.keymanager.feature/pom.xml       | 2 +-
 .../org.wso2.carbon.apimgt.persistence.feature/pom.xml      | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml   | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml     | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml  | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml   | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml     | 2 +-
 .../pom.xml                                                 | 2 +-
 .../pom.xml                                                 | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml  | 2 +-
 .../apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml   | 2 +-
 features/apimgt/pom.xml                                     | 2 +-
 pom.xml                                                     | 6 +++---
 .../apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml       | 2 +-
 service-stubs/apimgt/pom.xml                                | 2 +-
 64 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
index 174e73a82822..b84ba86a804d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
index a07feb5f4b46..ed06e614a320 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.broker.lifecycle/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
index 69897fe5c3d0..a527907bfd6f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cache.invalidation/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
index 4931d77eeb12..601022ef0cd8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.cleanup.service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
index 7aa7b4629b7c..1c2b4c5a553f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.analytics/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
index de23a4969f61..2198f3110f96 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.gateway/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
index d003ce18814d..c35d521c212d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.common.jms/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
index 8685abae5bf9..5808e2ab0248 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
index 185b66524f1d..d49cdfb86b5c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.devops.impl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
index dde8b4831435..15142a1bbdd7 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing.hub/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
index a53288c54bd8..0986afc243c7 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.eventing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
index 90dfaadccff4..8fc6a941850e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.gateway/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
index eb9aa4576f93..32783bea768e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.impl/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
index 9237b7be7a79..8ea05be5cc5d 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.internal.service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
index 394eaff521f4..63f318917629 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.jms.listener/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
index 3d9c485b0e06..4f614e86c065 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt.client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
index 4cab5bba593b..700dcf55c1e4 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.keymgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
index d52fdf182000..bd2cacd45157 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.notification/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
     </parent>
     <artifactId>org.wso2.carbon.apimgt.notification</artifactId>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
index 539946bb41d5..b03f0bcf186c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.output.adapter.http/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
index f5458b9163d2..25cc2b334f75 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
index 1bf887425101..14a3666b68fc 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
index 1c9c68ed22ac..87482e53fca7 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
index 113051b532b8..ffcc7a33a443 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.dcr/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
index 62287108497c..8e16dfc08b9b 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.devops/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
index c2b643fa56b6..c0c8d9b3b6aa 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.gateway/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
index 4f7aab8838af..d02d4b42be9e 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
index f61c4649b6f3..0cd6115dc9b1 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
index 52df302eaeec..7fca9d99ddea 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
index 8b2628550b50..44f04375a2c3 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
index 172d6881f834..ffc39161bc1f 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.rest.api.util/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
index 264fb49ca9a5..6608f1abaf54 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.solace/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
index 57121b58e046..bcd116231545 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
index d7a2ba39d76e..97e0bd7293d8 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
index c461cf7fae72..d71803ed2b6c 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tokenmgt/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
index c768ce8761ec..b35d141345e5 100644
--- a/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
+++ b/components/apimgt/org.wso2.carbon.apimgt.tracing/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/pom.xml b/components/apimgt/pom.xml
index c58c71bcdb74..ecd72107461f 100644
--- a/components/apimgt/pom.xml
+++ b/components/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
index 87283b3ed749..19f744658ada 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.calculator/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
index 912dbc6479c0..e453b34687e0 100644
--- a/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
+++ b/components/apimgt/samples/org.wso2.carbon.apimgt.samples.pizzashack/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
index 6732cfcdb390..df9356feb791 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.cache.invalidation.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
index c4f8ad189a4c..a3f74c0903fe 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
index 4b3ded9d8105..36815b1c9802 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
index 8bbf999a4739..588cb672e340 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.eventing.hub.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
index ee110ef7fb17..8f40b2150ec4 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
index 785d869c0d3e..9a0b58a5e140 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.gateway.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
index b4f510d9dad7..4beaa3143697 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.internal.service.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
index 2c9492b4972c..5fa1c173de36 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.jms.listener.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
index 40b3279e5403..a552c61caf73 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.keymanager.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
index 46a8c8d908c3..ae3db7e33a17 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.persistence.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
index 88913ff7b7aa..13c0d39e1d23 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.admin.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
index a386f05b602b..89e3306e1539 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.dcr.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
index 513f81d023de..6d56f7a2ab3d 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.devops.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
index 0fa682f98754..8854135b7006 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.gateway.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
index eff8c92220c9..0a748f9e0d2f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.publisher.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
index 54b631d5f564..37ec72322fb5 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.service.catalog.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
index 6bea86151fba..ea6b7459979f 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.rest.api.store.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
index 6f0a30a2355a..462802d3bdc2 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.scxml.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
index f7c48792d6d6..1ebb9d7a5211 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttle.policy.deployer.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
index 7804c6d1dfcc..1b29f795a808 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.throttling.siddhi.extension.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
index 522368c1eea0..e6f62fa8e01d 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tokenmgt.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-feature</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
index 92107e26e66f..5bb5f29cbe8e 100644
--- a/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
+++ b/features/apimgt/org.wso2.carbon.apimgt.tracing.feature/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-feature</artifactId>
         <groupId>org.wso2.carbon.apimgt</groupId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/apimgt/pom.xml b/features/apimgt/pom.xml
index c768ceb242e8..a1a604deabef 100644
--- a/features/apimgt/pom.xml
+++ b/features/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 8e64299e22a1..5287286c0cab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.wso2.carbon.apimgt</groupId>
     <artifactId>carbon-apimgt</artifactId>
     <packaging>pom</packaging>
-    <version>9.28.171</version>
+    <version>9.28.172-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Aggregator POM</name>
     <url>https://wso2.org</url>
 
@@ -21,7 +21,7 @@
         <url>https://github.com/wso2/carbon-apimgt.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-apimgt.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-apimgt.git</connection>
-        <tag>v9.28.171</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -1966,7 +1966,7 @@
 
         <!-- APIM Component Version -->
         <hamcrest.version>1.3</hamcrest.version>
-        <carbon.apimgt.version>9.28.171</carbon.apimgt.version>
+        <carbon.apimgt.version>9.28.172-SNAPSHOT</carbon.apimgt.version>
         <carbon.apimgt.imp.pkg.version>[9.0.0, 10.0.0)</carbon.apimgt.imp.pkg.version>
 
         <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
diff --git a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
index e0e2b6e00ecb..695fb293e3d3 100644
--- a/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
+++ b/service-stubs/apimgt/org.wso2.carbon.apimgt.keymgt.stub/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>apimgt-stubs</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/apimgt/pom.xml b/service-stubs/apimgt/pom.xml
index 7600088ad04c..de391fedce3a 100644
--- a/service-stubs/apimgt/pom.xml
+++ b/service-stubs/apimgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.apimgt</groupId>
         <artifactId>carbon-apimgt</artifactId>
-        <version>9.28.171</version>
+        <version>9.28.172-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>